incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-3621 cleanup dialog for unable to delete host. (ababiichuk)
Date Wed, 30 Oct 2013 12:59:49 GMT
Updated Branches:
  refs/heads/trunk 08165ae61 -> 035f28649


AMBARI-3621 cleanup dialog for unable to delete host. (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/035f2864
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/035f2864
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/035f2864

Branch: refs/heads/trunk
Commit: 035f2864988cd3d1c0082e62bae372bea7a22bed
Parents: 08165ae
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Wed Oct 30 14:57:03 2013 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Wed Oct 30 14:59:36 2013 +0200

----------------------------------------------------------------------
 ambari-web/app/messages.js                               |  2 +-
 .../main/host/details/raiseDeleteComponentErrorPopup.hbs | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/035f2864/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 146333c..4abe5c5 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1300,7 +1300,7 @@ Em.I18n.translations = {
   'hosts.delete.popup.header':'Confirmation',
   'hosts.delete.popup.title':'Delete Host',
   'hosts.delete.popup.unknownComponents':'Components with unknown status:',
-  'hosts.cant.do.popup.title':'Delete Host Error',
+  'hosts.cant.do.popup.title':'Unable to Delete Host',
   'hosts.cant.do.popup.masterList.body':'Host with {0} master components cannot be deleted',
   'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is
not supported. ',
   'hosts.cant.do.popup.runningList.body':'Host cannot be deleted with the following {0} components
running. ',

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/035f2864/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
index 33d70b7..cf54571 100644
--- a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
+++ b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
@@ -17,8 +17,13 @@
 }}
 
 <p><i class="icon-warning-sign"></i> {{componentsBody}}</p>
-<i>{{componentsStr}}</i>
+<div class='row-fluid'>
+  <div class='tinyoffset span10'>
+    <i>{{componentsStr}}</i>
+  </div>
+</div>
+
 {{#if showBodyEnd}}
-    <br /><br />
-    <p>{{componentsBodyEnd}}</p>
+    <br />
+    <div class='alert alert-warning'><strong>{{t common.important}}:</strong>
{{componentsBodyEnd}}</div>
 {{/if}}
\ No newline at end of file


Mime
View raw message