ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-8117 Slider App - App details page components view requires auto scroll. (atkach)
Date Mon, 03 Nov 2014 18:20:45 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 6d4fe3b17 -> 677993d19


AMBARI-8117 Slider App - App details page components view requires auto scroll. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/677993d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/677993d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/677993d1

Branch: refs/heads/branch-1.7.0
Commit: 677993d1991879ad1ea2985182a09f8079783cf1
Parents: 6d4fe3b
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Mon Nov 3 20:20:09 2014 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Mon Nov 3 20:20:27 2014 +0200

----------------------------------------------------------------------
 contrib/views/slider/src/main/resources/ui/app/styles/app.less  | 5 ++---
 .../src/main/resources/ui/app/views/slider_app/summary_view.js  | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/677993d1/contrib/views/slider/src/main/resources/ui/app/styles/app.less
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/app.less b/contrib/views/slider/src/main/resources/ui/app/styles/app.less
index 7b6f36a..eb8eceb 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/app.less
@@ -88,9 +88,8 @@
     .icon-warning-sign {
       color: #ff0000;
     }
-    .panel-body{
-      /*max-height: 400px;
-      overflow-x: auto;*/
+    .panel-body {
+      overflow-y: auto;
     }
   }
   .panel-link {

http://git-wip-us.apache.org/repos/asf/ambari/blob/677993d1/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js
b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js
index 9c92b16..90631fd 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/slider_app/summary_view.js
@@ -126,13 +126,14 @@ App.SliderAppSummaryView = Ember.View.extend({
       panelSummaryBody = panelSummary.find('.panel-body'),
       columnRight = this.$('.column-right'),
       panelAlerts = columnRight.find('.panel-alerts'),
-      panelComponents = columnRight.find('.panel-components');
+      panelComponentsBody = columnRight.find('.panel-components .panel-body'),
+      wrapperHeightDiff = columnRight.find('.panel-components').height() - panelComponentsBody.height();
     if (panelSummary.height() < panelSummaryBody.height()) {
       panelSummary.height(panelSummaryBody.height());
     }
     var marginAndBorderHeight = parseInt(panelAlerts.css('margin-bottom')) + 3;
     if (panelSummary.height() > columnRight.height()) {
-      panelComponents.height(panelSummary.height() - panelAlerts.height() - marginAndBorderHeight);
+      panelComponentsBody.height(panelSummary.height() - panelAlerts.height() - marginAndBorderHeight
- wrapperHeightDiff);
     }
     else {
       panelSummary.height(columnRight.height() - marginAndBorderHeight);


Mime
View raw message