Repository: ambari Updated Branches: refs/heads/trunk 031d3e782 -> a077ad3f6
AMBARI-11292. Warn/error message should be shown in tooltip even on config name (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/a077ad3f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a077ad3f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a077ad3f Branch: refs/heads/trunk Commit: a077ad3f61ea66612427d5012b9e0bf7ca79056a Parents: 031d3e7 Author: Srimanth Gunturi <[email protected]> Authored: Tue May 26 16:07:24 2015 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Tue May 26 16:10:09 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/templates/common/configs/widgets/config_label.hbs | 2 +- ambari-web/app/utils/helper.js | 1 + .../app/views/common/configs/widgets/config_widget_view.js | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a077ad3f/ambari-web/app/templates/common/configs/widgets/config_label.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/widgets/config_label.hbs b/ambari-web/app/templates/common/configs/widgets/config_label.hbs index 6ff2952..139547c 100644 --- a/ambari-web/app/templates/common/configs/widgets/config_label.hbs +++ b/ambari-web/app/templates/common/configs/widgets/config_label.hbs @@ -20,6 +20,6 @@ <div class="clearfix"></div> <p {{bindAttr class=":widget-config-label view.configLabelClass"}}> {{view view.issueView configBinding="view.config"}} - {{formatWordBreak view.configLabel}} + {{formatWordBreak view.configLabel data-original-titleBinding="view.issueMessage"}} </p> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/a077ad3f/ambari-web/app/utils/helper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js index 146caae..3ac6991 100644 --- a/ambari-web/app/utils/helper.js +++ b/ambari-web/app/utils/helper.js @@ -765,6 +765,7 @@ App.registerBoundHelper('formatNull', Em.View.extend({ * {{formatWordBreak 'apple.banana.uranium'}} */ App.registerBoundHelper('formatWordBreak', Em.View.extend({ + attributeBindings: ["data-original-title"], tagName: 'span', template: Em.Handlebars.compile('{{{view.result}}}'), http://git-wip-us.apache.org/repos/asf/ambari/blob/a077ad3f/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 a9f2b35..92dc8c1 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 @@ -119,6 +119,8 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo classNameBindings:['isComparison:compare-mode'], + issueMessage: '', + issueView: Em.View.extend({ tagName: 'i', @@ -182,6 +184,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo this.set('parentView.configLabelClass', issue.configLabelClass); this.set('issueIconClass', issue.iconClass); this.set('issueMessage', issue.message); + this.set('parentView.issueMessage', issue.message); }, /** @@ -325,6 +328,7 @@ App.ConfigWidgetView = Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo }.observes('controller.recommendationTimeStamp'), didInsertElement: function () { + App.tooltip($(this.get('element')).find('span')); var self = this; var element = this.$(); if (element) {
