From 2055919322006b88b924305380c9f72d2852a832 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansible.com>
Date: Tue, 20 May 2014 14:04:54 -0400
Subject: [PATCH] Added custom scroll bar to inventory groups container. Moved
 group container auto-resize and height calc function to helper methods. Now
 using full window height, pushing footer off the page. Changed custom sroll
 directive to use the dark-thin theme.

---
 awx/ui/static/js/helpers/inventory.js | 6 +++---
 awx/ui/static/less/ansible-ui.less    | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js
index 607de905e5..bfbff2bf58 100644
--- a/awx/ui/static/js/helpers/inventory.js
+++ b/awx/ui/static/js/helpers/inventory.js
@@ -14,18 +14,18 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis
     'InventoryHelper', 'InventoryFormDefinition', 'ParseHelper', 'SearchHelper', 'VariablesHelper',
 ])
 
-.factory('GetContainerHeight', [ function() {
+.factory('GetGroupContainerHeight', [ function() {
     return function() {
         return $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() -
             $('.site-footer').outerHeight() - $('#groups-container .list-actions').outerHeight() - $('#groups-table-header').height() - 15;
     };
 }])
 
-.factory('SetGroupContainerHeight', [ 'GetContainerHeight', function(GetContainerHeight) {
+.factory('SetGroupContainerHeight', [ 'GetGroupContainerHeight', function(GetGroupContainerHeight) {
     return function() {
         var height;
         if ($(window).width() > 1210) {
-            height = GetContainerHeight();
+            height = GetGroupContainerHeight();
             $('#groups-container .list-table-container').height(height);
         }
         else {
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index d585910eed..7680e313ae 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -1332,6 +1332,9 @@ input[type="checkbox"].checkbox-no-label {
       .list-table-container {
           overflow: auto;
       }
+      .list-actions {
+          margin-bottom: 0;
+      }
   }
 
   #inventories_table i[class*="icon-job-"],