From a968ee38f640ec1ad59bd2b98541a97980abb630 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Tue, 8 Oct 2013 02:27:26 +0000
Subject: [PATCH] AC-503 group selectors look a little bit closer or more
 similar between hosts and groups pages.

---
 awx/ui/static/js/helpers/Hosts.js     | 12 +++++++-----
 awx/ui/static/js/helpers/inventory.js |  3 ++-
 awx/ui/static/less/ansible-ui.less    | 10 ++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/awx/ui/static/js/helpers/Hosts.js b/awx/ui/static/js/helpers/Hosts.js
index e54ab64688..c2787f744b 100644
--- a/awx/ui/static/js/helpers/Hosts.js
+++ b/awx/ui/static/js/helpers/Hosts.js
@@ -681,17 +681,19 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
         Rest.setUrl (GetBasePath('inventory') + inventory_id + '/');
         Rest.get()
              .success( function(data, status, headers, config) {
-                 html += "<div class=\"title\"><i class=\"icon-sitemap\"></i> Group Selector:</div>\n" +
+                 html += "<div class=\"title\">Group Selector:</div>\n" +
                    "<ul class=\"tree-root\">\n" +
                    "<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + data.related.hosts + "\" " +
                    "data-description=\"" + data.description + "\" " + 
                    "data-failures=\"" + data.has_active_failures + "\" " +
                    "data-groups=\"" + data.related.groups + "\" " + 
                    "data-name=\"" + data.name + "\" " +
-                   "><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></a> " +
-                   "<i class=\"field-badge icon-failures-" + data.has_active_failures + "\"" +
-                   "aw-tool-tip=\"" + toolTip + "\" data-placement=\"bottom\"></i> " +
-                   "<a href=\"\" class=\"activate active\">" + data.name + "</a>";
+                   //"><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></a> " +
+                   ">" +
+                   //"<i class=\"field-badge icon-failures-" + data.has_active_failures + "\"" +
+                   //"aw-tool-tip=\"" + toolTip + "\" data-placement=\"bottom\"></i> " +
+                   "<i class=\"icon-sitemap\"></i> " +
+                   "<a href=\"\" class=\"activate active\">" + data.name + " Inventory</a>";
                  scope.$emit('buildAllGroups', data.name, data.related.tree, data.related.groups);
                  scope.$emit('refreshHost', null, 'All Hosts');
                  })
diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js
index 220a832f50..a2bc9f185e 100644
--- a/awx/ui/static/js/helpers/inventory.js
+++ b/awx/ui/static/js/helpers/inventory.js
@@ -33,7 +33,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
         var treeData =
             [{ 
                 data: {
-                    title: inventory_name + ' Inventory Groups'
+                    title: inventory_name + ' Inventory'
                     }, 
                 attr: {
                     type: 'inventory',
@@ -161,6 +161,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi
             scope['treeLoading'] = false;
             Wait('stop');
             // Force root node styling changes
+            $('#tree-view').prepend("<div class=\"title\">Group Selector:</div>");
             $('#inventory-node ins').first().remove();
             $('#inventory-node a ins').first().css('background-image', 'none').append('<i class="icon-sitemap"></i>').css('margin-right','10px');
             scope.$emit('treeLoaded');
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 64761238d0..5d16d03a4e 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -977,12 +977,11 @@ select.field-mini-height {
   }
 
   .search-tree { 
-    padding: 10px 3px 10px 3px;
+    padding: 10px 3px 10px 10px;
 
     .title {
       color: #888;
       font-weight: normal;
-      margin-left: 5px;
       margin-bottom: 5px;
       margin-top: 0;
     }
@@ -997,6 +996,8 @@ select.field-mini-height {
     }
 
     .activate {
+      padding-left: 3px;
+      padding-right: 3px;
       word-break: break-all;
     }
 
@@ -1006,12 +1007,13 @@ select.field-mini-height {
 
     .active {
       font-weight: bold;
-      padding: 5px 0 5px 0;
+      padding-top: 5px;
+      padding-bottom: 5px;
     }
 
     .expand {
       padding: 3px;
-      border: 1px solid rgb(245, 245, 245);
+      /*border: 1px solid rgb(245, 245, 245);*/
     }
 
     .expand:hover {