ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject git commit: AMBARI-4121 warning on delete host should be at top of dialog. (ababiichuk)
Date Thu, 19 Dec 2013 13:01:52 GMT
Updated Branches:
  refs/heads/trunk 8692e9c9a -> b1798b8f6


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/b1798b8f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1798b8f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1798b8f

Branch: refs/heads/trunk
Commit: b1798b8f65e2349023c024cb2be819e42a02e97a
Parents: 8692e9c
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Dec 19 14:42:59 2013 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Dec 19 15:01:43 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/b1798b8f/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


Mime
View raw message