Repository: ambari Updated Branches: refs/heads/trunk 41bdc34d5 -> 92da024a5
AMBARI-10948. Misc UI adjustments in enhanced config compare view (Richard Zang via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92da024a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92da024a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92da024a Branch: refs/heads/trunk Commit: 92da024a53d5f608a116e0da54897561567d45bb Parents: 41bdc34 Author: Srimanth Gunturi <[email protected]> Authored: Fri May 8 12:41:14 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Fri May 8 12:41:19 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 6 ++++++ ambari-web/app/styles/config_history_flow.less | 7 ++++++- ambari-web/app/styles/widgets.less | 15 +++++++++++++++ .../templates/common/configs/config_history_flow.hbs | 2 +- .../templates/common/configs/service_version_box.hbs | 4 +--- .../widgets/comparison/config_widget_comparison.hbs | 3 ++- .../templates/common/configs/widgets/controls.hbs | 7 +++---- .../common/configs/widgets/config_widget_view.js | 2 ++ 8 files changed, 36 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 645d1c4..1bd8d05 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -5713,3 +5713,9 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox { .config-widget-left-popover { margin-left: -10px; } + +.version-labels, .version-info-bar, .version-box { + .label, .badge { + font-weight: normal; + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/styles/config_history_flow.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less index 28f79c6..dfa2c03 100644 --- a/ambari-web/app/styles/config_history_flow.less +++ b/ambari-web/app/styles/config_history_flow.less @@ -22,6 +22,9 @@ .flow-element { .version-box .box { font-size: 13px; + .label-current { + padding-top: 2px; + } } .arrow-box { margin-left: 5px; @@ -30,6 +33,9 @@ } .version-info-bar { width: 960px; + .label-current.icon-ok { + padding: 6px 5px !important; + } } } @@ -149,7 +155,6 @@ background-color: #e6f1f6; .content { color: #444444; - font-weight: bold; } } .version-box .box.grayedOut { http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index 762cc8d..4f4f88a 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -68,6 +68,12 @@ margin-left: 10px; min-height: 65px; min-width: 39px; + &.version-labels { + min-width: 52px; + .label-current { + padding: 2px 3px 3px 5px; + } + } .widget-col { width: 18px; &.left { @@ -413,3 +419,12 @@ float: left; } } + +.label-current.icon-ok { + color: white; +} + +.compare-mode { + background-color: rgba(211, 237, 247, 0.39); + padding: 10px 5px 0px 10px; +} http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/templates/common/configs/config_history_flow.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs index d6fae10..a1f610d 100644 --- a/ambari-web/app/templates/common/configs/config_history_flow.hbs +++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs @@ -102,7 +102,7 @@ <span class="label label-info">{{view.displayedServiceVersion.versionText}}</span> {{/if}} {{#if view.displayedServiceVersion.isCurrent}} - <span class="label label-success">{{t common.current}}</span> + <span class="label-current label label-success icon-ok" data-toggle="tooltip" title="Current"></span> {{/if}} {{#if view.displayedServiceVersion.author}} <strong>{{view.displayedServiceVersion.author}}</strong> {{t dashboard.configHistory.info-bar.authoredOn}} <strong>{{view.displayedServiceVersion.createdDate}}</strong> http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/templates/common/configs/service_version_box.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/service_version_box.hbs b/ambari-web/app/templates/common/configs/service_version_box.hbs index 72127ef..354ed8d 100644 --- a/ambari-web/app/templates/common/configs/service_version_box.hbs +++ b/ambari-web/app/templates/common/configs/service_version_box.hbs @@ -28,9 +28,7 @@ <div class="stack-label">{{serviceVersion.stackVersion}}</div> {{#if serviceVersion.isCurrent}} <div class="current-label"> - <span class="label label-success"> - {{t common.current}} - <i {{bindAttr class=":icon-refresh :restart-required-service serviceVersion.isRestartRequired::hidden"}}></i> + <span class="label label-success label-current icon-ok" data-toggle="tooltip" title="Current"> </span> </div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs index f5e1edb..f5860f3 100644 --- a/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs +++ b/ambari-web/app/templates/common/configs/widgets/comparison/config_widget_comparison.hbs @@ -20,7 +20,7 @@ <div class="clearfix"></div> <div {{bindAttr class=":control-group :overrideField :widget-config-comparison"}}> {{view view.serviceConfigProperty.widget canEditBinding="view.canEdit" configBinding="compareConfig" categoryConfigsAllBinding="view.parentView.categoryConfigsAll" isPopoverEnabled="false"}} - <div class="widget-config-controls"> + <div class="widget-config-controls version-labels"> <span class="label label-info">{{compareConfig.serviceVersion.versionText}}</span> {{#if compareConfig.serviceVersion.isCurrent}} <span class="label label-success">{{t common.current}}</span> @@ -35,3 +35,4 @@ </div> </div> {{/each}} + <div class="clearfix"></div> http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/templates/common/configs/widgets/controls.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs b/ambari-web/app/templates/common/configs/widgets/controls.hbs index 7ad07ac..78890d1 100644 --- a/ambari-web/app/templates/common/configs/widgets/controls.hbs +++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs @@ -96,12 +96,11 @@ {{/if}} {{#if view.isComparison}} - <div class="widget-config-controls"> + <div class="widget-config-controls version-labels"> {{#if controller.selectedConfigGroup.isDefault}} - <span - class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span> + <span class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span> {{#if controller.isCurrentSelected}} - <span class="label label-success">{{t common.current}}</span> + <span class="label label-success icon-ok label-current" data-toggle="tooltip" title="Current"></span> {{/if}} {{else}} <span class="label label-info">{{t common.default}} http://git-wip-us.apache.org/repos/asf/ambari/blob/92da024a/ambari-web/app/views/common/configs/widgets/config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js b/ambari-web/app/views/common/configs/widgets/config_widget_view.js index c501532..b8fa126 100644 --- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js @@ -112,6 +112,8 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo */ isComparisonBinding: 'config.isComparison', + classNameBindings:['isComparison:compare-mode'], + issueView: Em.View.extend({ tagName: 'i',
