X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fpager;h=6aed9c21c9cf024d31b0d37bdb1bc678069f6d14;hb=72ebd12372713c17bb79d6510f3da7c7b4561338;hp=419d1019efdb7852027fe86b50d607a8b0e213d0;hpb=244b656ced182cf876ecf21219c789bbd23ee83b;p=maypole.git

diff --git a/templates/factory/pager b/templates/factory/pager
index 419d101..6aed9c2 100644
--- a/templates/factory/pager
+++ b/templates/factory/pager
@@ -22,14 +22,18 @@ 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 label = "[" _ num _ "]";
+            SET label = num;
             SET args = "?page=" _ num;
+	    SET args = args _ "&order=" _ request.params.order
+	      IF request.params.order;
+	    SET args = args _ "&amp;o2=desc"
+	      IF request.params.o2 == "desc";
             SET action = "list";
             FOR col = classmetadata.columns.list;
-              IF request.query.$col;
-                SET args = args _ "&" _ col _ "=" _ request.query.$col;
+              IF request.params.$col;
+                SET args = args _ "&" _ col _ "=" _ request.params.$col;
                 SET action = "search";
               END;
             END;