You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/09/14 19:41:17 UTC
ambari git commit: AMBARI-13092. After page refresh created config
groups are showed with delay (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 91885add8 -> 535e33a82
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/535e33a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/535e33a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/535e33a8
Branch: refs/heads/trunk
Commit: 535e33a828e36198f78d3d4cd5fa84b4278dbf71
Parents: 91885ad
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Sep 14 20:39:31 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Sep 14 20:41:13 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/535e33a8/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 4e62482..daa2557 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4800,7 +4800,6 @@ li.break {
.config-groups-dropdown-menu {
overflow: auto;
max-height: 416px;
- margin-top: 16px;
}
}
@@ -5957,3 +5956,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/535e33a8/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/535e33a8/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}}