AMBARI-22636. UI Changes for Kerberos Wizard (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e23fa28 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e23fa28 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e23fa28 Branch: refs/heads/branch-3.0-perf Commit: 8e23fa28ca33e57855301ad0255af44dc6068d0b Parents: 8e90d59 Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Tue Dec 12 20:13:43 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Tue Dec 12 20:13:43 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/modal_popups.less | 8 +++++++- .../app/styles/service_configurations.less | 5 ++++- ambari-web/app/styles/wizard.less | 19 ++++++++++++++++++- .../common/configs/service_config_category.hbs | 8 +++++--- 4 files changed, 34 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/modal_popups.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/modal_popups.less b/ambari-web/app/styles/modal_popups.less index abe1c63..dc951c9 100644 --- a/ambari-web/app/styles/modal_popups.less +++ b/ambari-web/app/styles/modal_popups.less @@ -329,6 +329,12 @@ } .host-progress-popup { + .modal.with-footer{ + padding-right: 0; + .modal-lg.modal-dialog{ + width: 98%; + } + } .task-detail-info { .task-detail-log-info { @@ -425,4 +431,4 @@ word-wrap:break-word; overflow: auto; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/service_configurations.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/service_configurations.less b/ambari-web/app/styles/service_configurations.less index 6da3c04..e4811d0 100644 --- a/ambari-web/app/styles/service_configurations.less +++ b/ambari-web/app/styles/service_configurations.less @@ -91,7 +91,6 @@ margin-left: -5px; } .checkbox { - line-height: 0.8em; &.list-inline { vertical-align: baseline; &>.ember-checkbox{ @@ -291,4 +290,8 @@ .config-controls { line-height: 34px; } + .clear-left{ + clear:left; + padding-top: 5px; + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/wizard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less index cb9eb92..7d425d9 100644 --- a/ambari-web/app/styles/wizard.less +++ b/ambari-web/app/styles/wizard.less @@ -237,8 +237,25 @@ opacity: 0.2; } } + #confirm-configuration{ + .pre-scrollable{ + margin-top: 10px; + } + } + #kerberos-wizard-step6, #kerberos-wizard-step8{ + #common-progress-page{ + .item{ + i{ + position:relative; + top: 5px; + &.glyphicon-ok{ + top: 3px; + } + } + } + } + } #deploy { - .page-bar { border: none; } http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/templates/common/configs/service_config_category.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs index 930e65d..9b86c1f 100644 --- a/ambari-web/app/templates/common/configs/service_config_category.hbs +++ b/ambari-web/app/templates/common/configs/service_config_category.hbs @@ -54,14 +54,16 @@ <span class="control-group control-label-span col-md-3"> </span> {{/unless}} {{/if}} + {{#if configData.isOriginalSCP}} + {{#if configData.rightSideLabel}} + <span {{bindAttr class="configData.isEditable::muted :col-md-3 :clear-left :form-group :control-label-span"}}>{{formatWordBreak configData.displayName}}</span> + {{/if}} + {{/if}} <div class="col-md-9"> {{! Here serviceConfigBinding should ideally be serviceConfigPropertyBinding }} {{#if configData.isOriginalSCP}} <div {{bindAttr class="configData.errorMessage:has-error: configData.warnMessage:has-warning: :form-group"}} {{QAAttr "property-form-group"}}> {{view configData.viewClass serviceConfigBinding="configData" categoryConfigsAllBinding="view.categoryConfigsAll" }} - {{#if configData.rightSideLabel}} - <span {{bindAttr class="configData.isEditable::muted"}}>{{formatWordBreak configData.displayName}}</span> - {{/if}} {{#if configData.hintMessage}} <a class="icon-question-sign glyphicon glyphicon-blue" href="#" data-toggle="tooltip" {{bindAttr data-original-title="configData.hintMessage"}}></a>
