X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=120abbbfee125c473832b66de1d444e8407ba10d;hb=6d0a3dde542a44c59284d60addc72503462fdbb4;hp=69bb8680a8aa18820b83e3d1867d84b536cab702;hpb=0ad4ba7aa71b7dda17f0b07ccc9d8f0ad3424b82;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index 69bb868..120abbb 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,29 +1,39 @@
-[% PROCESS list_macros %]
-
+[% PROCESS macros %]
 [% INCLUDE header %]
-
-<h2> Listing of all [% classmetadata.plural %]</h2>
-
+[% IF search %]
+    <h2>Search results</h2>
+[% ELSE %]
+    <h2>Listing of all [% classmetadata.plural %]</h2>
+[% END %]
 [% INCLUDE navbar %]
-
-<TABLE id="matrix" WIDTH="100%">
-<TR>
-[% FOR col = classmetadata.columns.list;
-    NEXT IF col == "id";
-    "<TH>"; classmetadata.colnames.$col; "</TH>";
-END %]
-</TR>
-
-[%  SET count = 0;
-FOR item = objects;
-    SET count = count + 1;
-    "<tr";
-    ' class="alternate"' IF count % 2;
-    ">";
-    display_line(item);
-    "</tr>";
-END %]
-</TABLE>
-
-
-[% INCLUDE addnew; %]
+<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>"; 
+                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>
+        [%  SET count = 0;
+        FOR item = objects;
+            SET count = count + 1;
+            "<tr";
+            ' class="alternate"' IF count % 2;
+            ">";
+            display_line(item);
+            "</tr>";
+        END %]
+    </table>
+[% INCLUDE pager %]
+[% INCLUDE addnew %]
+</div>
+[% INCLUDE footer %]