ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-4116. Cleanup delete host dialog UI. (Jeff Sposetti via yusaku)
Date Mon, 23 Dec 2013 22:53:07 GMT
Updated Branches:
  refs/heads/trunk 5dcea3726 -> 8757aeb96


AMBARI-4116. Cleanup delete host dialog UI. (Jeff Sposetti via yusaku)


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

Branch: refs/heads/trunk
Commit: 8757aeb96b007de0a458f36242b5e93f2c003c29
Parents: 5dcea37
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Dec 23 14:52:14 2013 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Dec 23 14:52:58 2013 -0800

----------------------------------------------------------------------
 ambari-web/app/messages.js                       |  4 ++--
 ambari-web/app/styles/application.less           | 15 +++++++++++++++
 .../details/raiseDeleteComponentErrorPopup.hbs   | 19 +++++++++++--------
 3 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8757aeb9/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d14055a..daa6a99 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1397,10 +1397,10 @@ Em.I18n.translations = {
   'hosts.delete.popup.unknownComponents':'The following components have unknown status:',
   'hosts.cant.do.popup.title':'Unable to Delete Host',
   'hosts.cant.do.popup.masterList.body':'This host cannot be deleted since it has the following
master components:',
-  'hosts.cant.do.popup.masterList.body.end':'<strong>Note:</strong> To delete
this host, you must first move all the master components listed above to another host.',
+  'hosts.cant.do.popup.masterList.body.end':'To delete this host, you must first move all
the master components listed above to another host.',
   'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is
not supported. ',
   'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following
components are still running:',
-  'hosts.cant.do.popup.runningList.body.end':'<strong>Note:</strong> To delete
this host, you must first stop all the running components listed above. ' +
+  'hosts.cant.do.popup.runningList.body.end':'To delete this host, you must first stop all
the running components listed above. ' +
     'If this host has a DataNode, it should be decommissioned first to prevent data loss.',
   'hosts.add.header':'Add Host Wizard',
   'hosts.assignRack':'Assign Rack',

http://git-wip-us.apache.org/repos/asf/ambari/blob/8757aeb9/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index e006b23..681d045 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2546,6 +2546,21 @@ table.graphs {
 }
 /*Dashboard Widgets END*/
 
+.dialog-delete-component {
+  border: 1px solid #FDB82F;
+  border-radius: 4px;
+  padding: 4px;
+  background: #FFFDF6;
+  .warning-details {
+    padding-left: 16px;
+    padding-top: 5px;
+  }
+  .warning-list {
+    font-size: 0.95em;
+    font-style: italic;
+  }
+}
+
 /*Hosts*/
 #hosts {
   #hosts-table {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8757aeb9/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 4a5fb1d..46129aa 100644
--- a/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
+++ b/ambari-web/app/templates/main/host/details/raiseDeleteComponentErrorPopup.hbs
@@ -16,14 +16,17 @@
 * limitations under the License.
 }}
 
-<p><i class="icon-warning-sign"></i> {{componentsBody}}</p>
-<div class='row-fluid'>
-  <div class='tinyoffset span10'>
-    <i>{{componentsStr}}</i>
+<div class="dialog-delete-component">
+  <div class="warning">
+  <i class="icon-warning-sign"></i> <strong>{{componentsBody}}</strong>
+  </div>
+  <div class="row-fluid">
+    <div class="tinyoffset span10 warning-list">
+    {{componentsStr}}
+    </div>
   </div>
-</div>
 
 {{#if showBodyEnd}}
-    <br />
-    <div class='alert alert-warning'>{{{componentsBodyEnd}}}</div>
-{{/if}}
\ No newline at end of file
+  <div class="warning-details">{{{componentsBodyEnd}}}</div>
+{{/if}}
+</div>


Mime
View raw message