#76 Fix the style of flagged cases style

TheHive-Project · Jan 11, 2017 · bc7a2f4 · bc7a2f4
1 parent cf8d310
commit bc7a2f4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/ui/app/scripts/services/CasesUISrv.js b/ui/app/scripts/services/CasesUISrv.js
@@ -78,7 +78,8 @@
                             state: state,
                             showFilters: false,
                             showStats: false,
-                            pageSize: 15
+                            pageSize: 15,
+                            sort: ['-flag', '-startDate']
                         };
 
                         factory.filters = {};

diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css
@@ -307,23 +307,23 @@ ul.observable-reports-summary li {
     border-left: 6px solid #D9534F;
 }
 .bg-tlp-na {
-    background-color: #428BCA;
+    background-color: #428BCA !important;
 }
 .bg-tlp-white,
 .bg-tlp-0 {
-    background-color: #5BC0CE;
+    background-color: #5BC0CE !important;
 }
 .bg-tlp-green,
 .bg-tlp-1 {
-    background-color: #5CB85C;
+    background-color: #5CB85C !important;
 }
 .bg-tlp-amber,
 .bg-tlp-2 {
-    background-color: #F0AD4E;
+    background-color: #F0AD4E !important;
 }
 .bg-tlp-red,
 .bg-tlp-3 {
-    background-color: #D9534F;
+    background-color: #D9534F !important;
 }
 .updatable-waiting .updatable-value {
     background-color: gray;
@@ -439,3 +439,10 @@ td.vmiddle {
 table.valigned td {
     vertical-align: middle !important;
 }
+
+table tr.tr-warning {
+    background-color: #fcf8e3 !important;
+}
+table tr.tr-warning>td {
+    background-color: #fcf8e3;
+}
diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html
@@ -58,7 +58,7 @@ <h4>List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.count}})</h4>
                     </thead>
 
                     <tbody>
-                        <tr ng-class="{true:'warning'}[currentCase.flag]" ng-repeat="currentCase in $vm.list.values">
+                        <tr ng-class="{true:'tr-warning'}[currentCase.flag]" ng-repeat="currentCase in $vm.list.values">
 
                             <td class="p-0 bg-tlp-{{currentCase.tlp}} clickable" ng-click="$vm.addFilterValue('tlp', currentCase.tlp)"></td>
                             <td>

diff --git a/ui/app/views/partials/case/list/toolbar.html b/ui/app/views/partials/case/list/toolbar.html
@@ -26,14 +26,14 @@
                 </button>
                 <ul class="dropdown-menu" role="menu">
                     <li>
-                        <a ng-click="$vm.sortBy(['-flag', '-startDate'])">Newest</a>
+                        <a ng-click="$vm.sortBy(['-flag', '-startDate'])">Newest first</a>
                     </li>
                     <li>
-                        <a ng-click="$vm.sortBy(['-flag', '+startDate'])">Oldest</a>
+                        <a ng-click="$vm.sortBy(['-flag', '+startDate'])">Oldest first</a>
                     </li>
                 </ul>
             </div>
-            
+
             <div class="btn-group pull-right" role="group">
                 <page-sizer collection="$vm.list" sizes="[10, 15, 30, 100]"></page-sizer>
             </div>