Use table instead of moniker.

[maypole.git] / templates / factory / list

diff --git a/templates/factory/list b/templates/factory/list
index 69bb8680a8aa18820b83e3d1867d84b536cab702..99710287b2f626b838dbcf0c7af41a6fed36f56b 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,16 +1,28 @@
-[% PROCESS list_macros %]
+[% PROCESS macros %]
 
 [% INCLUDE header %]
 
+[% IF search %]
+<h2> Search results </h2>
+[% ELSE %]
 <h2> Listing of all [% classmetadata.plural %]</h2>
+[% END %]
 
 [% INCLUDE navbar %]
+<DIV class="search"> [% INCLUDE search_form %] </DIV>
 
+<DIV class="list">
 <TABLE id="matrix" WIDTH="100%">
 <TR>
 [% FOR col = classmetadata.columns.list;
     NEXT IF col == "id";
-    "<TH>"; classmetadata.colnames.$col; "</TH>";
+    "<TH>"; 
+    SET additional = "?order=" _ col;
+    SET additional = additional _ "page=" _ pager.current_page _ "&" IF pager;
+    SET additional = additional _ "&o2=desc" 
+        IF col == request.query.order and request.query.o2 != "desc";
+     link(classmetadata.table, "list", additional, classmetadata.colnames.$col);
+    "</TH>";
 END %]
 </TR>
 
@@ -25,5 +37,6 @@ FOR item = objects;
 END %]
 </TABLE>
 
-
+[% INCLUDE pager; %]
 [% INCLUDE addnew; %]
+</DIV>