X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fpager;h=bb78138691e6377de22150bc01273e2f31ce19b3;hb=d7675a8712c9197e462c1a260138cae497092356;hp=5f10f5905830ee5079b075af47f8f81d947f69b4;hpb=52583c3d05f5ceee280e44ad9e6df6759753719c;p=maypole.git

diff --git a/templates/factory/pager b/templates/factory/pager
index 5f10f59..bb78138 100644
--- a/templates/factory/pager
+++ b/templates/factory/pager
@@ -10,8 +10,7 @@ to the L<Data::Page> interface.
 [%
 IF pager AND pager.first_page != pager.last_page;
 %]
-
-<P ALIGN="center">Pages: 
+<p class="pager">Pages: 
 [%
     SET begin_page = pager.current_page - 10;
     IF begin_page < 1;
@@ -23,13 +22,24 @@ IF pager AND pager.first_page != pager.last_page;
     END;
      FOREACH num = [begin_page .. end_page];
           IF num == pager.current_page;
-            "["; num; "] ";
+            "<span class='current-page'>"; num; "</span>";
           ELSE;
-            SET args = "?page=" _ num; # Order?
-            SET label = "[" _ num _ "]";
-          link(classmetadata.table, "list", args, label);
+            SET label = num;
+            SET args = "?page=" _ num;
+	    SET args = args _ "&order=" _ request.query.order
+	      IF request.query.order;
+	    SET args = args _ "&amp;o2=desc"
+	      IF request.query.o2 == "desc";
+            SET action = "list";
+            FOR col = classmetadata.columns.list;
+              IF request.query.$col;
+                SET args = args _ "&" _ col _ "=" _ request.query.$col;
+                SET action = "search";
+              END;
+            END;
+            link(classmetadata.table, action, args, label);
           END;
      END;
 %]
-</P>
+</p>
 [% END %]