X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fview;h=328678c73d98c86d84d5be888540b756e4881c25;hb=1fb6cf1887bddb2a3a003d6e148a0c016ea780b0;hp=6736da61c4f9fc825bcda2f9feeb6740a7171a46;hpb=d77cc42a2fd0ae059128043822ef127199e55ed2;p=maypole.git

diff --git a/templates/factory/view b/templates/factory/view
index 6736da6..328678c 100644
--- a/templates/factory/view
+++ b/templates/factory/view
@@ -11,49 +11,7 @@ C<objects> and displays the object's properties in a table.
 [% PROCESS macros %]
 [% INCLUDE header %]
 [% FOR item = objects %]
-    [% 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
-
-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>
-                    [% 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,
-creates a link to a page viewing that object; if not, it just displays
-the text as normal. The object is linked using its stringified name;
-by default this calls the C<name> method, or returns the object's ID
-if there is no C<name> method or other stringification method defined.
-
-=cut
-
-#%] 
-                </td>
-            </tr>
-        [% END; %]
-    </table>
+[% view_item(item); %]
 [%#
 
 =for doc
@@ -65,9 +23,12 @@ a list of has-many accessors. Next it calls each of those accessors, and
 displays the results in a table.
 
 #%]
+    <br /><a href="[%base%]/[%item.table%]/list">Back to listing</a>
+[% view_related(item); %]
+    
 [%
-    view_related(item);
     button(item, "edit");
     button(item, "delete");
 %]
 [% END; %]
+[% INCLUDE footer %]