瀏覽代碼

[search] Restyled result pagination

Enrico Berti 11 年之前
父節點
當前提交
5c9d0ff
共有 2 個文件被更改,包括 25 次插入13 次删除
  1. 24 13
      apps/search/src/search/templates/search2.mako
  2. 1 0
      apps/search/static/js/charts.ko.js

+ 24 - 13
apps/search/src/search/templates/search2.mako

@@ -610,27 +610,29 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
 </script>
 
 <script type="text/html" id="resultset-pagination">
-<div style="text-align: center;">
+<div style="text-align: center; margin-top: 4px">
   <a href="javascript: void(0)" title="${ _('Previous') }">
     <span data-bind="text: name, click: $root.collection.toggleSortColumnGridLayout"></span>
     <i class="fa fa-arrow-left" data-bind="
         visible: $data.response.start * 1.0 >= $root.collection.template.rows() * 1.0,
         click: function() { $root.query.paginate('prev') }">
-    </i>
-  </a>  
+    </i></a>
 
-  <span data-bind="text: $data.response.start"></span>
+  ${ _('Showing') }
+  <span data-bind="text: ($data.response.start + 1)"></span>
+  ${ _('to') }
+  <span data-bind="text: ($data.response.start + $root.collection.template.rows())"></span>
   ${ _('of') }
   <span data-bind="text: $data.response.numFound"></span>
-  
-  <span data-bind="visible: $root.isEditing()">
-    ${ _('by') }
-    <input type="text" data-bind="spinedit: $root.collection.template.rows, valueUpdate:'afterkeydown'" />
+  ${ _(' results.') }
+
+  ${ _('Show') }
+  <span data-bind="visible: $root.isEditing()" class="spinedit-pagination">
+    <input type="text" data-bind="spinedit: $root.collection.template.rows, valueUpdate:'afterkeydown'" style="text-align: center; margin-bottom: 0" />
   </span>
-  
-  ${ _(' results') }  
-  ## (<span data-bind="text: $data.responseHeader.QTime"></span> ${ _('ms') })
-  
+  ${ _('results per page.') }
+
+
   <a href="javascript: void(0)" title="${ _('Next') }">
     <span data-bind="text: name, click: $root.collection.toggleSortColumnGridLayout"></span>
     <i class="fa fa-arrow-right" data-bind="
@@ -638,7 +640,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
         click: function() { $root.query.paginate('next') }">
     </i>
   </a>  
-  
+
   <!-- ko if: $data.response.numFound > 0 && $data.response.numFound <= 1000 -->
   <span class="pull-right">
     <form method="POST" action="${ url('search:download') }">
@@ -1271,6 +1273,15 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
     border-radius: 3px;
   }
 
+  .spinedit-pagination div.spinedit .fa-chevron-up {
+    top: -7px;
+  }
+
+  .spinedit-pagination div.spinedit .fa-chevron-down {
+    top: 7px;
+    left: -4px;
+  }
+
 </style>
 
 <script type="text/javascript" charset="utf-8">

+ 1 - 0
apps/search/static/js/charts.ko.js

@@ -240,6 +240,7 @@ function lineChart(element, options) {
 
   nv.addGraph(function () {
     var _chart = nv.models.lineWithBrushChart();
+    _chart.enableSelection();
     _chart.onSelectRange(options.onSelectRange);
     _chart.xAxis.showMaxMin(false);