Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 fb6a71318 -> e41a036c5


AMBARI-17636 Service Configs page: can't see all config versions in dropdown 
(Vivek Ratnavel Subramanian via zhewang)


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

Branch: refs/heads/branch-2.5
Commit: e41a036c5ee8891fd19f027c825e067914ab65fc
Parents: fb6a713
Author: Zhe (Joe) Wang <zhew...@apache.org>
Authored: Mon Oct 17 14:57:49 2016 -0700
Committer: Zhe (Joe) Wang <zhew...@apache.org>
Committed: Mon Oct 17 14:57:49 2016 -0700

----------------------------------------------------------------------
 ambari-web/app/styles/config_history_flow.less  | 32 +++++++++++++++-----
 .../common/configs/config_history_flow.hbs      | 32 ++++++++++++--------
 .../views/common/configs/config_history_flow.js |  3 +-
 3 files changed, 44 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e41a036c/ambari-web/app/styles/config_history_flow.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/config_history_flow.less 
b/ambari-web/app/styles/config_history_flow.less
index 0b6dc3f..564fd2f 100644
--- a/ambari-web/app/styles/config_history_flow.less
+++ b/ambari-web/app/styles/config_history_flow.less
@@ -242,22 +242,38 @@
 
     ul#dropdown_menu {
       position: absolute;
-      top: 0;
       left: 0;
       z-index: 1000;
-      float: left;
       min-width: 400px;
-      height: 300px;
-      overflow: hidden;
-      overflow-y: scroll;
       padding: 5px 0;
-      margin: 5px 0;
+      margin: 0;
     }
 
     #dropdown_content {
+      overflow: hidden;
+      &::-webkit-scrollbar {
+        display: none;
+      }
+    }
+
+    #dropdown_outer_container, #dropdown_menu_container {
+      min-width: 400px;
       height: 300px;
+    }
+
+    #dropdown_outer_container {
+      position: relative;
       overflow: hidden;
+    }
+
+    #dropdown_inner_container {
+      position: absolute;
+      left: 0;
+      overflow-x: hidden;
       overflow-y: scroll;
+      &::-webkit-scrollbar {
+        display: none;
+      }
     }
 
     .dropdown-menu {
@@ -416,12 +432,12 @@
 }
 
 // Firefox specific styles
-body:not(:-moz-handler-blocked) {
+@-moz-document url-prefix() {
   #config_history_flow {
     .version-info-bar {
       .dropdown-menu {
         li {
-          line-height: 30px;
+          line-height: 30px !important;
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e41a036c/ambari-web/app/templates/common/configs/config_history_flow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs 
b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index fa67786..6b1fffe 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -82,20 +82,26 @@
             <span class="caret"></span>
           </button>
           <div id="dropdown_content" class="dropdown-menu">
-            <ul id="dropdown_menu">
-              {{#each serviceVersion in view.dropDownList}}
-                {{view App.ConfigHistoryDropdownRowView 
serviceVersionBinding="serviceVersion"}}
-              {{/each}}
+            <div id="dropdown_outer_container">
+              <div id="dropdown_inner_container">
+                <div id="dropdown_menu_container">
+                  <ul id="dropdown_menu">
+                    {{#each serviceVersion in view.dropDownList}}
+                      {{view App.ConfigHistoryDropdownRowView 
serviceVersionBinding="serviceVersion"}}
+                    {{/each}}
 
-              {{#unless view.showFullList}}
-                <li class="align-center pointer" id="show_more">
-                  <a {{action openFullList target="view"}}>
-                    {{t 
dashboard.configHistory.info-bar.showMore}}&nbsp;{{view.displayName}}
-                    &nbsp;<span class="lowercase ellipsis">{{t 
dashboard.configHistory.title}}</span>
-                  </a>
-                </li>
-              {{/unless}}
-            </ul>
+                    {{#unless view.showFullList}}
+                      <li class="align-center pointer" id="show_more">
+                        <a {{action openFullList target="view"}}>
+                          {{t 
dashboard.configHistory.info-bar.showMore}}&nbsp;{{view.displayName}}
+                          &nbsp;<span class="lowercase ellipsis">{{t 
dashboard.configHistory.title}}</span>
+                        </a>
+                      </li>
+                    {{/unless}}
+                  </ul>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         <div class="label-wrapper span8" data-toggle="tooltip" {{bindAttr 
data-original-title="view.displayedServiceVersion.fullNotes"}}>

http://git-wip-us.apache.org/repos/asf/ambari/blob/e41a036c/ambari-web/app/views/common/configs/config_history_flow.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/config_history_flow.js 
b/ambari-web/app/views/common/configs/config_history_flow.js
index 07f111a..66cf5e0 100644
--- a/ambari-web/app/views/common/configs/config_history_flow.js
+++ b/ambari-web/app/views/common/configs/config_history_flow.js
@@ -591,6 +591,7 @@ App.ConfigHistoryDropdownRowView = Em.View.extend({
       var $el = $('#config_version_popup');
       var $currentTarget = $(event.currentTarget);
       var parentView = view.get('parentView');
+      parentView.set('hoveredServiceVersion', null);
       if (!serviceVersion.get("isDisplayed"))  {
         parentView.set('hoveredServiceVersion', serviceVersion);
         parentView.set('isHovered', true);
@@ -616,7 +617,6 @@ App.ConfigHistoryDropdownRowView = Em.View.extend({
       parentView.set('isHovered', false);
       Em.run.later(function() {
         if(!parentView.get('displaySubMenuFlag') && 
!parentView.get('isHovered')) {
-          parentView.set('hoveredServiceVersion', null);
           $('#config_version_popup').removeAttr('style');
         }
       }, 200);
@@ -637,7 +637,6 @@ App.ConfigHistoryDropdownSubMenuView = Em.View.extend({
     mouseLeave: function(event, view) {
       var parentView = view.get('parentView');
       parentView.set('displaySubMenuFlag', false);
-      parentView.set('hoveredServiceVersion', null);
       $("#config_version_popup").removeAttr('style');
     }
   })

Reply via email to