commit 5912f75784ac35779d7498df42c621a671084a8d
author Iftekharul Islam <iffy.ryan@ibm.com> Mon Sep 11 14:40:11 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Mon Oct 09 14:57:38 2017 -0500
tree fae949c37b4931c4e75004cb42ae61fe63b0838f
parent 857e78b1c7023a42e1e6c89bb26352603720a4b5

Changing the server name from Quiesced to Standby in header and power operation page

Change-Id: I5a2358fa4783a58d1d6ab73f9901e1f8fa2f54a8
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/server-control/controllers/power-operations-controller.html

diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html
index b41df07..7a872f5 100644
--- a/app/server-control/controllers/power-operations-controller.html
+++ b/app/server-control/controllers/power-operations-controller.html
@@ -1,3 +1,4 @@
+<loader loading="dataService.loading"></loader>
 <div id="power-operations">
 
     <div class="row column">
@@ -10,7 +11,7 @@
     <div class="row column">
         <div id="power-indicator-bar" class="power__indicator-bar" ng-class="{'power__state-on': dataService.server_state == 'Running', 'power__state-off': dataService.server_state == 'Off', 'power__state-indet': dataService.server_state == 'Standby'}">
             <p class="inline">{{dataService.hostname}} - {{dataService.server_id}}</p>
-            <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state}}</span></h3>
+            <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state | quiescedToStandBy}}</span></h3>
         </div>
     </div>
     <div class="row column">
@@ -19,7 +20,7 @@
         </div>
 
         <!-- Power on displays only when server is shutdown -->
-        <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Standby'" ng-class="{disabled: dataService.server_unreachable || (confirm && !power_confirm) || dataService.loading, transitionAll: confirm && power_confirm}">
+        <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced'" ng-class="{disabled: dataService.server_unreachable || (confirm && !power_confirm) || dataService.loading, transitionAll: confirm && power_confirm}">
             <button id="power__power-on" class="btn-secondary inline" ng-click="togglePower()" role="button" ng-disabled="dataService.server_unreachable"><img src="assets/images/icon-power.svg" alt="power on" aria-hidden="true">Power on</button>
             <p class="inline">Attempts to power on the server</p>
         </div>