Updated Branches: refs/heads/trunk 7fd290dd5 -> ff6ff6d0c
AMBARI-2801. YARN queue summary should be shown in a tooltip. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ff6ff6d0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ff6ff6d0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ff6ff6d0 Branch: refs/heads/trunk Commit: ff6ff6d0c1a2d54421fc4281ea342414384666f4 Parents: 7fd290d Author: Srimanth Gunturi <[email protected]> Authored: Fri Aug 2 13:16:10 2013 -0700 Committer: Srimanth Gunturi <[email protected]> Committed: Fri Aug 2 13:21:29 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 11 +++++++++++ .../app/templates/main/dashboard/service/yarn.hbs | 2 +- ambari-web/app/views/main/dashboard/service/yarn.js | 14 +++----------- 3 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff6ff6d0/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 2f00231..92da960 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -268,6 +268,11 @@ h1 { border-left-color: #dedede; } +.text-tooltip { + border-bottom: 1px silver dotted; + cursor: pointer; +} + .wizard { h2 { margin-top: 0; @@ -1539,6 +1544,12 @@ width:100%; .summary-view-host{ float: right; padding-right: 20px; + a { + text-decoration: none; + &:hover { + text-decoration: underline; + } + } } } http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff6ff6d0/ambari-web/app/templates/main/dashboard/service/yarn.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/service/yarn.hbs b/ambari-web/app/templates/main/dashboard/service/yarn.hbs index 169a120..1b6ef3f 100644 --- a/ambari-web/app/templates/main/dashboard/service/yarn.hbs +++ b/ambari-web/app/templates/main/dashboard/service/yarn.hbs @@ -104,7 +104,7 @@ <!-- Queues --> <tr> <td>{{t dashboard.services.yarn.queues}}</td> - <td><a href="#" {{action showQueues target="view"}}>{{view.queues}}</a></td> + <td><span rel="queue-tooltip" class="text-tooltip" {{bindAttr data-original-title="view.service.queueFormatted" }}>{{view.queues}}</span></td> </tr> {{#unless view.showOnlyRows}} </tbody> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ff6ff6d0/ambari-web/app/views/main/dashboard/service/yarn.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/service/yarn.js b/ambari-web/app/views/main/dashboard/service/yarn.js index e0d56ec..9850d9d 100644 --- a/ambari-web/app/views/main/dashboard/service/yarn.js +++ b/ambari-web/app/views/main/dashboard/service/yarn.js @@ -116,17 +116,9 @@ App.MainDashboardServiceYARNView = App.MainDashboardServiceView.extend({ queues: function() { return Em.I18n.t('dashboard.services.yarn.queues.msg').format(this.get('service.queuesCount')); }.property('service.queuesCount'), - - showQueues: function() { - var self = this; - return App.ModalPopup.show({ - secondary: null, - header: Em.I18n.t('dashboard.services.yarn.queues'), - bodyClass: Em.View.extend({ - template: Em.Handlebars.compile('{{{view.queues}}}'), - queues: self.get('service.queueFormatted') - }) - }); + + didInsertElement: function(){ + $("[rel='queue-tooltip']").tooltip({html: true, placement: "right"}); } });
