#110 Fix the toolbars

TheHive-Project · Jul 23, 2018 · 9ce8983 · 9ce8983
1 parent eb46e97
commit 9ce8983
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/www/src/app/pages/analyzers/analyzers.page.html b/www/src/app/pages/analyzers/analyzers.page.html
@@ -29,11 +29,11 @@ <h1>Analyzers ({{$ctrl.pagination.total}})</h1>
           <div>
             <label>Page size</label>
           </div>
-          <div>
-            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
-            <ul class="pull-right" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
+          <div>            
+            <ul class="pull-left mr-xs" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
               ng-change="$ctrl.load()" ng-model="$ctrl.pagination.current" boundary-links="true" items-per-page="$ctrl.pagination.pageSize"
               previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;" max-size="3" rotate="false"></ul>
+            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
           </div>
         </div>
       </form>

diff --git a/www/src/app/pages/jobs/jobs.page.html b/www/src/app/pages/jobs/jobs.page.html
@@ -40,12 +40,12 @@ <h1>Jobs History ({{$ctrl.pagination.total}})</h1>
           </div>          
         </div>
         <div class="form-group pull-right">
-          <div><label>Page size</label></div>
+          <div><label>Pagination</label></div>
           <div>
-            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
-            <ul class="pull-right" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
+            <ul class="pull-left mr-xs" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
               ng-change="$ctrl.load()" ng-model="$ctrl.pagination.current" boundary-links="true" items-per-page="$ctrl.pagination.pageSize"
               previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;" max-size="3" rotate="false"></ul>
+            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>            
           </div>
         </div>
       </form>

diff --git a/www/src/app/pages/responders/responders.page.html b/www/src/app/pages/responders/responders.page.html
@@ -29,11 +29,11 @@ <h1>Responders ({{$ctrl.pagination.total}})</h1>
           <div>
             <label>Page size</label>
           </div>
-          <div>
-            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
-            <ul class="pull-right" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
+          <div>            
+            <ul class="pull-left mr-xs" ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total"
               ng-change="$ctrl.load()" ng-model="$ctrl.pagination.current" boundary-links="true" items-per-page="$ctrl.pagination.pageSize"
               previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;" max-size="3" rotate="false"></ul>
+            <select class="form-control" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
           </div>
         </div>
       </form>
@@ -46,7 +46,7 @@ <h1>Responders ({{$ctrl.pagination.total}})</h1>
         <ul ng-show="$ctrl.pagination.total > $ctrl.pagination.pageSize" uib-pagination total-items="$ctrl.pagination.total" ng-change="$ctrl.load()"
           ng-model="$ctrl.pagination.current" boundary-links="true" items-per-page="$ctrl.pagination.pageSize" previous-text="&lsaquo;"
           next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;" max-size="3" rotate="false"></ul>
-        <select class="ml-xs form-control pull-right " ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
+        <select class="ml-xs form-control pull-right" ng-model="$ctrl.pagination.pageSize" ng-change="$ctrl.load()" ng-options="v as (v + ' / page') for v in [10, 50, 100, 1000]"></select>
       </div>
     </div>
   </div>

diff --git a/www/src/assets/styles/sass/paginable-table.scss b/www/src/assets/styles/sass/paginable-table.scss
@@ -1,7 +1,7 @@
 .paginable-page {
   .box-tools {
     >select {
-      width: 120px;
+      width: 100px;
     }
   }
   .table-toolbar {
@@ -14,8 +14,10 @@
     input.form-control {
       width: 300px;
     }
-    >select {
-      width: 120px;
+    select {
+      &.form-control {
+        width: 100px;
+      }      
     }
     multiselect {
       width: 150px;