X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffactory%2Fmacros;h=367d74faaeaea8e69bfcab9163754694e03c01f1;hb=e72c221ab5ef5973233bbfb2fa710c993f2be87d;hp=d4c0e5d777979f324647358e2f934e3ee04a1761;hpb=52d254200d32b47402461d325c2836c35af99201;p=maypole.git

diff --git a/templates/factory/macros b/templates/factory/macros
index d4c0e5d..367d74f 100644
--- a/templates/factory/macros
+++ b/templates/factory/macros
@@ -7,7 +7,7 @@ system.
 
 =head2 link
 
-This creates an <A HREF="... to a command in the Apache::MVC system by
+This creates an <A HREF="..."> to a command in the Apache::MVC system by
 catenating the base URL, table, command, and any arguments.
 
 #%]
@@ -34,8 +34,8 @@ command for that object. Otherwise, it just displays the data.
 
 [%
 MACRO maybe_link_view(object) BLOCK;
-    IF object.table; # It's an object, i.e. a has-a
-        link(object.table, "view", object.id, object);
+    IF object.isa('Maypole::Model::Base');
+        link(object.table, "view", object.id.join('/'), object);
     ELSE;
         object;
     END;
@@ -54,7 +54,7 @@ for some.
 
 #%]
 [% MACRO display_line(item) BLOCK;
-    FOR col = classmetadata.columns;
+    FOR col = classmetadata.list_columns;
         NEXT IF col == "id";
         "<td>";
         IF col == "url" AND item.url;
@@ -66,7 +66,7 @@ for some.
         END;
         "</td>";
     END;
-    "<td nowrap>";
+    '<td class="actions">';
     button(item, "edit");
     button(item, "delete");
     "</td>";
@@ -81,8 +81,10 @@ This is a generic button, which performs an action on an object.
 
 #%]
 [% MACRO button(obj, action) BLOCK; %]
-<a class="action" href="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]">
-    [% action %]</a>
+[% IF obj.is_public(action) %]
+<form class="actionform" action="[% base %]/[% obj.table %]/[% action %]/[% obj.id.join('/') %]" method="post">
+<div class="field"><input class="actionbutton" type="submit" value="[% action %]" /></div></form>
+[% END %]
 [% END %]
 [%#