diff options
author | Gunnar Mills <gmills@us.ibm.com> | 2019-05-17 14:39:23 -0500 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2019-05-17 16:28:24 -0500 |
commit | 6af5d2947a1ac15f3cfa0475ec6acbb1b8c56610 (patch) | |
tree | 6d3a09ab213c7981177f0fbfba7b2d4b2fb23a26 /app/server-control | |
parent | 8e1bb0a97f23a75a406cf899b4ba028024258dd7 (diff) | |
download | phosphor-webui-6af5d2947a1ac15f3cfa0475ec6acbb1b8c56610.tar.gz phosphor-webui-6af5d2947a1ac15f3cfa0475ec6acbb1b8c56610.zip |
Rename variables to follow lowerCamelCase
OpenBMC follows Google JavaScript Style Guide.
https://google.github.io/styleguide/jsguide.html#naming-local-variable-names
https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#javascript
Change-Id: I0be270d8cb8f219f048626591e6b623c4307eef7
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/server-control')
-rw-r--r-- | app/server-control/controllers/power-operations-controller.html | 20 | ||||
-rw-r--r-- | app/server-control/controllers/power-operations-controller.js | 24 |
2 files changed, 22 insertions, 22 deletions
diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html index 3dc69d2..f015e1f 100644 --- a/app/server-control/controllers/power-operations-controller.html +++ b/app/server-control/controllers/power-operations-controller.html @@ -4,7 +4,7 @@ <h1>Server power operations</h1> <div class="power__current-status page-header"> <h2 class="inline">Current status</h2> - <div class="power__status-log inline float-right">Last power operation at <span class="courier-bold">{{power_time | localeDate}}</span></div> + <div class="power__status-log inline float-right">Last power operation at <span class="courier-bold">{{powerTime | localeDate}}</span></div> </div> </div> <div class="row column"> @@ -19,30 +19,30 @@ </div> <span class="inactive-message" ng-show="dataService.server_state == 'Unreachable'">There are no power operations to display while a power operation is in progress. When complete, any new power operations will be displayed here.</span> <!-- Power on displays only when server is shutdown --> - <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced' || dataService.server_state == 'Unreachable'" 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' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !powerConfirm) || dataService.loading, transitionAll: confirm && powerConfirm}"> <button id="power__power-on" class="btn-secondary inline" ng-click="powerOn()" 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> <!-- Power reboot/shutdown options : when server is off all of these are hidden. When one option is selected, the others are disabled. --> - <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !warmboot_confirm) || dataService.loading, transitionAll: confirm && warmboot_confirm}"> + <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !confirmWarmReboot) || dataService.loading, transitionAll: confirm && confirmWarmReboot}"> <button id="power__warm-boot" class="btn-secondary inline" ng-click="warmRebootConfirm()" role="button" ng-disabled="dataService.server_unreachable"><i aria-hidden="true">↻</i> Warm reboot</button> <p class="inline">Attempts to perform an orderly shutdown before restarting the server</p> - <confirm title="warm reboot" confirm="warmboot_confirm" ng-show="warmboot_confirm" callback="warmReboot"></confirm> + <confirm title="warm reboot" confirm="confirmWarmReboot" ng-show="confirmWarmReboot" callback="warmReboot"></confirm> </div> - <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !coldboot_confirm) || dataService.loading, transitionAll: confirm && coldboot_confirm}"> + <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !confirmColdReboot) || dataService.loading, transitionAll: confirm && confirmColdReboot}"> <button id="power__cold-boot" class="btn-secondary inline" ng-click="coldRebootConfirm()" role="button" ng-disabled="dataService.server_unreachable"><i aria-hidden="true">↻</i> Cold reboot</button> <p class="inline">Shuts down the server immediately, then restarts it</p> - <confirm title="cold reboot" confirm="coldboot_confirm" ng-show="coldboot_confirm" cancel="coldbootCancel" callback="coldReboot"></confirm> + <confirm title="cold reboot" confirm="confirmColdReboot" ng-show="confirmColdReboot" cancel="coldbootCancel" callback="coldReboot"></confirm> </div> - <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !orderly_confirm) || dataService.loading, transitionAll: confirm && orderly_confirm}"> + <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !confirmOrderlyShutdown) || dataService.loading, transitionAll: confirm && confirmOrderlyShutdown}"> <button id="power__soft-shutdown" class="btn-secondary inline" ng-click="orderlyShutdownConfirm()" role="button" ng-disabled="dataService.server_unreachable"><img aria-hidden="true" src="../../assets/images/icon-power.svg" />Orderly shutdown</button> <p class="inline">Attempts to stop all software on the server before removing power</p> - <confirm title="orderly shutdown" confirm="orderly_confirm" ng-show="orderly_confirm" cancel="orderlyShutdownCancel" callback="orderlyShutdown"></confirm> + <confirm title="orderly shutdown" confirm="confirmOrderlyShutdown" ng-show="confirmOrderlyShutdown" cancel="orderlyShutdownCancel" callback="orderlyShutdown"></confirm> </div> - <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !immediately_confirm) || dataService.loading, transitionAll: confirm && immediately_confirm}"> + <div class="column power-option" ng-hide="dataService.server_state == 'Off' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !confirmImmediateShutdown) || dataService.loading, transitionAll: confirm && confirmImmediateShutdown}"> <button id="power__hard-shutdown" class="btn-secondary inline" ng-click="immediateShutdownConfirm()" role="button" ng-disabled="dataService.server_unreachable"><img aria-hidden="true" src="../../assets/images/icon-power.svg" />Immediate shutdown</button> <p class="inline">Removes power from the server without waiting for software to stop</p> - <confirm title="immediate shutdown" confirm="immediately_confirm" ng-show="immediately_confirm" cancel="immediatelyShutdownCancel" callback="immediateShutdown"></confirm> + <confirm title="immediate shutdown" confirm="confirmImmediateShutdown" ng-show="confirmImmediateShutdown" cancel="immediatelyShutdownCancel" callback="immediateShutdown"></confirm> </div> </div> </div> diff --git a/app/server-control/controllers/power-operations-controller.js b/app/server-control/controllers/power-operations-controller.js index 1a1f355..83e6580 100644 --- a/app/server-control/controllers/power-operations-controller.js +++ b/app/server-control/controllers/power-operations-controller.js @@ -17,11 +17,11 @@ window.angular && (function(angular) { $interpolate, $q, toastService) { $scope.dataService = dataService; $scope.confirm = false; - $scope.power_confirm = false; - $scope.warmboot_confirm = false; - $scope.coldboot_confirm = false; - $scope.orderly_confirm = false; - $scope.immediately_confirm = false; + $scope.powerConfirm = false; + $scope.confirmWarmReboot = false; + $scope.confirmColdReboot = false; + $scope.confirmOrderlyShutdown = false; + $scope.confirmImmediateShutdown = false; $scope.loading = true; var pollChassisStatusTimer = undefined; @@ -33,9 +33,9 @@ window.angular && (function(angular) { .then( function(data) { if (data.data == 0) { - $scope.power_time = 'not available'; + $scope.powerTime = 'not available'; } else { - $scope.power_time = data.data; + $scope.powerTime = data.data; } }, function(error) { @@ -73,7 +73,7 @@ window.angular && (function(angular) { return; } $scope.confirm = true; - $scope.power_confirm = true; + $scope.powerConfirm = true; }; function pollChassisStatusTillOff() { @@ -136,7 +136,7 @@ window.angular && (function(angular) { return; } $scope.confirm = true; - $scope.warmboot_confirm = true; + $scope.confirmWarmReboot = true; }; $scope.coldReboot = function() { @@ -172,7 +172,7 @@ window.angular && (function(angular) { return; } $scope.confirm = true; - $scope.coldboot_confirm = true; + $scope.confirmColdReboot = true; }; $scope.orderlyShutdown = function() { @@ -203,7 +203,7 @@ window.angular && (function(angular) { return; } $scope.confirm = true; - $scope.orderly_confirm = true; + $scope.confirmOrderlyShutdown = true; }; $scope.immediateShutdown = function() { @@ -232,7 +232,7 @@ window.angular && (function(angular) { return; } $scope.confirm = true; - $scope.immediately_confirm = true; + $scope.confirmImmediateShutdown = true; }; } ]); |