Updated Branches: refs/heads/branch-1.4.3 e766ec071 -> ef1bc77a9
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/ef1bc77a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef1bc77a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef1bc77a Branch: refs/heads/branch-1.4.3 Commit: ef1bc77a9770a1af2d28d532c04027af400c3702 Parents: e766ec0 Author: Yusaku Sako <[email protected]> Authored: Mon Dec 23 14:52:14 2013 -0800 Committer: Yusaku Sako <[email protected]> Committed: Mon Dec 23 14:52:31 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/ef1bc77a/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 55801e7..e7a7200 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1396,10 +1396,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/ef1bc77a/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 21a6507..a9ac2d5 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/ef1bc77a/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>
