Repository: ambari Updated Branches: refs/heads/branch-alerts-dev ae9bf4c38 -> 24483521f
AMBARI-7452. Slider View: Apps hover should have titlebar and laid out vertically. (Max Shepel via onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/535559fa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/535559fa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/535559fa Branch: refs/heads/branch-alerts-dev Commit: 535559fab2cc7e9a75e133c7a35d061d23490e59 Parents: efa0fa6 Author: Oleg Nechiporenko <[email protected]> Authored: Tue Sep 23 19:38:09 2014 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Tue Sep 23 19:38:32 2014 +0300 ---------------------------------------------------------------------- .../src/main/resources/ui/app/styles/application.less | 14 +------------- .../resources/ui/app/templates/common/app_tooltip.hbs | 12 ++++-------- .../ui/app/templates/slider_title_tooltip.hbs | 3 --- .../main/resources/ui/app/views/application_view.js | 11 +++++++---- .../main/resources/ui/app/views/slider_apps_view.js | 1 + 5 files changed, 13 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/535559fa/contrib/views/slider/src/main/resources/ui/app/styles/application.less ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/application.less b/contrib/views/slider/src/main/resources/ui/app/styles/application.less index cc8ef7d..f980aa8 100644 --- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less +++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less @@ -34,7 +34,7 @@ html { } .slider-name-popover { - max-width: 500px !important; + max-width: 600px !important; .row { .table-row(); } @@ -905,18 +905,6 @@ select { font-style: italic; cursor: pointer; } -.popover.bottom{ - .popover-content{ - background: #ffffff; - background: -moz-linear-gradient(top, #f7f7f7 0%, #f7f7f7 18%, #ffffff 19%, #ffffff 100%); - background: -webkit-gradient(linear, top, top, color-stop(0%,#f7f7f7), color-stop(18%,#f7f7f7), color-stop(19%,#ffffff), color-stop(100%,#ffffff)); - background: -webkit-linear-gradient(top, #f7f7f7 0%,#f7f7f7 18%,#ffffff 19%,#ffffff 100%); - background: -o-linear-gradient(top, #f7f7f7 0%,#f7f7f7 18%,#ffffff 19%,#ffffff 100%); - background: -ms-linear-gradient(top, #f7f7f7 0%,#f7f7f7 18%,#ffffff 19%,#ffffff 100%); - background: linear-gradient(to bottom, #f7f7f7 0%,#f7f7f7 18%,#ffffff 19%,#ffffff 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#ffffff',GradientType=1 ); - } -} .api-error { max-height: 403px; http://git-wip-us.apache.org/repos/asf/ambari/blob/535559fa/contrib/views/slider/src/main/resources/ui/app/templates/common/app_tooltip.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/common/app_tooltip.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/common/app_tooltip.hbs index 9667f08..d748a41 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/common/app_tooltip.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/common/app_tooltip.hbs @@ -17,12 +17,8 @@ }} <div id="hover-on-app" class="row-fluid"> - <div class="row"> - <div class="col-md-4"><b>{{t common.description}}</b></div> - <div class="col-md-8"><b>{{t common.diagnostics}}</b></div> - </div> - <div class="row"> - <div class="col-md-4">{{formatWordBreak view.content.description devider='.'}}</div> - <div class="col-md-8">{{formatWordBreak view.content.diagnostics devider='.'}}</div> - </div> + <div><strong>{{t common.description}}</strong></div> + <div>{{formatWordBreak view.content.description devider='.'}}</div> + <div><strong>{{t common.diagnostics}}</strong></div> + <div>{{formatWordBreak view.content.diagnostics devider='.'}}</div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/535559fa/contrib/views/slider/src/main/resources/ui/app/templates/slider_title_tooltip.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_title_tooltip.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_title_tooltip.hbs index 39cecd1..d859b8a 100644 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_title_tooltip.hbs +++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_title_tooltip.hbs @@ -17,9 +17,6 @@ }} <div class="slider-name-popover"> - <div class="header"> - <h3><strong>{{App.instance}}</strong></h3> - </div> {{#each config in view.content}} <div class="row"> <div class="col-md-4">{{humanize config.displayName}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/535559fa/contrib/views/slider/src/main/resources/ui/app/views/application_view.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js index 7471f04..e1fea22 100644 --- a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js +++ b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js @@ -28,10 +28,13 @@ App.ApplicationView = Ember.View.extend({ * Popover-config * @type {Em.Object} */ - popover: Em.Object.create({ - trigger: 'hover', - placement: 'bottom' - }), + popover: function () { + return Em.Object.create({ + trigger: 'hover', + placement: 'bottom', + title: App.get('instance') + }) + }.property('content'), isIndexPage: function () { var currentPath = this.get('controller.currentPath'); http://git-wip-us.apache.org/repos/asf/ambari/blob/535559fa/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js ---------------------------------------------------------------------- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js b/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js index 8ae9f21..fa8ae98 100644 --- a/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js +++ b/contrib/views/slider/src/main/resources/ui/app/views/slider_apps_view.js @@ -92,6 +92,7 @@ App.SliderAppsView = App.TableView.extend({ }); return Ember.Object.create({ trigger: 'hover', + title: this.get('content.data.name'), template: template.renderToBuffer().string(), placement: "right" });
