Remove "reboot" modal
This modal was not used.
Tested: Uploaded and activated an image on a Witherspoon.
Change-Id: I3eb549b04f09565da06a28815b2b3843dd72cafb
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html
index 2129e83..298b323 100644
--- a/app/configuration/controllers/firmware-controller.html
+++ b/app/configuration/controllers/firmware-controller.html
@@ -102,28 +102,6 @@
</div>
</section>
-<section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': reboot_confirm}">
- <div class="modal__reboot" role="document">
- <div class="screen-reader-offscreen modal-description">Server reboot required modal</div><!-- accessibility only; used for screen readers -->
- <div class="page-header ">
- <h1 class="modal-title h4"><span class="icon icon__info"><svg xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 32 32"><path
- d="M18 14h-6v2h1v6h-2v2h8v-2h-2z"/><circle cx="16" cy="10" r="2"/><path
- d="M16 2C8.269 2 2 8.269 2 16s6.269 14 14 14 14-6.269 14-14S23.731 2 16 2zm0 26C9.383 28 4 22.617 4 16S9.383 4 16 4s12 5.383 12 12-5.383 12-12 12z"/></svg></span>
- Server reboot required
- </h1>
- </div>
- <div class="modal__content">
- <p>You specified a new primary firmware image. This change will not take effect until the server is powered
- down and restarted.</p>
- </div>
- <a href="#/server-control/power-operations" class="bold modal__link">Go to power operations page</a>
- <div class="modal__button-wrapper">
- <button class="inline btn-secondary" ng-click="reboot_confirm=false;">Cancel</button>
- <button class="inline btn-primary" ng-click="confirmWarmReboot()">Warm reboot</button>
- </div>
- </div>
-</section>
<section class="modal" aria-hidden="true" aria-labelledby="modalTitle" aria-describedby="modalDescription" role="dialog" ng-class="{'active': activate_confirm}">
<div class="modal__activate" role="document">
<div class="screen-reader-offscreen modal-description">Activate modal</div><!-- accessibility only; used for screen readers -->
@@ -155,4 +133,4 @@
</div>
</div>
</section>
-<div class="modal-overlay" tabindex="-1" ng-class="{'active': (display_error || reboot_confirm || activate_confirm)}"></div>
+<div class="modal-overlay" tabindex="-1" ng-class="{'active': (display_error || activate_confirm)}"></div>
diff --git a/app/configuration/controllers/firmware-controller.js b/app/configuration/controllers/firmware-controller.js
index 4c706bf..812f471 100644
--- a/app/configuration/controllers/firmware-controller.js
+++ b/app/configuration/controllers/firmware-controller.js
@@ -33,7 +33,6 @@
$scope.bmcActiveVersion = "";
$scope.hostActiveVersion = "";
$scope.display_error = false;
- $scope.reboot_confirm = false;
$scope.activate_confirm = false;
$scope.delete_image_id = "";
$scope.delete_image_version = "";
@@ -83,10 +82,6 @@
$scope.activate_confirm = false;
}
- $scope.confirmWarmReboot = function(){
- $scope.reboot_confirm = false;
- }
-
$scope.upload = function(){
if($scope.file) {
$scope.uploading = true;