#151 Add pagination component on top of all the data lists

TheHive-Project · Mar 27, 2017 · ae2d474 · ae2d474
1 parent 99c6839
commit ae2d474
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 24 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -49,7 +49,7 @@
 
   </head>
   <body ng-cloak class="hold-transition skin-blue layout-top-nav">
-    <page-loader></page-loader>
+    <page-loader bg-color="#ecf0f5"></page-loader>
     <div ui-view></div>
 
     <!-- build:js(.) scripts/vendor.js -->

diff --git a/ui/app/views/app.main.html b/ui/app/views/app.main.html
@@ -23,41 +23,20 @@ <h3 class="box-title" ng-if="view.data == 'waitingtasks'">Waiting tasks ({{list.
             </div>
             <div class="box-body">
 
-                <!-- <div class="row mb-s">
-                    <div class="col-md-12 clearfix">
-                        <div class="pull-right form-inline">
-                            <div class="input-group input-group-sm">
-                                <filter-box collection="list"></filter-box>
-                            </div>
-                            <div class="form-group">
-                                <page-sizer collection="list"></page-sizer>
-                            </div>
-                        </div>
-                    </div>
-                </div> -->
-
                 <div ng-switch="view.data">
-                    <div class="main-fadein" ng-switch-when="mytasks">
-                        <div ng-include="'views/partials/index-mytasks.html'"></div>
-                    </div>
-
                     <div class="main-fadein" ng-switch-when="waitingtasks">
                         <div ng-include="'views/partials/index-waitingtasks.html'"></div>
                     </div>
 
                     <div class="main-fadein" ng-switch-default>
                         <div ng-include="'views/partials/index-mytasks.html'"></div>
                     </div>
-
                 </div>
 
             </div>
         </div>
     </div>
 
-
-
-
     <div ng-show="showFlow" class="col-md-3">
         <div class=" box">
             <div class="box-header">

diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html
@@ -39,8 +39,10 @@ <h3 class="box-title">List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.
                     </div>
                 </div>
 
-                <div class="row mt-s">
+                <div class="row">
                     <div class="col-md-12">
+                        <psearch control="$vm.list"></psearch>
+
                         <table class="table table-striped case-list">
                             <thead>
                                 <tr>

diff --git a/ui/app/views/partials/case/case.tasks.html b/ui/app/views/partials/case/case.tasks.html
@@ -49,6 +49,7 @@
 
 <div class="row mt-l" ng-show="tasks.total !== 0">
     <div class="col-md-12">
+        <psearch control="tasks"></psearch>
         <table class="table table-striped table-hover valigned">
             <thead>
                 <tr>

diff --git a/ui/app/views/partials/index-mytasks.html b/ui/app/views/partials/index-mytasks.html
@@ -1,3 +1,5 @@
+<psearch control="list"></psearch>
+
 <table class="table table-striped table-hover valigned">
 	<thead>
 		<tr>

diff --git a/ui/app/views/partials/index-waitingtasks.html b/ui/app/views/partials/index-waitingtasks.html
@@ -1,3 +1,5 @@
+<psearch control="list"></psearch>
+
 <table class="table table-striped table-hover valigned">
 	<thead>
 		<tr>

diff --git a/ui/app/views/partials/misp/event.dialog.html b/ui/app/views/partials/misp/event.dialog.html
@@ -35,7 +35,7 @@ <h4 class="vpad10 text-primary">
             <dl class="dl-horizontal clear">
                 <dt>Tags</dt>
                 <dd>
-                    <tag-list data="dialog.event.tags"></tag-list>                    
+                    <tag-list data="dialog.event.tags"></tag-list>
                 </dd>
             </dl>
 

diff --git a/ui/app/views/partials/misp/list.html b/ui/app/views/partials/misp/list.html
@@ -38,6 +38,8 @@ <h3 class="box-title">List of MISP events ({{misp.list.total || 0}} of {{mispEve
                 <!-- Datalist  -->
                 <div class="row mt-s">
                     <div class="col-md-12">
+                        <psearch control="misp.list"></psearch>
+
                         <table class="table table-striped case-list">
                             <thead>
                                 <tr>

diff --git a/ui/app/views/partials/observables/list/artifacts-list-main.html b/ui/app/views/partials/observables/list/artifacts-list-main.html
@@ -25,6 +25,8 @@ <h4>List of observables ({{artifacts.total || 0}} of {{artifactStats.count}})</h
 
 <!-- list of artifacts-->
 <div class="col-md-12">
+    <psearch ng-if="!switchTEList" control="artifacts"></psearch>
+
     <table class="table table-striped table-hover valigned">
         <thead>
             <tr>