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

diff --git a/templates/factory/list b/templates/factory/list
index 9971028..dbbedaf 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,42 +1,62 @@
 [% 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%">
-<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>
+<div class="list">
+    <table id="matrix">
+        <tr>
+            [% 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.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;
+            SET count = count + 1;
+            "<tr";
+            ' class="alternate"' IF count % 2;
+            ">";
+            display_line(item);
+            "</tr>";
+        END %]
+    </table>
 
-[% INCLUDE pager; %]
-[% INCLUDE addnew; %]
-</DIV>
+[% INCLUDE pager %]
+[% INCLUDE addnew %]
+[% INCLUDE search_form %]
+</div>
+[% INCLUDE footer %]