X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fmacros;h=357c32981ec708da0829db2b4de4e3c58d134d9e;hb=5d49648fd96492e31cf7c6df507ae42e9cd1e42d;hp=3d45a6fa65c36bae4d5a48db84e17722b41b38d2;hpb=d77cc42a2fd0ae059128043822ef127199e55ed2;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index 3d45a6f..357c329 100644 --- a/templates/factory/macros +++ b/templates/factory/macros @@ -13,7 +13,9 @@ catenating the base URL, table, command, and any arguments. #%] [% MACRO link(table, command, additional, label) BLOCK; - ''; + SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional; + lnk = lnk | uri | html; + ''; label; ""; END; @@ -52,11 +54,11 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "