Copy and design changes based on user feedback
Change-Id: I1371711fa8549375b3ae117dfc99b9234e52b33a
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/server-control/controllers/bmc-reboot-controller.html b/app/server-control/controllers/bmc-reboot-controller.html
index 082e0d5..b7ffd39 100644
--- a/app/server-control/controllers/bmc-reboot-controller.html
+++ b/app/server-control/controllers/bmc-reboot-controller.html
@@ -1,27 +1,28 @@
-<div id="bmc-reboot">
- <div class="row column">
- <h1>Reboot BMC</h1>
- </div>
+<section id="bmc-reboot">
+ <div class="row column">
+ <h1>Reboot BMC</h1>
+ </div>
- <div class="row column btm-border-grey">
- <span class="bmc-reboot__status-log inline">BMC last reboot at {{dataService.last_updated |date:'h:mm:ss on MMM dd yyyy'}}</span>
- </div>
-
- <div class="row column btm-border-grey bmc-reboot-option"
- ng-class="{disabled: dataService.server_unreachable || dataService.loading, transitionAll: confirm}">
- <ul>
- <li>Rebooting the BMC causes your browser to lose contact with the BMC for several minutes.</li>
- <li>When the BMC software has started, you can then log in again.</li>
- <li>If the Log In button is not enabled after several minutes, you may need to point your browser to the
- BMC’s address to log in again.
- </li>
- </ul>
- <button id="bmc__reboot" class="btn-secondary" ng-click="rebootConfirm()" ng-disabled="dataService.server_unreachable"><i>↻</i> Reboot BMC
- </button>
- <confirm title="Reboot the BMC"
- message="Rebooting the BMC causes your browser to lose contact with the BMC for several minutes."
- confirm="confirm"
- ng-show="confirm"
- callback="reboot"></confirm>
- </div>
-</div>
+ <div class="row column">
+ <div class="page-header">
+ <p class="inline h4">Current BMC boot status</p>
+ <div class="float-right bmc-reboot__status-log inline">BMC last reboot at
+ <span class="courier-bold">{{dataService.last_updated |date:'h:mm:ss on MMM dd yyyy'}}</span></div>
+ </div>
+ </div>
+ <div class="row column">
+ <div class="bmc-reboot-option" ng-class="{disabled: dataService.server_unreachable || dataService.loading, transitionAll: confirm}">
+ <p>When you reboot the BMC, your web browser loses contact with the BMC for several minutes. When the BMC is back online, you must log in again. If the Log In button is not available when the BMC is brought back online, close your web browser. Then, reopen the web browser and enter your BMC IP address.</p>
+ <confirm title="Reboot the BMC"
+ message="Rebooting the BMC causes your browser to lose contact with the BMC for several minutes."
+ confirm="confirm"
+ ng-show="confirm"
+ callback="reboot"></confirm>
+ </div>
+ </div>
+ <div class="row column">
+ <button id="bmc__reboot" class="btn-secondary float-right" ng-click="rebootConfirm()" ng-disabled="dataService.server_unreachable">
+ <i>↻</i> Reboot BMC
+ </button>
+ </div>
+</section>
diff --git a/app/server-control/styles/bmc-reboot.scss b/app/server-control/styles/bmc-reboot.scss
index 23d1167..2b1a293 100644
--- a/app/server-control/styles/bmc-reboot.scss
+++ b/app/server-control/styles/bmc-reboot.scss
@@ -1,27 +1,12 @@
// BMC Reboot
-
-#bmc-reboot {
- ul {
- margin: 0;
- padding: 0;
- margin-left: 1.3em;
+.bmc-reboot-option {
+ position: relative;
+ overflow: hidden;
+ padding-bottom: 1.5em;
+ margin-bottom: 1em;
+ border-bottom: 1px solid $lightbg__grey;
+ button {
+ margin-bottom: 1.5em;
+ margin-top: 1.5em;
}
- .bmc-reboot__status-log {
- color: $darkgrey;
- font-weight: 500;
- margin-top: 1em;
- padding-bottom: .7em;
- }
-
- .bmc-reboot-option {
- position: relative;
- overflow: hidden;
- padding-top: 1.5em;
- padding-left: 1.8em;
- button {
- margin-bottom: 1.5em;
- margin-top: 1.5em;
- }
- }
-
}