This is an automated email from the ASF dual-hosted git repository. ishanbha pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 06e4a3a [AMBARI-23908] Change config layout for service tabs in installer. 06e4a3a is described below commit 06e4a3a93809a08b1c158f25872532a13fe1e9f3 Author: Ishan Bhatt <ishanbhatt.1...@gmail.com> AuthorDate: Fri May 18 14:14:21 2018 -0700 [AMBARI-23908] Change config layout for service tabs in installer. --- ambari-web/app/styles/application.less | 1 + ambari-web/app/styles/service_configurations.less | 1 + ambari-web/app/styles/wizard.less | 6 ++++++ ambari-web/app/templates/common/configs/service_config_wizard.hbs | 2 +- ambari-web/app/templates/common/configs/services_config.hbs | 2 +- .../app/views/common/configs/service_configs_by_category_view.js | 2 +- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index fc1c51e..406bca1 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2295,6 +2295,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { } .tab-content.service-config-tab-content { + clear: both; overflow: visible; .enhanced-config-tab-content { overflow: visible; diff --git a/ambari-web/app/styles/service_configurations.less b/ambari-web/app/styles/service_configurations.less index 8a575c6..8307880 100644 --- a/ambari-web/app/styles/service_configurations.less +++ b/ambari-web/app/styles/service_configurations.less @@ -165,6 +165,7 @@ } .common-config-category { + clear: both; .icon-repeat { color: #cbcbcb; padding: 5px 10px; diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less index 3be7652..63a2763 100644 --- a/ambari-web/app/styles/wizard.less +++ b/ambari-web/app/styles/wizard.less @@ -882,6 +882,10 @@ } } + .installer-all-configs-notifications { + float: right; + margin-top: 25px; + } .notifications-group { #notifications-dropdown { padding: 10px; @@ -962,6 +966,8 @@ .one-row-tabs-container { padding: 5px 10px; + width: 95%; + float: left; .left-arrow, .right-arrow { float: left; text-align: center; 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 078703c..045a1ca 100644 --- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs +++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs @@ -80,7 +80,7 @@ {{#if view.supportsConfigLayout}} {{#unless view.hideTabHeaders}} - <ul {{bindAttr class=":nav :nav-tabs :mbm view.supportsHostOverrides:with-overrides"}}> + <ul {{bindAttr class=":nav :nav-tabs :mbm view.supportsHostOverrides:with-overrides controller.isInstallWizard:clear"}}> {{#each tab in view.tabs}} {{#unless tab.isHidden}} <li rel='tooltip' {{bindAttr class="tab.isActive:active tab.isHiddenByFilter:disabled" data-original-title="tab.tooltipMsg"}}> diff --git a/ambari-web/app/templates/common/configs/services_config.hbs b/ambari-web/app/templates/common/configs/services_config.hbs index b578191..8b9abf9 100644 --- a/ambari-web/app/templates/common/configs/services_config.hbs +++ b/ambari-web/app/templates/common/configs/services_config.hbs @@ -62,7 +62,7 @@ {{/if}} {{#if controller.isInstallWizard}} {{#if issuesCounter}} - <div class="notifications-group align-right"> + <div class="notifications-group align-right installer-all-configs-notifications"> <span class="alerts-label dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <span id="issues-bell" {{bindAttr class=":glyphicon :glyphicon-bell controller.hasErrors:important:warning"}}></span> <span id="issues-counter" {{bindAttr class=":badge controller.hasErrors:badge-important:badge-warning"}}> diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js index ff4d63e..5af921c 100644 --- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js +++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js @@ -25,7 +25,7 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.Persist, App.ConfigOverrid templateName: require('templates/common/configs/service_config_category'), - classNames: ['panel-group', 'common-config-category'], + classNames: ['panel-group', 'common-config-category', 'clear'], classNameBindings: ['isShowBlock::hidden'], -- To stop receiving notification emails like this one, please contact ishan...@apache.org.