From: Simon Flack <sf@flacks.net>
Date: Tue, 23 Nov 2004 16:49:08 +0000 (+0000)
Subject: Changes Request.Query to Request.Params calls and cleaned up some html/css
X-Git-Tag: 2.10~77
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e096fd01832dd4e8017015061eeb143f8bcb7c55;p=maypole.git

Changes Request.Query to Request.Params calls and cleaned up some html/css

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@287 48953598-375a-da11-a14b-00016c27c3ee
---

diff --git a/templates/factory/list b/templates/factory/list
index 03a712b..5a4388e 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -8,7 +8,7 @@
 [% END %]
 [% INCLUDE navbar %]
 <div class="list">
-    <table id="matrix" width="100%" >
+    <table id="matrix">
         <tr>
             [% FOR col = classmetadata.list_columns.list;
                 NEXT IF col == "id";
@@ -17,20 +17,20 @@
                 SET additional = additional _ "&page=" _ pager.current_page
                     IF pager;
                 SET additional = additional _ "&o2=desc" 
-                IF col == request.query.order and request.query.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.query.$name;
+                        request.params.$name;
                     SET action = "search";
                   END;
                 END;
                 link(classmetadata.table, action, additional,
                     classmetadata.colnames.$col);
-                IF col == request.query.order;
-                    IF request.query.o2 != "desc";
+                IF col == request.params.order;
+                    IF request.params.o2 != "desc";
                         "&darr;";
                     ELSE;
                         "&uarr;";
diff --git a/templates/factory/pager b/templates/factory/pager
index bb78138..6aed9c2 100644
--- a/templates/factory/pager
+++ b/templates/factory/pager
@@ -26,14 +26,14 @@ IF pager AND pager.first_page != pager.last_page;
           ELSE;
             SET label = num;
             SET args = "?page=" _ num;
-	    SET args = args _ "&order=" _ request.query.order
-	      IF request.query.order;
+	    SET args = args _ "&order=" _ request.params.order
+	      IF request.params.order;
 	    SET args = args _ "&amp;o2=desc"
-	      IF request.query.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;
diff --git a/templates/maypole.css b/templates/maypole.css
index 84368e9..a458d89 100644
--- a/templates/maypole.css
+++ b/templates/maypole.css
@@ -158,6 +158,8 @@ table {
     background-color: #ffffff;
 }
 
+#matrix { width: 100%; }
+
 #matrix th {
     background-color: #b5cadc;
     border: 1px solid #778;
@@ -290,11 +292,6 @@ label .field {
 
 .error { color: #d00; }
 
-.actions {
-    white-space: nowrap;
-    background-color: #fff;
-}
-
 .action {
     border: 1px outset #7d95b5;
     style:block;
@@ -306,10 +303,33 @@ label .field {
     background-color: #7d95b5;
 }
 
-.field {
+.actionform {
     display: inline;
 }
 
+.actionbutton {
+    height: 16px;
+    width: 40px;
+    font-family: sans-serif;
+    font-size: 10px;
+    border: 1px outset;
+    background-color: #fff;
+    margin-bottom: 0px;
+}
+
+.actionbutton:hover {
+    color: #fff;
+    background-color: #7d95b5;
+}
+
+.actions {
+    white-space: nowrap;
+}
+
+.field {
+    display:inline;
+}
+
 .pager {
     font: 11px Arial, Helvetica, sans-serif;
     text-align: center;
@@ -348,3 +368,4 @@ label .field {
     border-color: #036;
     text-decoration: none;
 }
+