Repository: ambari Updated Branches: refs/heads/branch-2.1 973831b1d -> bf021133b
AMBARI-13092. After page refresh created config groups are showed with delay (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf021133 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf021133 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf021133 Branch: refs/heads/branch-2.1 Commit: bf021133bbf5627af5d1559b161b5b63f2d0ac76 Parents: 973831b Author: Alex Antonenko <[email protected]> Authored: Mon Sep 14 20:39:31 2015 +0300 Committer: Alex Antonenko <[email protected]> Committed: Mon Sep 14 20:42:00 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 21 ++++++++++- .../templates/common/configs/service_config.hbs | 39 +++++++++++--------- .../common/configs/service_config_wizard.hbs | 9 +++-- 3 files changed, 47 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bf021133/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 8a3a695..6136917 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -4783,7 +4783,6 @@ li.break { .config-groups-dropdown-menu { overflow: auto; max-height: 416px; - margin-top: 16px; } } @@ -5940,3 +5939,23 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } } } + +.config-manage-nav { + .config-groups-dropdown { + display: inline-block; + .btn.dropdown-toggle.first { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + .spinner { + background-size: 20px; + height: 20px; + width: 20px; + } + } + .filter-combobox { + margin-bottom: 0; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/bf021133/ambari-web/app/templates/common/configs/service_config.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config.hbs b/ambari-web/app/templates/common/configs/service_config.hbs index 0075fd0..f819fe0 100644 --- a/ambari-web/app/templates/common/configs/service_config.hbs +++ b/ambari-web/app/templates/common/configs/service_config.hbs @@ -46,25 +46,29 @@ {{/if}} {{/if}} {{#if view.supportsHostOverrides}} - <div class="alert alert-info"> + <div class="alert alert-info config-manage-nav"> {{t common.group}} - <span class="btn-group"> - <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" - data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button> - <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" data-toggle="dropdown"> - <span class="caret"></span> - </button> - <ul class="dropdown-menu config-groups-dropdown-menu"> - <!-- available config group menu links --> - {{#each configGroup in configGroups}} - <li> - <a href="#" {{action "selectConfigGroup" configGroup target="controller"}}> - {{configGroup.displayNameHosts}} - </a> - </li> - {{/each}} - </ul> + <span class="btn-group config-groups-dropdown"> + {{#if controller.configGroupsAreLoaded}} + <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle first" + data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button> + <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" data-toggle="dropdown"> + <span class="caret"></span> + </button> + <ul class="dropdown-menu config-groups-dropdown-menu"> + <!-- available config group menu links --> + {{#each configGroup in configGroups}} + <li> + <a href="#" {{action "selectConfigGroup" configGroup target="controller"}}> + {{configGroup.displayNameHosts}} + </a> + </li> + {{/each}} + </ul> + {{else}} + <div class="pull-left spinner"></div> + {{/if}} </span> {{#isAccessible ADMIN}} {{#if controller.isHostsConfigsPage}} @@ -76,6 +80,7 @@ <div class="pull-right"> {{view App.FilterComboCleanableView filterBinding="view.filter" columnsBinding="view.columns" popoverDescriptionBinding="view.propertyFilterPopover"}} </div> + <div class="clearfix"></div> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/bf021133/ambari-web/app/templates/common/configs/service_config_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs b/ambari-web/app/templates/common/configs/service_config_wizard.hbs index cd970e7..11c8d32 100644 --- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs +++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs @@ -17,14 +17,14 @@ }} {{#if view.supportsHostOverrides}} - <div class="alert alert-info"> + <div class="alert alert-info config-manage-nav"> {{t common.group}} - <span class="btn-group"> - <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn">{{selectedConfigGroup.displayNameHosts}}</button> + <span class="btn-group config-groups-dropdown"> + <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle first" data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button> <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> </button> - <ul class="dropdown-menu"> + <ul class="dropdown-menu config-groups-dropdown-menu"> <!-- available config group menu links --> {{#each configGroup in configGroups}} <li> @@ -45,6 +45,7 @@ <div class="pull-right"> {{view App.FilterComboCleanableView filterBinding="view.filter" columnsBinding="view.columns" popoverDescriptionBinding="view.propertyFilterPopover"}} </div> + <div class="clearfix"></div> </div> {{/if}}
