teejay's template updates

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@435 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Maypole/templates/factory/edit b/lib/Maypole/templates/factory/edit
index 6bdad79347cef088c484d66ec30a546387772fb9..77dfa3a492fcaee3201ad112c9d792de4420917b 100644 (file)
--- a/lib/Maypole/templates/factory/edit
+++ b/lib/Maypole/templates/factory/edit
@@ -11,6 +11,11 @@ form similar to L<addnew> but with the current values filled in.
 [% PROCESS macros %]
 [% INCLUDE header %]
 [% INCLUDE title %]
+
+[% IF request.action == 'edit' %]
+[% INCLUDE navbar %]
+[% END %]
+
 [% IF objects.size %]
 <div id="title">Edit a [% classmetadata.moniker %]</div>
 [% FOR item = objects; %]
@@ -18,7 +23,7 @@ form similar to L<addnew> but with the current values filled in.
 <fieldset>
 <legend>Edit [% item.name %]</legend>
 [% FOR col = classmetadata.columns;
-    NEXT IF col == "id";
+    NEXT IF col == "id" OR col == classmetadata.table _ "_id";
     '<label><span class="field">';
     classmetadata.colnames.$col; ":</span>";
     item.to_field(col).as_XML;

diff --git a/lib/Maypole/templates/factory/list b/lib/Maypole/templates/factory/list
index dbbedafb786171b659479b92e2987dd270882773..f0bc45c1ced59ca9289d8d7c22041620d40e483e 100644 (file)
--- a/lib/Maypole/templates/factory/list
+++ b/lib/Maypole/templates/factory/list
@@ -11,7 +11,7 @@
     <table id="matrix">
         <tr>
             [% FOR col = classmetadata.list_columns.list;
-                NEXT IF col == "id";
+                NEXT IF col == "id" OR col == classmetadata.table _ "_id";
                 "<th>"; 
                 SET additional = "?order=" _ col;
                 SET additional = additional _ "&page=" _ pager.current_page

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index 59d6c925358a9cfa57a27f981a21ed927ab4f339..a102c736a523dd78677661140fec7d0400892ca3 100644 (file)
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -55,7 +55,7 @@ for some.
 #%]
 [% MACRO display_line(item) BLOCK;
     FOR col = classmetadata.list_columns;
-        NEXT IF col == "id";
+       NEXT IF col == "id" OR col == classmetadata.table _ "_id";
         "<td>";
         IF col == "url" AND item.url;
             '<a href="'; item.url; '"> '; item.url; '</a>';
@@ -128,7 +128,7 @@ This takes an object and and displays its properties in a table.
 
 #%]
 [% MACRO view_item(item) BLOCK; %]
-    [% SET string = classmetadata.stringifycolumn %]
+    [% SET string = classmetadata.stringify_column %]
     <div id="title"> [% item.$string %]</div>
     [% INCLUDE navbar %]
     <table class="view">
@@ -137,7 +137,7 @@ This takes an object and and displays its properties in a table.
             <td>[% item.$string %]</td>
         </tr>
         [% FOR col = classmetadata.columns.list;
-            NEXT IF col == "id" OR col == string;
+            NEXT IF col == "id" OR col == string OR col == classmetadata.table _ "_id";;
             NEXT UNLESS item.$col;
         %]
 [%# 

diff --git a/lib/Maypole/templates/factory/search_form b/lib/Maypole/templates/factory/search_form
index 1f071949f3d42f762bcfeab31852b8cd72136449..d10101eae5550823965fc57d69bba57ed51556f2 100644 (file)
--- a/lib/Maypole/templates/factory/search_form
+++ b/lib/Maypole/templates/factory/search_form
@@ -3,7 +3,7 @@
 <fieldset>
 <legend>Search</legend>
         [% FOR col = classmetadata.columns;
-            NEXT IF col == "id";
+            NEXT IF col == "id" OR col == classmetadata.table _ "_id";
          %]
            <label>
                 <span class="field">[% classmetadata.colnames.$col; %]</span>