X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=debian%2Fpatches%2F108_fix-uris.diff;h=e3fa3c624f95fe34791838cf65ca60ee2a95ac13;hp=a3ffc60766615445a311d8b07d56abc75195a575;hb=dd425b2cb6384f804cc1eea9e45660ed6baeb2f1;hpb=fadcae3ffddebaa38da172f9624cc60176d80b33 diff --git a/debian/patches/108_fix-uris.diff b/debian/patches/108_fix-uris.diff index a3ffc60..e3fa3c6 100644 --- 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 ; - ''; - label | html; - ""; ---- trunk.orig/lib/Maypole/templates/factory/header -+++ trunk/lib/Maypole/templates/factory/header -@@ -10,7 +10,7 @@ - - - -- -+ - - -
+ IF target ; + ''; + ELSE;