ui: Redesign the pagination widgets

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
dlespiau · Dec 19, 2015 · 3b1bedf · 3b1bedf
1 parent 1e32cf1
commit 3b1bedf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/htdocs/css/style.css b/htdocs/css/style.css
@@ -171,35 +171,32 @@ input#reorder-change {
 /* list pagination */
 .paginator {
 	text-align: right;
-	margin: 10px 0;
 	clear: both;
-	margin-top: 20px;
+        margin: 8px 0 20px;
 }
 
 .paginator .prev-na,
 .paginator .next-na {
-	padding:.3em;
 	font-weight: normal;
 	color: #a0a0a0;
 }
 
 .paginator .prev a, .paginator .prev a:visited,
 .paginator .next a, .paginator .next a:visited {
-	padding: .3em;
 	font-weight: normal;
 }
 
 .paginator .prev, .paginator .prev-na { margin-right:.5em; }
 .paginator .next, .paginator .next-na { margin-left:.5em; }
 
 .paginator .page a, .paginator .page a:visited, .paginator .curr {
-	padding: .25em;
 	font-weight: normal;
-	margin: 0em .25em;
+        padding: 6px 12px;
 }
 .paginator .curr {
-	background-color: #2E2E70;
-	color: #fff;
+	background-color: #eee;
+        border-radius: 4px;
+	color: #999;
 	font-weight:normal;
 }
 

diff --git a/htdocs/js/patchwork.js b/htdocs/js/patchwork.js
@@ -116,8 +116,8 @@ var pw = (function() {
             },
             inputs: {
                 pageText: '',
-                paginationPrev: '« Previous',
-                paginationNext: 'Next »',
+                paginationPrev: '«',
+                paginationNext: '»',
                 paginationGap: [1,1,1,1],
             },
             writers: {

diff --git a/lib/packages/jquery/jquery.dynatable.css b/lib/packages/jquery/jquery.dynatable.css
@@ -32,7 +32,7 @@
 .dynatable-page-link,
 .dynatable-page-break {
   display: block;
-  padding: 5px 7px;
+  padding: 6px 12px;
 }
 
 .dynatable-page-link {
@@ -49,15 +49,14 @@
 }
 
 .dynatable-active-page {
-  background-color: #2E2E70;
-  color: #fff;
+  background-color: #eee;
+  border-radius: 4px;
+  color: #999;
   font-weight:normal;
 }
 .dynatable-active-page:hover {
-  color: #fff;
+  color: #999;
 }
-.dynatable-disabled-page,
 .dynatable-disabled-page:hover {
   background: none;
-  color: #999;
 }
diff --git a/patchwork/templates/patchwork/pagination.html b/patchwork/templates/patchwork/pagination.html
@@ -5,9 +5,9 @@
 {% if page.has_previous %}
  <span class="prev">
   <a href="{% listurl page=page.previous_page_number %}"
-     title="Previous Page">&laquo; Previous</a></span>
+     title="Previous Page">&laquo;</a></span>
 {% else %}
- <span class="prev-na">&laquo; Previous</span>
+ <span class="prev-na">&laquo;</span>
 {% endif %}
 
 {% if page.paginator.trailing_set %}
@@ -36,10 +36,10 @@
 {% if page.has_next %}
  <span class="next">
   <a href="{% listurl page=page.next_page_number %}"
-   title="Next Page">Next &raquo;</a>
+   title="Next Page">&raquo;</a>
   </span>
 {% else %}
- <span class="next-na">Next &raquo;</span>
+ <span class="next-na">&raquo;</span>
 {% endif %}
 </div> 
 {% endifnotequal %}