From 15729f342cd3f3fe1b7dfb7779f82be85c30ab2d Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Fri, 21 Mar 2014 13:26:47 -0700 Subject: [PATCH] CLOUDSTACK-6272: Fix recover/restore VM actions -Label recoverVirtualMachine as 'Recover VM' -Label restoreVirtualMachine as 'Reinstall VM' -Change confirmation text for restoreVirtualMachine to be more explicit -Change restoreVirtualMachine icon to 'recycle' symbol, to avoid confusion with the reboot VM icon --- .../classes/resources/messages.properties | 4 ++++ ui/dictionary.jsp | 4 ++++ ui/images/sprites.png | Bin 211543 -> 212064 bytes ui/scripts/instances.js | 13 ++++++------- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 8329325ba42..9cf9fc12acb 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,10 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +label.reinstall.vm=Reinstall VM +message.reinstall.vm=NOTE: Proceed with caution. This will cause the VM to be reinstalled from the template; data on the root disk will be lost. Extra data volumes, if any, will not be touched. +label.recover.vm=Recover VM +message.recover.vm=Please confirm that you would like to recover this VM. label.port=Port label.remove.ldap=Remove LDAP label.configure.ldap=Configure LDAP diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 074db7f061b..ebe71b6a879 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,10 @@ under the License. <% long now = System.currentTimeMillis(); %>