Changeset 6616

Timestamp:

Nov 24, 2014, 8:25:26 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1890: Improve skinnability of BASE

Adding more tags to navigator so that it should be possible to style different sections more easily.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/taglib/table/Navigator.java (modified) (5 diffs)
• www/include/styles/table.css (modified) (4 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/table/Navigator.java

@@ -253 +253 @@
     sb.append(" data-table-id=\"").append(table.getId()).append("\"");
     addDynamicAttributes(sb);
-    sb.append(">\n");
-
+    sb.append(">");
+    sb.append("<span class=\"flowcontrol\">");
     int numPages = (int)Math.ceil((double)totalRows / (double)rowsPerPage);
     if (currentPage > 0)
@@ -266 +266 @@
       sb.append("<img src=\"").append(root).append("images/previous.png\" class=\"disabled\" alt=\"\">");
     }
-    sb.append("&nbsp;&nbsp;");
+    sb.append("</span><span class=\"flowcontrol\">");
     if ((currentPage+1)*rowsPerPage < totalRows )
     {
@@ -277 +277 @@
       sb.append("<img src=\"").append(root).append("images/last.png\" class=\"disabled\" alt=\"\">");
     }
-    sb.append("&nbsp;&nbsp;&nbsp;");
+    sb.append("</span>");
 
     int offset = 1;
@@ -304 +304 @@
     pages.add(currentPage);
     if (numPages > 0) pages.add(numPages - 1);
-    
+    sb.append("<span class=\"pages\">");
     for (int page : pages)
     {
@@ -316 +316 @@
       }
     }
-    sb.append(" (").append(totalRows).append(totalRows == 1 ? " hit" : " hits");
+    sb.append("</span>");
+    sb.append("<span class=\"rows-per-page\">");
+    sb.append("(").append(totalRows).append(totalRows == 1 ? " hit" : " hits");
     sb.append(", <input name=\"rowsperpage\" class=\"text\" type=\"text\" value=\"").append(rowsPerPage).append("\"");
-    sb.append(" maxlength=\"3\"> per page");
-    sb.append(")</div>");
+    sb.append(" maxlength=\"3\"> per page)");
+    sb.append("</span></div>");
     try
     {

trunk/www/include/styles/table.css

@@ -39 +39 @@
 {
   padding: 0 2px 0 2px;
-  
-  xheight: 1.6em;
-  xmax-height: 1.75em;
-  xbackground: #E8E8E8;
+  white-space: nowrap;
 }
 
@@ -51 +48 @@
 
 
-/* Float <div>:s to left */
+/* <div>:s behave as inline elements */
 .itemlist div.panelgroup div.panel > div
 {
-  float: left;
+  display: inline-block;
   border-right-width: 1px;
   padding: 2px 4px 2px 4px;
@@ -69 +66 @@
 }
 
+.itemlist div.navigator > span
+{
+  padding-right: 0.75em;
+}
+
 /* Current page number should be highlighted */
 .itemlist div.navigator .currentpage 
@@ -76 +78 @@
 
 /* Page number input field */
-.itemlist div.navigator > input
+.itemlist div.navigator .rows-per-page > input
 {
   width: 3em;
 }
 
-/* Separate page numbers */
-.itemlist div.navigator span:after
-{
-  content: "∙";
-  color: #999999;
+ /* Separate page numbers */
+.itemlist div.navigator .pages span:after
+{
+  display: inline-block;
+  content: "∙";
+  color: #999999;
   padding-right: 1px;
   padding-left: 1px;
-  text-decoration: none;
+  text-decoration: none;
+}
+
+
+/* No 'dot' after last page */
+.itemlist div.navigator .pages span:last-child:after
+{
+  content: '';
+  padding: 0;
 }