X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffactory%2Flist;h=206066f3eb533ef081f814be066cc9459fc69504;hb=8237e83ed726d86f1ef754e51077eb2aff0cd4ed;hp=efd3a95518fb09e64bde86e16fb7f5b179a569ac;hpb=77137f7d4d6b7768b9c64eb1e893ac90083cfd63;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index efd3a95..206066f 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -2,7 +2,11 @@
 
 [% 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>
@@ -12,7 +16,13 @@
 <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>
 
@@ -26,5 +36,7 @@ FOR item = objects;
     "</tr>";
 END %]
 </TABLE>
+
+[% INCLUDE pager; %]
 [% INCLUDE addnew; %]
 </DIV>