Repository: ambari Updated Branches: refs/heads/branch-2.1 4d27a3dbf -> e4cf4c87d
AMBARI-11920. Alert Instance tooltip is huge (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4cf4c87 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4cf4c87 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4cf4c87 Branch: refs/heads/branch-2.1 Commit: e4cf4c87d712a9bf3ef263a371b07472013a88ee Parents: 4d27a3d Author: Alex Antonenko <[email protected]> Authored: Mon Jun 15 02:14:59 2015 +0300 Committer: Alex Antonenko <[email protected]> Committed: Mon Jun 15 13:42:06 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 5 +++++ ambari-web/app/templates/main/alerts/definition_details.hbs | 9 +++++---- ambari-web/app/views/main/alerts/definition_details_view.js | 6 +++++- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e4cf4c87/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 736ee09..25e719c 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -547,6 +547,11 @@ h1 { max-width: 400px; overflow-wrap: break-word; white-space:pre-wrap; + &.alert-def-detail-tooltip { + max-height: 300px; + max-width: 650px; + overflow: scroll; + } &.graph-tooltip { max-width: 200px; } http://git-wip-us.apache.org/repos/asf/ambari/blob/e4cf4c87/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index fb7f884..d5497f5 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -191,12 +191,13 @@ {{view App.AlertInstanceServiceHostView instanceBinding="instance"}} </td> <td>{{{instance.status}}} - <time class="timeago" - rel="tooltip" {{bindAttr data-original-title="instance.statusChangedAndLastCheckedFormatted"}}>{{instance.lastTriggeredForFormatted}}</time> + <time class="timeago" rel="tooltip" {{bindAttr data-original-title="instance.statusChangedAndLastCheckedFormatted"}}> + {{instance.lastTriggeredForFormatted}} + </time> </td> <td>{{view view.parentView.lastDayCount hostNameBinding="instance.hostName"}}</td> - <td><span class="alert-text" rel="tooltip" {{bindAttr data-original-title="instance.text"}} - class="alert-text">{{instance.text}}</span></td> + <td> + <span class="alert-text" {{bindAttr data-original-title="instance.text"}}>{{instance.text}}</span></td> {{/view}} {{/each}} {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/e4cf4c87/ambari-web/app/views/main/alerts/definition_details_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/alerts/definition_details_view.js b/ambari-web/app/views/main/alerts/definition_details_view.js index 880e74f..eabe36c 100644 --- a/ambari-web/app/views/main/alerts/definition_details_view.js +++ b/ambari-web/app/views/main/alerts/definition_details_view.js @@ -100,7 +100,11 @@ App.MainAlertDefinitionDetailsView = App.TableView.extend({ tagName: 'tr', didInsertElement: function () { App.tooltip($("[rel=tooltip]")); - }, + App.tooltip($(".alert-text"), { + placement: 'left', + delay: { "show": 0, "hide": 1500 }, + template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner alert-def-detail-tooltip"></div></div>' + }); }, /** * Router transition to service page
