#76 Improve the columns size in case list

TheHive-Project · Jan 16, 2017 · 199fa9d · 199fa9d
1 parent 4c6bff6
commit 199fa9d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/ui/app/styles/case.css b/ui/app/styles/case.css
@@ -64,4 +64,13 @@ span.link-id {
 .merge-dialog .search-field ul.dropdown-menu {
     width: 100%;
     left: 0 !important;
-}
+}
+
+table.case-list .case-tags {
+    font-size: 12px !important;
+}
+
+table.case-list .case-tags .label {
+    font-size: inherit !important;
+    font-weight: normal;
+}
diff --git a/ui/app/views/partials/case/case.list.html b/ui/app/views/partials/case/case.list.html
@@ -44,28 +44,37 @@ <h4>List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.count}})</h4>
 
         <div class="row mt-s">
             <div class="col-md-12">
-                <table class="table table-striped">
+                <table class="table table-striped case-list">
                     <thead>
                         <tr>
                             <th style="width: 10px;" class="p-0"></th>
+                            <th style="width: 60px;">Assignee</th>
                             <th>Title</th>
-                            <th style="width: 250px">Tags</th>
-                            <th style="width: 150px">Tasks</th>
-                            <th style="width: 100px">Observables</th>
-                            <th style="width: 60px">Assignee</th>
-                            <th style="width: 160px">Date</th>
+                            <th style="width: 100px;">Tasks</th>
+                            <th style="width: 100px;">Observables</th>
+                            <th style="width: 120px;">Date</th>
                         </tr>
                     </thead>
 
                     <tbody>
                         <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 class="nowrap">
+                                <user user-id="currentCase.owner" icon-only="true" icon-size="m"></user>
+                            </td>
                             <td>
-                                <a ui-sref="app.case.details({caseId: currentCase.id})">#{{currentCase.caseId}}
-                                    -
-                                    {{currentCase.title}}</a>
-                                <div ng-show="currentCase.status !== 'Open'" class="text-success">
+                                <div class="case-title">
+                                    <a ui-sref="app.case.details({caseId: currentCase.id})">#{{currentCase.caseId}} - {{currentCase.title}}</a>
+                                </div>
+                                <div class="case-tags flexwrap mt-xxs">
+                                    <span class="mr-xxxs">Tags:</span>
+                                    <strong class="text-muted mr-xxxs" ng-if="!currentCase.tags || currentCase.tags.length === 0">None</strong>
+                                    <span ng-repeat="tag in currentCase.tags" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">{{tag}}
+
+                                    </span>
+                                </div>
+                                <div class="text-success" ng-show="currentCase.status !== 'Open'">
                                     <small>
                                         (Closed at {{currentCase.endDate | showDate}} as <strong>{{$vm.CaseResolutionStatus[currentCase.resolutionStatus]}}</strong>)
                                     </small>
@@ -77,24 +86,16 @@ <h4>List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.count}})</h4>
                                     </small>
                 				</div>
                             </td>
-                            <td class="flexwrap">
-                                <span ng-repeat="tag in currentCase.tags" class="label label-primary mb-xxxs mr-xxxs pointer" ng-click="$vm.addFilterValue('tags', tag)">
-                                    <span ng-bind="tag"></span>
-                                </span>
-                            </td>
                             <td>
                                 <a ui-sref="app.case.tasks({caseId: currentCase.id})">
                                     <ng-pluralize count="currentCase.stats.tasks.total" when="{'0': 'No Tasks', '1': '1 Task', 'other': '{} Tasks'}"></ng-pluralize>
                                 </a>
                                 <br>
-                                <task-progress tasks="currentCase.stats.tasks"/>
+                                <task-progress ng-show="currentCase.stats.tasks.total > 0" tasks="currentCase.stats.tasks"/>
                             </td>
                             <td>
                                 <a ui-sref="app.case.observables({caseId: currentCase.id})">{{currentCase.stats.artifacts.count}}</a>
                             </td>
-                            <td class="nowrap">
-                                <user user-id="currentCase.owner" icon-only="true" icon-size="m"></user>
-                            </td>
                             <td>
                                 <a href ng-click="$vm.addFilterValue('startDate', currentCase.startDate)">
                                     <span tooltip="{{currentCase.startDate | showDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{currentCase.startDate | shortDate}}</span>