X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=5a4388e749a360cca3ae0f79f21bddec67cf52b5;hb=e096fd01832dd4e8017015061eeb143f8bcb7c55;hp=beade40e3a5184f998c71096b375d78ba537ab68;hpb=52d254200d32b47402461d325c2836c35af99201;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index beade40..5a4388e 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,22 +1,36 @@
 [% PROCESS macros %]
 [% INCLUDE header %]
 [% INCLUDE title %]
+[% IF search %]
+    <div id="title">Search results</div>
+[% ELSE %]
+    <div id="title">Listing of all [% classmetadata.plural %]</div>
+[% END %]
 [% INCLUDE navbar %]
 <div class="list">
-    <table id="matrix" width="100%" >
+    <table id="matrix">
         <tr>
-            [% FOR col = classmetadata.columns.list;
+            [% FOR col = classmetadata.list_columns.list;
                 NEXT IF col == "id";
                 "<th>"; 
                 SET additional = "?order=" _ col;
-                SET additional = additional _ "&amp;page=" _ pager.current_page
+                SET additional = additional _ "&page=" _ pager.current_page
                     IF pager;
-                SET additional = additional _ "&amp;o2=desc" 
-                IF col == request.query.order and request.query.o2 != "desc";
-                link(classmetadata.table, "list", additional,
+                SET additional = additional _ "&o2=desc" 
+                IF col == request.params.order and request.params.o2 != "desc";
+                SET action = "list";
+                FOR name = classmetadata.columns.list;
+                  IF request.query.$name;
+                    SET additional =
+                        additional  _ "&" _ name _ "=" _
+                        request.params.$name;
+                    SET action = "search";
+                  END;
+                END;
+                link(classmetadata.table, action, additional,
                     classmetadata.colnames.$col);
-                IF col == request.query.order;
-                    IF request.query.o2 != "desc";
+                IF col == request.params.order;
+                    IF request.params.o2 != "desc";
                         "&darr;";
                     ELSE;
                         "&uarr;";