diff --git a/frontend/app/index.html b/frontend/app/index.html index 2020ac526b..f6b081c997 100644 --- a/frontend/app/index.html +++ b/frontend/app/index.html @@ -192,6 +192,7 @@ + diff --git a/frontend/app/scripts/directives/case-duration.js b/frontend/app/scripts/directives/case-duration.js new file mode 100644 index 0000000000..c20adc4e82 --- /dev/null +++ b/frontend/app/scripts/directives/case-duration.js @@ -0,0 +1,15 @@ +(function() { + 'use strict'; + angular.module('theHiveDirectives').directive('caseDuration', function() { + return { + restrict: 'E', + scope: { + start: '=', + end: '=', + icon: '@', + indicator: '=' + }, + templateUrl: 'views/directives/case-duration.html' + }; + }); +})(); diff --git a/frontend/app/views/directives/case-duration.html b/frontend/app/views/directives/case-duration.html new file mode 100644 index 0000000000..940c83691a --- /dev/null +++ b/frontend/app/views/directives/case-duration.html @@ -0,0 +1,8 @@ + + + {{indicator ? 'During ' : ''}}{{start | duration:end}} + + + {{start | duration}} {{indicator ? 'ago' : ''}} + + diff --git a/frontend/app/views/partials/alert/list.html b/frontend/app/views/partials/alert/list.html index bc976639dc..539a0d2b75 100644 --- a/frontend/app/views/partials/alert/list.html +++ b/frontend/app/views/partials/alert/list.html @@ -17,7 +17,7 @@

List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c
+ on-clear-all="$vm.clearFilters()">
@@ -142,7 +142,9 @@

List of alerts ({{$vm.list.total || 0}} of {{alertEvents.c {{::event.artifacts.length || 0}} - {{event.date | showDate}} + + {{event.date | shortDate}} +
diff --git a/frontend/app/views/partials/case/case.links.html b/frontend/app/views/partials/case/case.links.html index d440c42b46..e3bccb7aa3 100644 --- a/frontend/app/views/partials/case/case.links.html +++ b/frontend/app/views/partials/case/case.links.html @@ -83,7 +83,8 @@
- {{item.startDate | shortDate}} + {{item.startDate | shortDate}}
+
diff --git a/frontend/app/views/partials/case/case.list.html b/frontend/app/views/partials/case/case.list.html index 386420dc95..c78828d174 100644 --- a/frontend/app/views/partials/case/case.list.html +++ b/frontend/app/views/partials/case/case.list.html @@ -105,8 +105,7 @@

List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.

- {{currentCase.startDate | duration:currentCase.endDate}} - {{currentCase.startDate | duration}} +
diff --git a/frontend/app/views/partials/case/case.panelinfo.html b/frontend/app/views/partials/case/case.panelinfo.html index cef7d788cf..a4720d4702 100644 --- a/frontend/app/views/partials/case/case.panelinfo.html +++ b/frontend/app/views/partials/case/case.panelinfo.html @@ -23,20 +23,26 @@

- + - Created by + - - - {{caze.createdAt | showDate}} - (Closed at - {{caze.endDate | shortDate}} - as - {{CaseResolutionStatus[caze.resolutionStatus]}} - with {{caze.impactStatus === 'NoImpact' ? 'No Impact' : 'Impact'}}) + + + + {{caze.createdAt | shortDate}} + + + + + {{caze.endDate | shortDate}} as + {{CaseResolutionStatus[caze.resolutionStatus]}} + with {{caze.impactStatus === 'NoImpact' ? 'No Impact' : 'Impact'}} - + + + + @@ -44,7 +50,8 @@

- + +