You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/12/19 13:57:57 UTC
git commit: AMBARI-4121 warning on delete host should be at top of
dialog. (ababiichuk)
Updated Branches:
refs/heads/branch-1.4.3 416088d1e -> 43d8f2a35
AMBARI-4121 warning on delete host should be at top of dialog. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43d8f2a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43d8f2a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43d8f2a3
Branch: refs/heads/branch-1.4.3
Commit: 43d8f2a35d91b43804f118a22dd1256d2206fb9a
Parents: 416088d
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Dec 19 14:57:53 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Dec 19 14:57:53 2013 +0200
----------------------------------------------------------------------
.../templates/main/host/details/doDeleteHostPopup.hbs | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/43d8f2a3/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs
index 809a053..1e11a65 100644
--- a/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs
+++ b/ambari-web/app/templates/main/host/details/doDeleteHostPopup.hbs
@@ -26,6 +26,13 @@
<br />
{{/if}}
<p><i class="icon-warning-sign"></i> {{{deletePopupBody}}}</p>
+{{#if lastComponent}}
+ <div class="alert-error row-fluid">
+ <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="enablePrimary"}}</div>
+ <div class='span10'>{{view lastComponentError}}</div>
+ </div>
+{{/if}}
+<br />
<div class='alert'><strong>{{t common.important}}:</strong>
{{#if unknownComponents}}
{{t hosts.delete.popup.body.msg.unknownComponents}}
@@ -34,9 +41,3 @@
</div>
<div class='alert'><strong>{{t common.important}}:</strong> {{t hosts.delete.popup.body.msg2}}</div>
<div class='alert'><strong>{{t common.important}}:</strong> {{t hosts.delete.popup.body.msg3}}</div>
-{{#if lastComponent}}
- <div class="alert-error row-fluid">
- <div class='tinyspan tinyoffset'>{{view Ember.Checkbox checkedBinding="enablePrimary"}}</div>
- <div class='span10'>{{view lastComponentError}}</div>
- </div>
-{{/if}}
\ No newline at end of file