From 3bcd22bdafe0b071e19417133a63170562e99408 Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Wed, 26 Mar 2014 10:38:59 +0000 Subject: [PATCH] Added the ability to show warning (exclamation mark) icon on confirmation dialogs. Signed-off-by: Brian Federle --- ui/css/cloudstack3.css | 4 ++++ ui/scripts/instances.js | 1 + ui/scripts/network.js | 1 + ui/scripts/ui/dialog.js | 4 ++-- ui/scripts/ui/widgets/detailView.js | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 6e649f7a8e8..dea0a78ac83 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -3986,6 +3986,10 @@ Dialogs*/ background: url(../images/icons.png) no-repeat 0px -255px; } +.ui-dialog.warning .ui-dialog-title { + background: url(../images/icons.png) no-repeat 0px -286px; +} + .ui-dialog.confirm .ui-button { /*+placement:shift 0px -8px;*/ position: relative; diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 93a40fc0970..4d250efcf69 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -574,6 +574,7 @@ createForm: { title: 'label.action.destroy.instance', desc: 'label.action.destroy.instance', + isWarning: true, preFilter: function(args) { if (isAdmin() || isDomainAdmin()) { args.$form.find('.form-item[rel=expunge]').css('display', 'inline-block'); diff --git a/ui/scripts/network.js b/ui/scripts/network.js index b3a003d06e1..118b5d875af 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1084,6 +1084,7 @@ confirm: function(args) { return 'message.action.delete.network'; }, + isWarning: true, notification: function(args) { return 'label.action.delete.network'; } diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 14ea4dd1556..f2ba5c1655b 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -79,7 +79,7 @@ $('.overlay').remove(); return $formContainer.dialog({ - dialogClass: 'create-form', + dialogClass: args.form.isWarning ? 'create-form warning' : 'create-form', closeOnEscape: false, draggable: false, width: 400, @@ -844,7 +844,7 @@ ) ).dialog({ title: _l('label.confirmation'), - dialogClass: 'confirm', + dialogClass: args.isWarning ? 'confirm warning': 'confirm', closeOnEscape: false, zIndex: 5000, buttons: [{ diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js index 681392fba46..ed51fadda02 100644 --- a/ui/scripts/ui/widgets/detailView.js +++ b/ui/scripts/ui/widgets/detailView.js @@ -311,6 +311,7 @@ if (messages && messages.confirm) { cloudStack.dialog.confirm({ message: messages.confirm(messageArgs), + isWarning: messages.isWarning, action: function() { performAction({ id: id