cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/4.3 to ab6012f
Date Wed, 18 Jun 2014 11:24:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 276f29cad -> ab6012f19


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

Conflicts:
	ui/images/sprites.png
	ui/scripts/instances.js


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ab6012f1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ab6012f1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ab6012f1

Branch: refs/heads/4.3
Commit: ab6012f1941ef2f19c1ea97132a349293c46c783
Parents: 276f29c
Author: Brian Federle <bfederle@gmail.com>
Authored: Fri Mar 21 13:26:47 2014 -0700
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Wed Jun 18 13:24:28 2014 +0200

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties |  4 ++++
 ui/dictionary.jsp                                    |  4 ++++
 ui/scripts/instances.js                              | 13 ++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab6012f1/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 bccf71d..9fda960 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
 message.remove.ldap=Are you sure you want to delete the LDAP configuration?

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ab6012f1/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index a384d78..c157314 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/ab6012f1/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index c62e45e..d107a19 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -652,14 +652,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) {
@@ -686,14 +686,13 @@
                         }
                     },
                     reset: {
-                        label: 'Reset VM',
-                        textLabel: 'Reset VM',
+                        label: 'label.reinstall.vm',
                         messages: {
                             confirm: function(args) {
-                                return 'Do you want to restore the VM ?';
+                                return 'message.reinstall.vm';
                             },
                             notification: function(args) {
-                                return 'Reset VM';
+                                return 'label.reinstall.vm';
                             },
                             complete: function(args) {
                             	if (args.password != null && args.password.length >
0)


Mime
View raw message