summaryrefslogtreecommitdiffstats
path: root/app/common/directives
diff options
context:
space:
mode:
authorYoshie Muranaka <yoshiemuranaka@gmail.com>2019-09-24 08:32:42 -0700
committerYoshie Muranaka <yoshiemuranaka@gmail.com>2019-10-02 07:02:24 -0700
commit4b366b5aeb97b35ab3612bfe1dc7d93a1f8a6e79 (patch)
tree5e184f589c9ddad570f582d8b5818ac933c89e14 /app/common/directives
parentea4968c0e8e6a71a7a23263bd05e04147339e6c5 (diff)
downloadphosphor-webui-4b366b5aeb97b35ab3612bfe1dc7d93a1f8a6e79.tar.gz
phosphor-webui-4b366b5aeb97b35ab3612bfe1dc7d93a1f8a6e79.zip
Clean up icons
Clean up duplicate svg icons from assets directory. Created a statusIcon component to dynamically render status icons instead of using background-image in scss files. - Moved/removed on, off, critical, warning svg icons from assets directory - Updated background-image status icons to use <icon> or <status-icon> directive Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com> Change-Id: Ic0f06d78b0861d6f60d40b2dcc0b80fd6dad2a88
Diffstat (limited to 'app/common/directives')
-rw-r--r--app/common/directives/app-header.html39
1 files changed, 23 insertions, 16 deletions
diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 651e56d..bf4fb8f 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -24,22 +24,29 @@
>
<icon aria-hidden="true" file="icon-chevron-right.svg"></icon>
</button>
- <a href="#/server-health/event-log" class="header__action"
- >Server health
- <icon aria-hidden="true" file="icon-chevron-right.svg"></icon
- ><span
- ng-class="{'status-light__error': dataService.server_health == 'Critical', 'status-light__warn': dataService.server_health == 'Warning', 'status-light__good': dataService.server_health == 'Good'}"
- >{{ dataService.server_health }}</span
- ></a
- >
- <a href="#/server-control/power-operations" class="header__action"
- >Server power
- <icon aria-hidden="true" file="icon-chevron-right.svg"></icon
- ><span
- ng-class="{'status-light__off': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__error': dataService.server_state == 'Quiesced'}"
- >{{ dataService.server_state | quiescedToError }}</span
- ></a
- >
+ <a href="#/server-health/event-log" class="header__action">
+ Server health
+ <icon aria-hidden="true" file="icon-chevron-right.svg"></icon>
+ <span>
+ <status-icon status="{{ dataService.server_health == 'Critical' ? 'error' :
+ dataService.server_health == 'Warning' ? 'warn' :
+ dataService.server_health == 'Good' ? 'on' : null }}">
+ </status-icon>
+ {{ dataService.server_health }}
+ </span>
+ </a>
+ <a href="#/server-control/power-operations" class="header__action">
+ Server power
+ <icon aria-hidden="true" file="icon-chevron-right.svg"></icon>
+ <span>
+ <status-icon status="{{ dataService.server_state == 'Quiesced' ? 'error' :
+ dataService.server_state == 'Running' ? 'on' :
+ dataService.server_state == 'Off' ? 'off' :
+ dataService.server_state == 'Unreachable' ? 'off' : null }}">
+ </status-icon>
+ {{ dataService.server_state | quiescedToError }}
+ </span>
+ </a>
<p class="header__refresh">
Data last refreshed<span>{{
dataService.last_updated | localeDate
OpenPOWER on IntegriCloud