summaryrefslogtreecommitdiffstats
path: root/app/overview/controllers/system-overview-controller.html
diff options
context:
space:
mode:
authorbeccabroek <beccabroek@gmail.com>2018-10-29 13:46:53 -0500
committerGunnar Mills <gmills@us.ibm.com>2018-11-06 16:48:36 +0000
commit569ccf66e58aacd50eaf53518c50c0ad4d448333 (patch)
tree51a405cb027a85be3f764a0a7c55b1b3c10d5c81 /app/overview/controllers/system-overview-controller.html
parent35d18cbc34578547a291848fcf1759588727ef49 (diff)
downloadphosphor-webui-569ccf66e58aacd50eaf53518c50c0ad4d448333.tar.gz
phosphor-webui-569ccf66e58aacd50eaf53518c50c0ad4d448333.zip
Display log events in user time
Allows user to display events in their timezone or in UTC. Previously allowed either ETC or UTC, but listed ETC as 'user timezone'. Updates date time page from GMT offset to UTC offset for overall consistency. Also updates overview page to list critical events in user timezone Resolves openbmc/phosphor-webui#36 Tested: changed timezone settings locally and validated that correct timezone and UTC offset was presented in the UI. Change-Id: I89ca5045eeb789527aa07f5b1baebaa3fbd6b1fa Signed-off-by: beccabroek <beccabroek@gmail.com>
Diffstat (limited to 'app/overview/controllers/system-overview-controller.html')
-rw-r--r--app/overview/controllers/system-overview-controller.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index 5a05bc2..48ede3e 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -85,7 +85,7 @@
</a>
<div class="quick-links__item no-icon">
<p class="inline quick-links__label">BMC time</p>
- <p class="inline courier-bold float-right">{{bmc_time | date:'medium'}}</p>
+ <p class="inline courier-bold float-right bmc-time">{{(bmc_time | date:'medium') + ' ' + tmz}}</p>
</div>
<div class="quick-links__item no-icon">
<p class="inline quick-links__label">Turn <span ng-if="dataService.LED_state == 'off'">on</span><span ng-if="dataService.LED_state == 'on'">off</span> server LED</p>
@@ -132,7 +132,7 @@
<p class="inline event__id">#{{event.Id}}</p>
<p class="inline event__priority high-priority">High</p>
<p class="inline event__severity high-priority">{{event.severity_code}}</p>
- <p class="inline event__timestamp">{{(event.Timestamp | date:'medium': tmz) + ' ' + tmz}}</p>
+ <p class="inline event__timestamp">{{(event.Timestamp | date:'medium') + ' ' + tmz}}</p>
<div>
<p class="inline event__description">{{getEventLogTitle(event)}}</p>
</div>
OpenPOWER on IntegriCloud