diff options
| author | Gunnar Mills <gmills@us.ibm.com> | 2018-03-21 15:31:56 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-29 13:44:58 +0000 |
| commit | ee6efd85e5c9ee8bcc606f0f2fdb5b8663973fa2 (patch) | |
| tree | a05578d5fc2bb15026d151a388cc40c229bb57cf /app/configuration/controllers/firmware-controller.html | |
| parent | 51b03887bf146392beb4518a3233a8bcf5c354a6 (diff) | |
| download | phosphor-webui-ee6efd85e5c9ee8bcc606f0f2fdb5b8663973fa2.tar.gz phosphor-webui-ee6efd85e5c9ee8bcc606f0f2fdb5b8663973fa2.zip | |
Add server confirm activation modal
Added text specific to server images that appears in the
activation modal when a "server" image is activated.
The "server" and "BMC" images use the same modal, but the text
and if radio buttons appear differ.
Resolves openbmc/openbmc#2967
Tested: Activated both a server and BMC image on a Witherspoon.
Change-Id: I83693641ebfef802d403141ade55a950f359ba6e
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/configuration/controllers/firmware-controller.html')
| -rw-r--r-- | app/configuration/controllers/firmware-controller.html | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/configuration/controllers/firmware-controller.html b/app/configuration/controllers/firmware-controller.html index 298b323..92a0083 100644 --- a/app/configuration/controllers/firmware-controller.html +++ b/app/configuration/controllers/firmware-controller.html @@ -110,12 +110,16 @@ 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> - Confirm BMC firmware file activation + <!-- We call "Host" firmware "server" firmware --> + Confirm {{activate_image_type == 'Host' ? 'server' : activate_image_type}} firmware file activation </h1> </div> <div class="modal__content"> - <p>When you activate the BMC firmware file, {{activate_image_version}}, the BMC must be rebooted before it will operate with the new firmware code.</p> - <form> + <div ng-switch on="activate_image_type"> + <p ng-switch-when="BMC">When you activate the BMC firmware file, {{activate_image_version}}, the BMC must be rebooted before it will operate with the new firmware code.</p> + <p ng-switch-when="Host">When you activate server firmware file, {{activate_image_version}}, the new firmware will not operate until the next time the server boots.</p> + </div> + <form ng-if="activate_image_type == 'BMC'"> <fieldset> <div class="row column"> <label class="control-radio bold" for="activate-without-reboot">Activate firmware file without rebooting BMC |
