AMBARI-11033. Missing tooltips and action alignment issues
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8df37d1f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8df37d1f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8df37d1f Branch: refs/heads/trunk Commit: 8df37d1f7432ca43d0206c3bc4e578b6b8fc6214 Parents: 0564f0c Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Fri May 8 13:00:04 2015 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Fri May 8 14:10:06 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 2 +- .../main/service/configs/config_overridable.js | 1 + ambari-web/app/styles/widgets.less | 15 ++++++++++++++- .../templates/common/configs/widgets/controls.hbs | 7 +++++-- .../common/configs/widgets/config_widget_view.js | 1 + .../configs/widgets/plain_config_text_field.js | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 8011182..9471388 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1753,7 +1753,7 @@ Em.I18n.translations = { 'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss', 'services.service.config.configHistory.makeCurrent.message': 'Created from service config version {0}', 'services.service.config.configHistory.comparing': 'Comparing', - 'services.service.config.setRecommendedValue': 'Set Recommended Value', + 'services.service.config.setRecommendedValue': 'Set Recommended', 'services.service.widgets.list-widget.nothingSelected': 'Nothing selected', http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/ambari-web/app/mixins/main/service/configs/config_overridable.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/main/service/configs/config_overridable.js b/ambari-web/app/mixins/main/service/configs/config_overridable.js index 57910f4..0591195 100644 --- a/ambari-web/app/mixins/main/service/configs/config_overridable.js +++ b/ambari-web/app/mixins/main/service/configs/config_overridable.js @@ -65,6 +65,7 @@ App.ConfigOverridable = Em.Mixin.create({ else { serviceConfigController.addOverrideProperty(serviceConfigProperty, selectedConfigGroup, serviceConfigProperty.get('widget') ? serviceConfigProperty.get('value') : null); } + Em.$('body>.tooltip').remove(); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index 4f4f88a..d79ef07 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -18,6 +18,7 @@ @import 'common.less'; @undo-btn-margin: 10px; +@controls-min-width: 39px; @combo-widget-width: 100px; @green: #6ebd45; @slider-light-grey: #e6e6e6; @@ -67,7 +68,9 @@ display: inline-block; margin-left: 10px; min-height: 65px; - min-width: 39px; + min-width: @controls-min-width; + z-index: 1; + position: relative; &.version-labels { min-width: 52px; .label-current { @@ -100,6 +103,16 @@ } } } + .widget-config-raw { + width: calc(~"100% - 30px -"@controls-min-width); + } + &.slider-widget { + width: 100%; + overflow-x: hidden; + margin-left: -20px; + margin-right: 0; + padding-left: 20px; + } } .directory-textarea-wrapper { http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/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 78890d1..a80fdee 100644 --- a/ambari-web/app/templates/common/configs/widgets/controls.hbs +++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs @@ -18,7 +18,7 @@ {{#if view.canEdit}} {{#if view.supportSwitchToCheckBox}} - <div {{bindAttr class="view.showAsTextBox::hide :left"}}> + <div {{bindAttr class="view.showAsTextBox::hide :left :widget-config-raw"}}> {{view App.PlainConfigTextField serviceConfigBinding="view.config"}} </div> {{/if}} @@ -26,7 +26,9 @@ <div class="widget-col left"> {{#if view.config.isNotDefaultValue}} {{#if view.undoAllowed}} - <a class="widget-action widget-action-undo" href="#" {{action "restoreValue" target="view"}}> + <a class="widget-action widget-action-undo" href="#" + data-toggle="tooltip" {{translateAttr data-original-title="common.undo"}} + {{action "restoreValue" target="view"}}> <i class="icon-undo"></i> </a> {{/if}} @@ -34,6 +36,7 @@ {{#if view.showPencil}} {{#if view.isWidgetViewAllowed}} <a href="#" + data-toggle="tooltip" {{translateAttr data-original-title="common.edit"}} {{bindAttr class=":icon-pencil :widget-action :widget-action-switch-view view.isHover::hide view.showAsTextBox::active"}} {{action "toggleWidgetView" target="view"}}> </a> http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/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 b8fa126..d94c477 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 @@ -238,6 +238,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo if (this.get('config.supportsFinal')) { this.get('config').set('isFinal', this.get('config.defaultIsFinal')); } + Em.$('body > .tooltip').remove(); }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/8df37d1f/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js index 8b2b911..3ac96cd 100644 --- a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js +++ b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js @@ -27,7 +27,7 @@ require('views/common/controls_view'); App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, { templateName: require('templates/common/configs/widgets/plain_config_text_field'), valueBinding: 'serviceConfig.value', - classNames: ['span10', 'widget-config-plain-text-field'], + classNames: ['widget-config-plain-text-field'], placeholderBinding: 'serviceConfig.defaultValue', unit: function() { return Em.getWithDefault(this, 'serviceConfig.stackConfigProperty.valueAttributes.unit', false);
