X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fview;h=6736da61c4f9fc825bcda2f9feeb6740a7171a46;hb=85c445c1589257ba17e50a368eda8c9c0368dc9b;hp=0ea412e2291831ecef58891ce43c3f22bd8ac0c2;hpb=afc350467fbb2ecbb88d824f4b36d6440552a0c0;p=maypole.git

diff --git a/templates/factory/view b/templates/factory/view
index 0ea412e..6736da6 100644
--- a/templates/factory/view
+++ b/templates/factory/view
@@ -7,23 +7,22 @@ C<objects> and displays the object's properties in a table.
 
 =cut
 
-%#]
+#%]
 [% PROCESS macros %]
 [% INCLUDE header %]
-
 [% FOR item = objects %]
-<h2> [% item.name %]</h2>
-
-[% 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;
-%]
-
+    [% SET string = item.stringify_column %]
+    <h2> [% item.$string %]</h2>
+    [% INCLUDE navbar %]
+    <table class="view">
+        <tr>
+            <td class="field">[% classmetadata.colnames.$string %]</td>
+            <td>[% item.$string %]</td>
+        </tr>
+        [% FOR col = classmetadata.columns.list;
+            NEXT IF col == "id" OR col == string;
+            NEXT UNLESS item.$col;
+        %]
 [%# 
 
 =for doc
@@ -31,25 +30,15 @@ C<objects> and displays the object's properties in a table.
 It gets the displayable form of a column's name from the hash returned
 from the C<column_names> method:
 
-%#]
-
-    <TR>
-    <TD class="field"> [% classmetadata.colnames.$col; %] </TD>
-    <TD> [%
-
-#=cut
-
-    IF col == "url";  # Possibly too much magic.
-                "<A HREF="; item.url; "> "; item.url; "</A>";
-    ELSE;
-
-#=for doc
-
-#One interesting macro used in this template is C<maybe_link_view>:
-
-        maybe_link_view(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; %]
 [%#
 
 This tests whether or not the returned value is an object, and if so,
@@ -61,13 +50,10 @@ if there is no C<name> method or other stringification method defined.
 =cut
 
 #%] 
-
-[% END; %]
- </TD>
-</TR>
-[% END; %]
-</TABLE>
-
+                </td>
+            </tr>
+        [% END; %]
+    </table>
 [%#
 
 =for doc
@@ -81,11 +67,7 @@ displays the results in a table.
 #%]
 [%
     view_related(item);
-
-#=cut
-
     button(item, "edit");
     button(item, "delete");
 %]
 [% END; %]
-