X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=dbbedafb786171b659479b92e2987dd270882773;hb=12d8a77a713d5ed4f08414e5f34e96d45f60e2d3;hp=8cd0209fc9531fe457ca1f2e6b959c0d290202e5;hpb=77fb5cc34c9a87077dc65548f0d890b366e78c61;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index 8cd0209..dbbedaf 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,27 +1,48 @@
 [% PROCESS macros %]
 [% INCLUDE header %]
+[% INCLUDE title %]
 [% IF search %]
-    <h2>Search results</h2>
+    <div id="title">Search results</div>
 [% ELSE %]
-    <h2>Listing of all [% classmetadata.plural %]</h2>
+    <div id="title">Listing of all [% classmetadata.plural %]</div>
 [% END %]
 [% INCLUDE navbar %]
-<div class=search>[% INCLUDE search_form %]</div>
-<div class=list>
-    <table id=matrix width=100%>
+<div class="list">
+    <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 _ "&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,
+                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;
+		IF model_obj.find_column(col);
+                  link(classmetadata.table, action, additional,
                     classmetadata.colnames.$col);
+                  IF col == request.params.order;
+                    IF request.params.o2 != "desc";
+                        "&darr;";
+                    ELSE;
+                        "&uarr;";
+                    END;
+                  END;
+		ELSE;
+		  classmetadata.colnames.$col || col FILTER ucfirst;
+		END;
                 "</th>";
             END %]
+	    <th id="actionth">Actions</th>
         </tr>
         [%  SET count = 0;
         FOR item = objects;
@@ -33,7 +54,9 @@
             "</tr>";
         END %]
     </table>
+
 [% INCLUDE pager %]
 [% INCLUDE addnew %]
+[% INCLUDE search_form %]
 </div>
 [% INCLUDE footer %]