refs #4987 for consistency make sure all websites dashboard has same …

…look as regular report
matomo-org · May 5, 2014 · 4fcf115 · 4fcf115
1 parent c324d38
commit 4fcf115
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.html b/plugins/MultiSites/angularjs/dashboard/dashboard.html
@@ -91,6 +91,21 @@
             </td>
         </tr>
         <tr>
+            <td colspan="8" class="paging" ng-hide="model.numberOfPages() <= 1">
+                <span id="prev" class="previous" ng-hide="model.currentPage == 0" ng-click="model.previousPage()">
+                    <span style="cursor:pointer;">&#171; {{ 'General_Previous'|translate }}</span>
+                </span>
+                <span class="dataTablePages">
+                    <span id="counter">
+                        {{ model.getCurrentPagingOffsetStart() }} - {{ model.getCurrentPagingOffsetEnd() }} of {{ model.getNumberOfFilteredSites() }}
+                    </span>
+                </span>
+                <span id="next" class="next" ng-hide="model.currentPage >= model.getNumberOfPages()" ng-click="model.nextPage()">
+                    <span style="cursor:pointer;" class="pointer">{{ 'General_Next'|translate }} &#187;</span>
+                </span>
+            </td>
+        </tr>
+        <tr row_id="last">
             <td colspan="8" class="site_search">
                 <input type="text"
                        ng-change="model.searchSite(searchTerm)"
@@ -108,21 +123,6 @@
             </td>
         </tr>
 
-        <tr row_id="last">
-            <td colspan="8" class="paging" ng-hide="model.numberOfPages() <= 1">
-                <span id="prev" class="previous" ng-hide="model.currentPage == 0" ng-click="model.previousPage()">
-                    <span style="cursor:pointer;">&#171; {{ 'General_Previous'|translate }}</span>
-                </span>
-                <span class="dataTablePages">
-                    <span id="counter">
-                        {{ model.getCurrentPagingOffsetStart() }} - {{ model.getCurrentPagingOffsetEnd() }} of {{ model.getNumberOfFilteredSites() }}
-                    </span>
-                </span>
-                <span id="next" class="next" ng-hide="model.currentPage >= model.getNumberOfPages()" ng-click="model.nextPage()">
-                    <span style="cursor:pointer;" class="pointer">{{ 'General_Next'|translate }} &#187;</span>
-                </span>
-            </td>
-        </tr>
         </tfoot>
     </table>
 </div>
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.less b/plugins/MultiSites/angularjs/dashboard/dashboard.less
@@ -46,7 +46,8 @@
   }
 
   .paging {
-    padding: 20px;
+    padding: 5px;
+    font-size: 10px;
 
     .previous {
       padding-right: 20px;
@@ -68,6 +69,11 @@
     cursor: pointer;
     border-left: 0px;
     text-align: center;
+    border-bottom: 0px;
+
+    &.columnSorted {
+      font-weight: normal !important;
+    }
   }
 
   .site_search input {