Repository: cloudstack Updated Branches: refs/heads/master 2adb9af89 -> 15729f342
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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15729f34 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15729f34 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15729f34 Branch: refs/heads/master Commit: 15729f342cd3f3fe1b7dfb7779f82be85c30ab2d Parents: 2adb9af Author: Brian Federle <bfede...@gmail.com> Authored: Fri Mar 21 13:26:47 2014 -0700 Committer: Brian Federle <bfede...@gmail.com> Committed: Fri Mar 21 13:28:52 2014 -0700 ---------------------------------------------------------------------- .../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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15729f34/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 8329325..9cf9fc1 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15729f34/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 074db7f..ebe71b6 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,10 @@ under the License. <% long now = System.currentTimeMillis(); %> <script type="text/javascript"> dictionary = { +'label.recover.vm': '<fmt:message key="label.recover.vm" />', +'message.recover.vm': '<fmt:message key="message.recover.vm" />', +'label.reinstall.vm': '<fmt:message key="label.reinstall.vm" />', +'message.reinstall.vm': '<fmt:message key="message.reinstall.vm" />', 'label.port': '<fmt:message key="label.port" />', 'label.remove.ldap': '<fmt:message key="label.remove.ldap" />', 'message.remove.ldap': '<fmt:message key="message.remove.ldap" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15729f34/ui/images/sprites.png ---------------------------------------------------------------------- diff --git a/ui/images/sprites.png b/ui/images/sprites.png index ab39670..ee64047 100644 Binary files a/ui/images/sprites.png and b/ui/images/sprites.png differ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15729f34/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 10d2591..0242e35 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -661,14 +661,14 @@ } }, restore: { - label: 'label.action.restore.instance', + label: 'label.recover.vm', compactLabel: 'label.restore', messages: { confirm: function(args) { - return 'message.action.restore.instance'; + return 'message.recover.vm'; }, notification: function(args) { - return 'label.action.restore.instance'; + return 'label.recover.vm'; } }, action: function(args) { @@ -695,14 +695,13 @@ } }, reset: { - label: 'label.resetVM', - textLabel: 'label.resetVM', + label: 'label.reinstall.vm', messages: { confirm: function(args) { - return 'message.restoreVM'; + return 'message.reinstall.vm'; }, notification: function(args) { - return 'label.resetVM'; + return 'label.reinstall.vm'; }, complete: function(args) { if (args.password != null && args.password.length > 0)
