Updated patches for 2.13.

[maypole.git] / debian / patches / 108_fix-uris.diff
diff --git a/debian/patches/108_fix-uris.diff b/debian/patches/108_fix-uris.diff

index a3ffc60766615445a311d8b07d56abc75195a575..e3fa3c624f95fe34791838cf65ca60ee2a95ac13 100644 (file)
--- a/debian/patches/108_fix-uris.diff
+++ b/debian/patches/108_fix-uris.diff
@@ -1,22 +1,11 @@
---- trunk.orig/lib/Maypole/templates/factory/macros
-+++ trunk/lib/Maypole/templates/factory/macros
-@@ -14,7 +14,7 @@
+--- maypole.orig/lib/Maypole/templates/factory/macros
++++ maypole/lib/Maypole/templates/factory/macros
+@@ -18,7 +18,7 @@
   [%
- MACRO link(table, command, additional, label) BLOCK;
+ MACRO link(table, command, additional, label, target) BLOCK;
       SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
  -    lnk = lnk | uri ;
  +    lnk = lnk | html ;
-     '<a href="' _ lnk _ '">';
-     label | html;
-     "</a>";
---- trunk.orig/lib/Maypole/templates/factory/header
-+++ trunk/lib/Maypole/templates/factory/header
-@@ -10,7 +10,7 @@
-         </title>
-         <meta http-equiv="Content-Type" content="text/html; charset=[% request.document_encoding %]" />
-       <base href="[% config.uri_base%]"/>
--        <link title="Maypole" href="[% config.uri_base %]/maypole.css" type="text/css" rel="stylesheet" />
-+        <link title="Maypole" href="[% base %]/maypole.css" type="text/css" rel="stylesheet" />
-    </head>
-     <body>
-         <div class="content">
+     IF target ;
+       '<a href="' _ lnk _ '" target="' _ target _'">';
+     ELSE;