From fc7e887da66d8be9e0fc86bcd91945838d036f63 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansible.com>
Date: Mon, 19 May 2014 14:02:28 -0400
Subject: [PATCH] AC-1292 Fixed inventory edit page sizing, column widths and
 margins.

---
 awx/ui/static/js/lists/InventoryGroups.js | 22 +++++-----------------
 awx/ui/static/js/lists/InventoryHosts.js  |  8 ++++----
 awx/ui/static/less/ansible-ui.less        | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/awx/ui/static/js/lists/InventoryGroups.js b/awx/ui/static/js/lists/InventoryGroups.js
index 72e0af8a3d..67f8f12033 100644
--- a/awx/ui/static/js/lists/InventoryGroups.js
+++ b/awx/ui/static/js/lists/InventoryGroups.js
@@ -26,7 +26,7 @@ angular.module('InventoryGroupsDefinition', [])
                 columnClick: "showHosts(group.id,group.group_id, false)",
                 ngClass: "group.selected_class",
                 hasChildren: true,
-                columnClass: 'col-lg-9 col-md-9 col-sm-7 col-xs-7',
+                columnClass: 'col-lg-10 col-md-10 col-sm-10 col-xs-8',
                 nosort: true,
                 awDroppable: "{{ group.isDroppable }}",
                 awDraggable: "{{ group.isDraggable }}",
@@ -37,10 +37,7 @@ angular.module('InventoryGroupsDefinition', [])
             }
         },
 
-        actions: {
-            
-            columnClass: 'col-lg-3 col-md-3 col-sm-5 col-xs-5',
-            
+        actions: {        
             create: {
                 mode: 'all',
                 ngClick: "createGroup()",
@@ -51,18 +48,6 @@ angular.module('InventoryGroupsDefinition', [])
                 awToolTip: "Edit inventory properties",
                 ngClick: 'editInventoryProperties()'
             },
-            /*refresh: {
-                mode: 'all',
-                awToolTip: "Refresh the page",
-                ngClick: "refreshGroups()"
-            },*/
-            socket: {
-                mode: 'all',
-                iconClass: "{{ 'fa fa-power-off fa-lg socket-' + socketStatus }}",
-                awToolTip: "{{ socketTip }}",
-                dataTipWatch: "socketTip",
-                ngClick: "socketToggle()",
-            },
             stream: {
                 ngClick: "showGroupActivity()",
                 awToolTip: "View Activity Stream",
@@ -77,6 +62,9 @@ angular.module('InventoryGroupsDefinition', [])
         },
 
         fieldActions: {
+            
+            columnClass: 'col-lg-2 col-md-2 col-sm-2 col-xs-4',
+
             sync_status: {
                 mode: 'all',
                 ngClick: "viewUpdateStatus(group.id, group.group_id)",
diff --git a/awx/ui/static/js/lists/InventoryHosts.js b/awx/ui/static/js/lists/InventoryHosts.js
index 7c3733313a..0ba5545936 100644
--- a/awx/ui/static/js/lists/InventoryHosts.js
+++ b/awx/ui/static/js/lists/InventoryHosts.js
@@ -28,7 +28,7 @@ angular.module('InventoryHostsDefinition', [])
                 label: 'Hosts',
                 ngClick: "editHost(host.id)",
                 searchPlaceholder: "search_place_holder",
-                columnClass: 'col-lg-9 col-md-9 col-sm-7 col-xs-7',
+                columnClass: 'col-lg-10 col-md-10 col-sm-10 col-xs-8',
                 dataHostId: "{{ host.id }}",
                 dataType: "host",
                 awDraggable: "true"
@@ -50,6 +50,9 @@ angular.module('InventoryHostsDefinition', [])
         },
 
         fieldActions: {
+            
+            columnClass: 'col-lg-2 col-md-2 col-sm-2 col-xs-4',
+
             enabled_flag: {
                 iconClass: "{{ 'fa icon-enabled-' + host.enabled }}",
                 dataPlacement: 'top',
@@ -83,9 +86,6 @@ angular.module('InventoryHostsDefinition', [])
         },
 
         actions: {
-
-            columnClass: 'col-lg-3 col-md-3 col-sm-5 col-xs-5',
-
             create: {
                 mode: 'all',
                 ngClick: "createHost()",
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index bfdbb9f449..0e33a30305 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -1703,6 +1703,15 @@ tr td button i {
       width: 80%;
   }
 
+  #groups-container.col-lg-6 {
+      padding-right: 15px;
+  }
+
+  #hosts-container.col-lg-6 {
+      padding-left: 15px;
+      padding-right: 15px;
+  }
+
 }
 
 
@@ -1786,4 +1795,13 @@ tr td button i {
       display: none;
   }
 
+  #groups-container.col-lg-6 {
+      padding-right: 15px;
+  }
+
+  #hosts-container.col-lg-6 {
+      padding-left: 15px;
+      padding-right: 15px;
+  }
+
 }