diff options
| author | Gunnar Mills <gmills@us.ibm.com> | 2018-03-21 13:24:04 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-29 13:44:58 +0000 |
| commit | 51b03887bf146392beb4518a3233a8bcf5c354a6 (patch) | |
| tree | 8409742dd96d7215d8d8670d7d0f96e4940ed8a2 | |
| parent | e7f83970d3038211c9f4a4a288a3335f49c32a03 (diff) | |
| download | phosphor-webui-51b03887bf146392beb4518a3233a8bcf5c354a6.tar.gz phosphor-webui-51b03887bf146392beb4518a3233a8bcf5c354a6.zip | |
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>
| -rw-r--r-- | app/configuration/controllers/firmware-controller.html | 24 | ||||
| -rw-r--r-- | app/configuration/controllers/firmware-controller.js | 5 |
2 files changed, 1 insertions, 28 deletions
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 @@ window.angular && (function (angular) { $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 @@ window.angular && (function (angular) { $scope.activate_confirm = false; } - $scope.confirmWarmReboot = function(){ - $scope.reboot_confirm = false; - } - $scope.upload = function(){ if($scope.file) { $scope.uploading = true; |
