apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei Zhou 2014-12-19 10:06:31 +01:00
parent 0c4128e024
commit 54db0d2a70
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -1275,6 +1275,7 @@ label.vsmstoragevlanid=Storage VLAN ID
label.vsphere.managed=vSphere Managed label.vsphere.managed=vSphere Managed
label.waiting=Waiting label.waiting=Waiting
label.warn=Warn label.warn=Warn
label.warning=Warning
label.wednesday=Wednesday label.wednesday=Wednesday
label.weekly=Weekly label.weekly=Weekly
label.welcome.cloud.console=Welcome to Management Console label.welcome.cloud.console=Welcome to Management Console

1
ui/dictionary2.jsp
View File

@ -256,6 +256,7 @@ under the License.
'label.vsphere.managed': '<fmt:message key="label.vsphere.managed" />', 'label.vsphere.managed': '<fmt:message key="label.vsphere.managed" />',
'label.waiting': '<fmt:message key="label.waiting" />', 'label.waiting': '<fmt:message key="label.waiting" />',
'label.warn': '<fmt:message key="label.warn" />', 'label.warn': '<fmt:message key="label.warn" />',
'label.warning': '<fmt:message key="label.warning" />',
'label.wednesday': '<fmt:message key="label.wednesday" />', 'label.wednesday': '<fmt:message key="label.wednesday" />',
'label.weekly': '<fmt:message key="label.weekly" />', 'label.weekly': '<fmt:message key="label.weekly" />',
'label.welcome.cloud.console': '<fmt:message key="label.welcome.cloud.console" />', 'label.welcome.cloud.console': '<fmt:message key="label.welcome.cloud.console" />',

2
ui/scripts/instances.js
View File

@ -675,6 +675,7 @@
confirm: function(args) { confirm: function(args) {
return 'message.action.expunge.instance'; return 'message.action.expunge.instance';
}, },
isWarning: true,
notification: function(args) { notification: function(args) {
return 'label.action.expunge.instance'; return 'label.action.expunge.instance';
} }
@ -741,6 +742,7 @@
confirm: function(args) { confirm: function(args) {
return 'message.reinstall.vm'; return 'message.reinstall.vm';
}, },
isWarning: true,
notification: function(args) { notification: function(args) {
return 'label.reinstall.vm'; return 'label.reinstall.vm';
}, },

2
ui/scripts/ui/dialog.js
View File

@ -827,7 +827,7 @@
_l(args.message) _l(args.message)
) )
).dialog({ ).dialog({
title: _l('label.confirmation'), title: args.isWarning ? _l('label.warning') : _l('label.confirmation'),
dialogClass: args.isWarning ? 'confirm warning': 'confirm', dialogClass: args.isWarning ? 'confirm warning': 'confirm',
closeOnEscape: false, closeOnEscape: false,
zIndex: 5000, zIndex: 5000,