ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-3787. Rephrase unable to delete pop up on the UI - when deleting a host. (Denys Buzhor via yusaku)
Date Mon, 18 Nov 2013 17:58:36 GMT
Updated Branches:
  refs/heads/trunk 762360198 -> c46beb2bf


AMBARI-3787. Rephrase unable to delete pop up on the UI - when deleting a host. (Denys Buzhor
via yusaku)


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

Branch: refs/heads/trunk
Commit: c46beb2bf362b417b3ce5d8d542ab0ecd0c5ceb3
Parents: 7623601
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Nov 18 09:58:40 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Nov 18 09:58:40 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c46beb2b/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index ea921f6..12907ae 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1364,8 +1364,8 @@ Em.I18n.translations = {
   'hosts.cant.do.popup.masterList.body':'Host cannot be deleted with the master components
installed',
   'hosts.cant.do.popup.masterList.body.end':'The master components on this host must to be
stopped and moved to a different host to be able to delete this host',
   '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. ',
-  'hosts.cant.do.popup.runningList.body.end':'Stop the components before reattempting to
delete host. Some components might need special actions performed before deletion from cluster.
For example, DataNode has to be decommissioned before being deleted.',
+  'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since it has the following
master components: ',
+  'hosts.cant.do.popup.runningList.body.end':'<strong>Note:</strong> To delete
this host, you must first move all the master components listed above to another host.',
   'hosts.add.header':'Add Host Wizard',
   'hosts.assignRack':'Assign Rack',
 

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c46beb2b/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 cf54571..4a5fb1d 100644
--- a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
+++ b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
@@ -25,5 +25,5 @@
 
 {{#if showBodyEnd}}
     <br />
-    <div class='alert alert-warning'><strong>{{t common.important}}:</strong>
{{componentsBodyEnd}}</div>
+    <div class='alert alert-warning'>{{{componentsBodyEnd}}}</div>
 {{/if}}
\ No newline at end of file


Mime
View raw message