cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/master to 3bcd22b
Date Thu, 14 Aug 2014 21:05:03 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d5c71677d -> 3bcd22bda


Added the ability to show warning (exclamation mark) icon on confirmation dialogs.

Signed-off-by: Brian Federle <brian.federle@citrix.com>


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

Branch: refs/heads/master
Commit: 3bcd22bdafe0b071e19417133a63170562e99408
Parents: d5c7167
Author: Mihaela Stoica <mihaela.stoica@citrix.com>
Authored: Wed Mar 26 10:38:59 2014 +0000
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Thu Aug 14 14:04:22 2014 -0700

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bcd22bd/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 6e649f7..dea0a78 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;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bcd22bd/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 93a40fc..4d250ef 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');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bcd22bd/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index b3a003d..118b5d8 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';
                                     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bcd22bd/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 14ea4dd..f2ba5c1 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: [{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3bcd22bd/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 681392f..ed51fad 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


Mime
View raw message