Updated Branches: refs/heads/trunk 7598e25ac -> 99cabb956
AMBARI-4386. Bulk Ops: move Bulk Ops action to Host Actions pulldown. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99cabb95 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99cabb95 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99cabb95 Branch: refs/heads/trunk Commit: 99cabb956accd25e198422141034e84ea6cd70d4 Parents: 7598e25 Author: Oleg Nechiporenko <[email protected]> Authored: Thu Jan 23 13:31:23 2014 +0200 Committer: Oleg Nechiporenko <[email protected]> Committed: Thu Jan 23 13:31:23 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 18 +++++----------- ambari-web/app/templates/main/host.hbs | 16 ++++---------- .../templates/main/host/bulk_operation_menu.hbs | 22 ++++++++++++-------- 3 files changed, 22 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/99cabb95/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index b432b19..30aabb6 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2574,7 +2574,9 @@ table.graphs { /*Hosts*/ #hosts { + #hosts-table { + margin-top: 10px; margin-bottom: 10px; .label-row { font-size: 0.9em; @@ -2734,33 +2736,25 @@ table.graphs { margin-bottom: 10px; margin-top: -5px; } + .hosts-actions { + margin-right: 10px; + } .health-status-bar { font-size: 0.9em; margin-left: 0; - margin-bottom: 10px; - margin-top: -7px; - min-width: 790px; color: #b4b4b4; .health-status { margin-left: -1px; margin-right: 3px; } a { - padding: 5px 4px 5px 4px; text-decoration: none; } - .category-item { - margin-right: 3px; - border:1px solid transparent; - -webkit-border-radius: 4px; - border-radius: 4px; - } .category-item:hover { cursor: pointer; a { color: #ffffff; } - border:1px solid #d3d3d3; } .active { a { @@ -2768,13 +2762,11 @@ table.graphs { } background-color: #888888; border-color: #888888; - border:1px solid transparent; -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.25); -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.25); box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.25); } .category-item.active:hover { - border:1px solid transparent; a { color: #ffffff; } http://git-wip-us.apache.org/repos/asf/ambari/blob/99cabb95/ambari-web/app/templates/main/host.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs index 65c7707..4c93212 100644 --- a/ambari-web/app/templates/main/host.hbs +++ b/ambari-web/app/templates/main/host.hbs @@ -19,6 +19,9 @@ <div id="hosts"> <div class="box-header row"> + <div class="hosts-actions pull-left"> + {{view App.HostTableMenuView}} + </div> <div class="health-status-bar pull-left"> {{#view view.statusFilter categoriesBinding="view.categories"}} <div class="btn-group display-inline-block"> @@ -49,23 +52,12 @@ </div> {{/view}} </div> - - {{#if App.isAdmin}} - <div class="pull-right"> - <button class="btn btn-inverse add-host-button" {{action addHost}}> - <i class="icon-plus icon-white"></i> - {{t hosts.host.add}} - </button> - </div> - {{/if}} </div> <table class="datatable table table-bordered table-striped" id="hosts-table"> <thead> {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}} - <th class="first"> - {{view App.HostTableMenuView}} - </th> + <th class="first"> </th> <th> </th> {{view view.parentView.nameSort}} <th> </th> http://git-wip-us.apache.org/repos/asf/ambari/blob/99cabb95/ambari-web/app/templates/main/host/bulk_operation_menu.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs index e9d96d8..19a9cb0 100644 --- a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs +++ b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs @@ -17,19 +17,23 @@ }} <div class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-asterisk"></span></a> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">{{t common.actions}} <span class="caret"></span></a> <ul class="dropdown-menu"> + {{#if App.isAdmin}} + <li><a href="#" {{action addHost}}><i class="icon-plus icon-white"></i> {{t hosts.host.add}}</a></li> + <li class="divider"></li> + {{/if}} <li class="dropdown-submenu"> <a tabindex="-1" href="javascript:void(null);">{{view.menuItems.s.label}} - ({{view.parentView.parentView.selectedCategory.hostsCount}})</a> - <ul {{bindAttr class="view.parentView.parentView.selectedCategory.hasHosts::hidden :dropdown-menu"}}> + ({{view.parentView.selectedCategory.hostsCount}})</a> + <ul {{bindAttr class="view.parentView.selectedCategory.hasHosts::hidden :dropdown-menu"}}> {{#each subMenuItem in view.menuItems.s.submenu}} <li class="dropdown-submenu"> <a href="javascript:void(null);">{{subMenuItem.label}}</a> <ul class="dropdown-menu"> {{#each menuL3Item in subMenuItem.submenu}} <li> - <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView.parentView"}} href="#">{{menuL3Item.label}}</a> + <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView"}} href="#">{{menuL3Item.label}}</a> </li> {{/each}} </ul> @@ -39,15 +43,15 @@ </li> <li class="dropdown-submenu"> <a tabindex="-1" href="javascript:void(null);">{{view.menuItems.f.label}} - ({{view.parentView.parentView.filteredContent.length}})</a> - <ul {{bindAttr class="view.parentView.parentView.hasFilteredItems::hidden :dropdown-menu"}}> + ({{view.parentView.filteredContent.length}})</a> + <ul {{bindAttr class="view.parentView.hasFilteredItems::hidden :dropdown-menu"}}> {{#each subMenuItem in view.menuItems.f.submenu}} <li class="dropdown-submenu"> <a href="javascript:void(null);">{{subMenuItem.label}}</a> <ul class="dropdown-menu"> {{#each menuL3Item in subMenuItem.submenu}} <li> - <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView.parentView"}} href="#">{{menuL3Item.label}}</a> + <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView"}} href="#">{{menuL3Item.label}}</a> </li> {{/each}} </ul> @@ -57,7 +61,7 @@ </li> <li class="dropdown-submenu"> <a tabindex="-1" href="javascript:void(null);">{{view.menuItems.a.label}} - ({{view.parentView.parentView.content.length}})</a> + ({{view.parentView.content.length}})</a> <ul class="dropdown-menu"> {{#each subMenuItem in view.menuItems.a.submenu}} <li class="dropdown-submenu"> @@ -65,7 +69,7 @@ <ul class="dropdown-menu"> {{#each menuL3Item in subMenuItem.submenu}} <li> - <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView.parentView"}} href="#">{{menuL3Item.label}}</a> + <a {{action "bulkOperationConfirm" menuL3Item.operationData target="view.parentView"}} href="#">{{menuL3Item.label}}</a> </li> {{/each}} </ul>
