AMBARI-22617. Install Wizard Customize Services step has no vertical scroll (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee506295 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee506295 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee506295 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: ee506295d3d911c4bc9b00233481a1db97cd9289 Parents: 1ed7c08 Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Fri Dec 8 17:41:13 2017 +0200 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Fri Dec 8 17:41:13 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 7 ++++--- .../app/templates/common/configs/service_config_wizard.hbs | 8 ++++---- ambari-web/app/templates/main/host/configs_service.hbs | 2 +- ambari-web/app/templates/main/service/info/configs.hbs | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 7629355..b7c7635 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -602,9 +602,10 @@ h1 { } #serviceConfig { - background: white; - padding: 15px; - + &.non-wizard { + background: white; + padding: 15px; + } .alert{ .glyphicon-refresh{ margin-left:10px; http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/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 57bf5ee..3abd5eb 100644 --- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs +++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs @@ -19,9 +19,9 @@ {{#if view.supportsHostOverrides}} <div class="alert alert-info config-manage-nav"> {{t common.group}} - <span class="btn-group config-groups-dropdown"> - <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle first" data-toggle="dropdown">{{selectedConfigGroup.displayNameHosts}}</button> - <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <div class="btn-group config-groups-dropdown"> + <button {{bindAttr disabled="controller.isHostsConfigsPage"}} class="btn btn-default dropdown-toggle first" data-toggle="dropdown"> + {{selectedConfigGroup.displayNameHosts}} <span class="caret"></span> </button> <ul class="dropdown-menu config-groups-dropdown-menu"> @@ -34,7 +34,7 @@ </li> {{/each}} </ul> - </span> + </div> {{#isAuthorized "SERVICE.MANAGE_CONFIG_GROUPS"}} {{#if controller.isHostsConfigsPage}} <a href="#" {{action "switchHostGroup" target="controller"}}>{{t common.change}}</a> http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/templates/main/host/configs_service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/configs_service.hbs b/ambari-web/app/templates/main/host/configs_service.hbs index 46d7ab5..afeb4b6 100644 --- a/ambari-web/app/templates/main/host/configs_service.hbs +++ b/ambari-web/app/templates/main/host/configs_service.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -<div id="serviceConfig"> +<div id="serviceConfig non-wizard"> {{#if dataIsLoaded}} <div class="clearfix"></div> {{view App.ServiceConfigView canEditBinding="view.isConfigsEditable" filterBinding="controller.filter" columnsBinding="controller.filterColumns"}} http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/templates/main/service/info/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/info/configs.hbs b/ambari-web/app/templates/main/service/info/configs.hbs index 738893c..3636ec7 100644 --- a/ambari-web/app/templates/main/service/info/configs.hbs +++ b/ambari-web/app/templates/main/service/info/configs.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -<div id="serviceConfig"> +<div id="serviceConfig" class="non-wizard"> {{#if dataIsLoaded}} {{#if controller.content.isRestartRequired}} {{#isAuthorized "SERVICE.START_STOP"}}
