cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to 54db0d2
Date Fri, 19 Dec 2014 09:07:03 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 0c4128e02 -> 54db0d2a7


show Warning instead of Confirmation in confirm dialog if isWarning is set to true


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

Branch: refs/heads/master
Commit: 54db0d2a701767de4b7980802f8662eecb9a610b
Parents: 0c4128e
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Fri Dec 19 10:06:31 2014 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Fri Dec 19 10:06:31 2014 +0100

----------------------------------------------------------------------
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/dictionary2.jsp                                   | 1 +
 ui/scripts/instances.js                              | 2 ++
 ui/scripts/ui/dialog.js                              | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54db0d2a/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 77d80a7..990bb31 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1275,6 +1275,7 @@ label.vsmstoragevlanid=Storage VLAN ID
 label.vsphere.managed=vSphere Managed
 label.waiting=Waiting
 label.warn=Warn
+label.warning=Warning
 label.wednesday=Wednesday
 label.weekly=Weekly
 label.welcome.cloud.console=Welcome to Management Console

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54db0d2a/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 635a374..1b2089c 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -256,6 +256,7 @@ under the License.
 'label.vsphere.managed': '<fmt:message key="label.vsphere.managed" />',
 'label.waiting': '<fmt:message key="label.waiting" />',
 'label.warn': '<fmt:message key="label.warn" />',
+'label.warning': '<fmt:message key="label.warning" />',
 'label.wednesday': '<fmt:message key="label.wednesday" />',
 'label.weekly': '<fmt:message key="label.weekly" />',
 'label.welcome.cloud.console': '<fmt:message key="label.welcome.cloud.console" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54db0d2a/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 90ce2b1..d439c66 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -675,6 +675,7 @@
                             confirm: function(args) {
                                 return 'message.action.expunge.instance';
                             },
+                            isWarning: true,
                             notification: function(args) {
                                 return 'label.action.expunge.instance';
                             }
@@ -741,6 +742,7 @@
                             confirm: function(args) {
                                 return 'message.reinstall.vm';
                             },
+                            isWarning: true,
                             notification: function(args) {
                                 return 'label.reinstall.vm';
                             },

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54db0d2a/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 610cb1a..e5ac14b 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -827,7 +827,7 @@
                     _l(args.message)
                 )
             ).dialog({
-                title: _l('label.confirmation'),
+                title: args.isWarning ? _l('label.warning') : _l('label.confirmation'),
                 dialogClass: args.isWarning ? 'confirm warning': 'confirm',
                 closeOnEscape: false,
                 zIndex: 5000,


Mime
View raw message