X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Flist;h=a8fd016b95d9fadb7be113804b21a24a83b52d25;hb=e202b2580cf05e71059efb3c70893585d82f5857;hp=f1290efb1b9dd57607cf07f085984b28252dc114;hpb=7232f39368bec26e484089f9f81ab6b6dc94e9eb;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index f1290ef..a8fd016 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,44 +1,47 @@
 [% PROCESS macros %]
-
 [% INCLUDE header %]
-
 [% IF search %]
-<h2> Search results </h2>
+    <h2>Search results</h2>
 [% ELSE %]
-<h2> Listing of all [% classmetadata.plural %]</h2>
+    <h2>Listing of all [% classmetadata.plural %]</h2>
 [% 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>"; 
-        '<A HREF="'; base; classmetadata.moniker; "/list/?";
-        "page=" _ pager.current_page _ "&" IF pager;
-        "order="; col; 
-        "&o2=desc" IF col == request.query.order and request.query.o2 != "desc";
-        '">';
-        classmetadata.colnames.$col; 
-        '</A>';
-    "</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 search_form %]
+<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 _ "&amp;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,
+                    classmetadata.colnames.$col);
+                IF col == request.query.order;
+                    IF request.query.o2 != "desc";
+                        "&darr;";
+                    ELSE;
+                        "&uarr;";
+                    END;
+                END;
+                "</th>";
+            END %]
+	    <th>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 footer %]