X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fview;h=64c760b11cc0f9672957bf8669828e143e5b2276;hb=77137f7d4d6b7768b9c64eb1e893ac90083cfd63;hp=48dec99074ebdb887c4cdb4056cbba6898805e2c;hpb=0ad4ba7aa71b7dda17f0b07ccc9d8f0ad3424b82;p=maypole.git

diff --git a/templates/factory/view b/templates/factory/view
index 48dec99..64c760b 100644
--- a/templates/factory/view
+++ b/templates/factory/view
@@ -1,26 +1,35 @@
-[% MACRO button(obj, action) BLOCK; %]
-
-<TD>
-<FORM METHOD="post" ACTION="[%base%]/[%classmetadata.moniker%]/[%action%]/[%obj.id%]">
-    <INPUT TYPE="submit" NAME="[%action%]" VALUE="[%action%]">
-</FORM>
-</TD>
-[% END %]
-
+[% PROCESS macros %]
 [% INCLUDE header %]
 
 [% FOR item = objects %]
 <h2> [% item.name %]</h2>
 
-[% FOR col = classmetadata.columns.list;
-    NEXT IF col == "id";
-    "<P>";
-    classmetadata.colnames.$col; ":";
-    " "; item.$col;"</p>";
-     END;
+[% INCLUDE navbar %]
+
+<TABLE class="view">
+    <TR><TD class="field">Name</TD><TD> [% item.name %] </TD></TR>
+[% 
+    FOR col = classmetadata.columns.list;
+    NEXT IF col == "id" OR col == "name";
+    NEXT UNLESS item.$col;
+%]
+
+<TR>
+    <TD class="field"> [% classmetadata.colnames.$col; %] </TD>
+    <TD> [%
+
+    IF col == "url";  # Possibly too much magic.
+                "<A HREF="; item.url; "> "; item.url; "</A>";
+    ELSE;
+    maybe_link_view(item.$col); END;
+    %] </TD>
+</TR>
+[% END; %]
+</TABLE>
+[%
+    view_related(item);
     button(item, "edit");
     button(item, "delete");
-    "</tr>";
-END;
 %]
+[% END; %]