X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fmacros;h=491a0bc5074a444701606d15b03b31f85aebb2e0;hb=c28f97b5b20d5d53bad9ac704e4f0de8943de187;hp=2442dd5d32b11bfb8b3273a3189f049127e4b9e3;hpb=77fb5cc34c9a87077dc65548f0d890b366e78c61;p=maypole.git

diff --git a/templates/factory/macros b/templates/factory/macros
index 2442dd5..491a0bc 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;
-    '<a href="' _ base _ "/" _ table _ "/" _ command _ "/" _ additional _ '">';
+    SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional;
+    lnk = lnk | uri | html;
+    '<a href="' _ lnk _ '">';
     label;
     "</a>";
 END;
@@ -55,8 +57,8 @@ for some.
     FOR col = classmetadata.columns;
         NEXT IF col == "id";
         "<td>";
-        IF col == "url";
-            "<A HREF="; item.url; "> "; item.url; "</A>";
+        IF col == "url" AND item.url;
+            '<a href="'; item.url; '"> '; item.url; '</a>';
         ELSIF col == item.stringify_column;
             maybe_link_view(item);
         ELSE;
@@ -64,8 +66,10 @@ for some.
         END;
         "</td>";
     END;
+    '<td class="actions" nowrap="nowrap">';
     button(item, "edit");
     button(item, "delete");
+    "</td>";
 END %]
 [%#
 
@@ -77,11 +81,8 @@ This is a generic button, which performs an action on an object.
 
 #%]
 [% MACRO button(obj, action) BLOCK; %]
-<td>
-<form method=post action="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]">
-    <input type=submit name=[% action %] value=[% action %] />
-</form>
-</td>
+<a class="action" href="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]">
+    [% action %]</a>
 [% END %]
 [%#
 
@@ -98,7 +99,7 @@ brewery) calls the accesor, and displays a list of the results.
 [% 
 MACRO view_related(object) BLOCK;
     FOR accessor = classmetadata.related_accessors.list;
-        "<h3>"; accessor | ucfirst; "</h3>\n";
+        "<div id=\"subtitle\">"; accessor | ucfirst; "</div>\n";
         "<ul id=\"vlist\">";
         FOR thing = object.$accessor;
             "<li>"; maybe_link_view(thing); "</li>\n";