openstack/vitrage-dashboard
Code Issues Proposed changes

Merge "fix time format to show in 24h"

Browse Source
This commit is contained in:
Zuul 2018-06-27 12:18:00 +00:00 committed by Gerrit Code Review
commit 6553ee3af2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vitrage_dashboard/dashboard/static/dashboard/project/alarmList/alarmList.html
View File

@ -28,7 +28,7 @@
<tbody> <tbody>
<tr ng-repeat="alarm in alarmList.ialarms track by $index"> <tr ng-repeat="alarm in alarmList.ialarms track by $index">
<td title="{$ alarm.vitrage_aggregated_severity $}"><i class="fa first-column" ng-class="{'orange fa-exclamation-triangle': alarm.vitrage_operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.vitrage_operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.vitrage_operational_severity == 'CRITICAL', 'green fa-check': alarm.vitrage_operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.vitrage_operational_severity == 'N/A'}"></i></td> <td title="{$ alarm.vitrage_aggregated_severity $}"><i class="fa first-column" ng-class="{'orange fa-exclamation-triangle': alarm.vitrage_operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.vitrage_operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.vitrage_operational_severity == 'CRITICAL', 'green fa-check': alarm.vitrage_operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.vitrage_operational_severity == 'N/A'}"></i></td>
<td><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} </td> <td><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd HH:mm:ss"$} </td>
<td>{$alarm.name$}</td> <td>{$alarm.name$}</td>
<td>{$alarm.vitrage_resource_type$}</td> <td>{$alarm.vitrage_resource_type$}</td>
<td>{$alarm.vitrage_resource_id$}</td> <td>{$alarm.vitrage_resource_id$}</td>

2
vitrage_dashboard/dashboard/static/dashboard/project/components/alarms/alarms.html
View File

@ -20,7 +20,7 @@
<tbody> <tbody>
<tr ng-repeat="alarm in alarmsCtrl.computeAlarms track by $index"> <tr ng-repeat="alarm in alarmsCtrl.computeAlarms track by $index">
<td title="{$ alarm.vitrage_aggregated_state $}"><i class="fa" ng-class="{'orange fa-exclamation-triangle': alarm.vitrage_operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.vitrage_operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.vitrage_operational_severity == 'CRITICAL', 'green fa-check': alarm.vitrage_operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.vitrage_operational_severity == 'N/A'}"></i></td> <td title="{$ alarm.vitrage_aggregated_state $}"><i class="fa" ng-class="{'orange fa-exclamation-triangle': alarm.vitrage_operational_severity == 'SEVERE', 'yellow fa-exclamation-triangle': alarm.vitrage_operational_severity == 'WARNING', 'red fa-exclamation-circle': alarm.vitrage_operational_severity == 'CRITICAL', 'green fa-check': alarm.vitrage_operational_severity == 'OK', 'gray fa-circle-o-notch': alarm.vitrage_operational_severity == 'N/A'}"></i></td>
<td title="{$alarm.update_timestamp | date:'yyyy-MM-dd hh:mm:ss'$}"><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd hh:mm:ss"$} </td> <td title="{$alarm.update_timestamp | date:'yyyy-MM-dd HH:mm:ss'$}"><i class="fa fa-clock-o"></i> {$alarm.update_timestamp | date:"yyyy-MM-dd HH:mm:ss"$} </td>
<td class="ellipsis" title="{$alarm.name$}">{$alarm.name$}</td> <td class="ellipsis" title="{$alarm.name$}">{$alarm.name$}</td>
<td title="{$ 'Root Cause Analysis' | translate $}" ng-click="alarmsCtrl.onAlarmClick(alarm)"><i class="fa fa-sitemap"></i></td> <td title="{$ 'Root Cause Analysis' | translate $}" ng-click="alarmsCtrl.onAlarmClick(alarm)"><i class="fa fa-sitemap"></i></td>
</tr> </tr>

2
vitrage_dashboard/dashboard/static/dashboard/project/templateList/templateList.html
View File

@ -26,7 +26,7 @@
<td>{$template.status$}</td> <td>{$template.status$}</td>
<td>{$template.type$}</td> <td>{$template.type$}</td>
<td>{$template["status details"]$}</td> <td>{$template["status details"]$}</td>
<td><i class="fa fa-clock-o"></i> {$template.date | date:"yyyy-MM-dd hh:mm:ss"$}</td> <td><i class="fa fa-clock-o"></i> {$template.date | date:"yyyy-MM-dd HH:mm:ss"$}</td>
<td ng-click="templateList.onShowClick(template)"><i class="fa fa-list"></i></td> <td ng-click="templateList.onShowClick(template)"><i class="fa fa-list"></i></td>
</tr> </tr>
</tbody> </tbody>