X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=9f7fe0e03e418df5e531566b3f67e143439925a8;hb=1970b15356f27bd73d99f6d8160088c616cea5cb;hp=5bd6a10f628edb0d2a39d57a7ebf28829f1786ff;hpb=36b7502bb586953f62f56a2c6edd3b22c184702d;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index 5bd6a10..9f7fe0e 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -2,15 +2,27 @@
 
 [% 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,7 @@ FOR item = objects;
 END %]
 </TABLE>
 
-
+[% INCLUDE pager; %]
 [% INCLUDE addnew; %]
+</DIV>
+[% INCLUDE footer %]