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>
diff --git a/app/common/directives/log-event.html b/app/common/directives/log-event.html
index b2ab09e..3ec3c91 100644
--- a/app/common/directives/log-event.html
+++ b/app/common/directives/log-event.html
@@ -1,65 +1,67 @@
<div class="row column event-log__single-event"
- ng-class="{'active': event.meta, 'selected': event.selected}">
- <div class="row">
- <div class="inline__confirm" ng-class="{active: event.confirm}">
- <div class="inline__confirm-message">
- <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this
- event</strong>?</p>
- </div>
- <div class="inline__confirm-buttons">
- <button class="btn-primary" ng-click="accept(event)">Yes</button>
- <button class="btn-primary" ng-click="event.confirm=false;">No</button>
- </div>
- </div>
- <div class="column small-1 large-2 event-log__col-check">
- <label class="control-check">
- <input type="checkbox" name="events__check" ng-click="event.selected= ! event.selected"
- ng-checked="event.selected"/>
- <span class="control__indicator"></span>
- </label>
- </div>
- <div class="column small-9 large-10 event-log__event-info"
- ng-click="event.meta = ! event.meta">
- <p class="inline event__id">#{{event.Id}}</p>
- <p class="inline event__priority event-resolved" ng-hide="event.Resolved == 0">Resolved</p>
- <p class="inline event__priority" ng-class="{'low-priority': event.priority == 'Low', 'medium-priority': event.priority == 'Medium', 'high-priority': event.priority == 'High'}">{{event.priority}}</p>
- <p class="inline event__severity" ng-class="{'low-priority': event.priority == 'Low', 'medium-priority': event.priority == 'Medium', 'high-priority': event.priority == 'High'}">{{event.severity_code}}</p>
- <p class="inline event__timestamp">{{(event.Timestamp | date:'medium': tmz) + ' ' + tmz}}</p></div>
- <div>
- <p class="inline event__description">{{getTitle(event)}}</p>
- </div>
- <div class="column small-1 large-1">
- <button class="accord-trigger" ng-class="{'active': event.meta}"
- ng-click="event.meta = ! event.meta"></button>
- </div>
+ ng-class="{'active': event.meta, 'selected': event.selected}">
+ <div class="row">
+ <div class="inline__confirm" ng-class="{active: event.confirm}">
+ <div class="inline__confirm-message">
+ <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete this event</strong>?</p>
+ </div>
+ <div class="inline__confirm-buttons">
+ <button class="btn-primary" ng-click="accept(event)">Yes</button>
+ <button class="btn-primary" ng-click="event.confirm=false;">No</button>
+ </div>
+ </div>
+ <div class="row">
+ <div class="column small-1 large-2 event-log__col-check">
+ <label class="control-check">
+ <input type="checkbox" name="events__check" ng-click="event.selected= ! event.selected"
+ ng-checked="event.selected"/>
+ <span class="control__indicator"></span>
+ </label>
+ </div>
+ <div class="column small-9 large-10 event-log__event-info"
+ ng-click="event.meta = ! event.meta">
+ <p class="inline event__id">#{{event.Id}}</p>
+ <p class="inline event__priority event-resolved" ng-hide="event.Resolved == 0">Resolved</p>
+ <p class="inline event__priority" ng-class="{'low-priority': event.priority == 'Low', 'medium-priority': event.priority == 'Medium', 'high-priority': event.priority == 'High'}">{{event.priority}}</p>
+ <p class="inline event__severity" ng-class="{'low-priority': event.priority == 'Low', 'medium-priority': event.priority == 'Medium', 'high-priority': event.priority == 'High'}">{{event.severity_code}}</p>
+ <p class="event__timestamp">{{(tmz == 'UTC' ? (event.Timestamp | date:'medium': tmz) : (event.Timestamp | date:'medium')) + ' ' + tmz}}</p>
+ <div>
+ <p class="inline event__description">{{getTitle(event)}}</p>
</div>
- <div class="row event__metadata-row" ng-class="{'active': event.meta}">
- <div class="column small-1 large-1 event-log__col-check"> </div>
- <div class="column small-11 large-11 end">
- <div class="event__metadata">{{getAdditionalData(event)}}
- </div>
- <div>
- <div class="event__actions">
- <button class="btn-meta-copy" clipboard text="copyText(event)" on-copied="copySuccess(event)" on-error="copyfailed(err)">
- <img class="event__icon" src="../../assets/images/icon-copy.svg" alt=""/><span ng-if="!event.copied">Copy</span><span ng-if="event.copied">Copied</span>
- </button>
- <button
- class="btn-delete"
- ng-class="{'disabled': multiSelected}"
- ng-click="event.confirm= ! event.confirm"
- ng-disabled="multiSelected">
- <img
- class="event__icon"
- src="../../assets/images/icon-trashcan.svg"
- alt=""/>Delete
- </button>
- <button class="btn-resolve" ng-class="{'disabled': (event.Resolved == 1 || multiSelected)}" ng-click="resolveEvent(event)" ng-disabled="event.Resolved == 1 || multiSelected"><img class="event__icon" src="../../assets/images/icon-check.svg" alt=""/>Mark as resolved</button>
- </div>
- <div class="event__related" ng-show="event.related_items.length">
- <p class="inline event__related-label">Related items:</p>
- <p class="event__related-item" ng-repeat="item in event.related_items">{{item}}</p>
- </div>
- </div>
- </div>
- </div>
+ </div>
+ <div class="column small-1 large-1">
+ <button class="accord-trigger" ng-class="{'active': event.meta}"
+ ng-click="event.meta = ! event.meta"></button>
+ </div>
+ </div>
+ <div class="row event__metadata-row" ng-class="{'active': event.meta}">
+ <div class="column small-1 large-1 event-log__col-check"> </div>
+ <div class="column small-11 large-11 end">
+ <div class="event__metadata">{{getAdditionalData(event)}}
+ </div>
+ <div>
+ <div class="event__actions">
+ <button class="btn-meta-copy" clipboard text="copyText(event)" on-copied="copySuccess(event)" on-error="copyfailed(err)">
+ <img class="event__icon" src="../../assets/images/icon-copy.svg" alt=""/><span ng-if="!event.copied">Copy</span><span ng-if="event.copied">Copied</span>
+ </button>
+ <button
+ class="btn-delete"
+ ng-class="{'disabled': multiSelected}"
+ ng-click="event.confirm= ! event.confirm"
+ ng-disabled="multiSelected">
+ <img
+ class="event__icon"
+ src="../../assets/images/icon-trashcan.svg"
+ alt=""/>Delete
+ </button>
+ <button class="btn-resolve" ng-class="{'disabled': (event.Resolved == 1 || multiSelected)}" ng-click="resolveEvent(event)" ng-disabled="event.Resolved == 1 || multiSelected"><img class="event__icon" src="../../assets/images/icon-check.svg" alt=""/>Mark as resolved</button>
+ </div>
+ <div class="event__related" ng-show="event.related_items.length">
+ <p class="inline event__related-label">Related items:</p>
+ <p class="event__related-item" ng-repeat="item in event.related_items">{{item}}</p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>