From c2b5d2733393a42cc103a1207686478c4f79f317 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 12 Mar 2015 10:41:43 -0400 Subject: [PATCH] Inventory manage row height and icon col width adjusted the heights of the rows for the groups/hosts on the manage view, and made the column width greater for icons on the page too --- awx/ui/static/js/helpers/inventory.js | 8 ++++---- awx/ui/static/js/lists/InventoryGroups.js | 6 +++--- awx/ui/static/js/lists/InventoryHosts.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js index f6c44525fc..4626334d83 100644 --- a/awx/ui/static/js/helpers/inventory.js +++ b/awx/ui/static/js/helpers/inventory.js @@ -44,8 +44,8 @@ export default return function() { var height, rows; height = $('#hosts-container .list-well').height() - $('#hosts-constainer .list-well .row').height() - $('#hosts_table thead').height(); - rows = Math.floor(height / 30) - 2; - rows = (rows < 20) ? 20 : rows; + rows = Math.floor(height / 44) - 2; + // rows = (rows < 20) ? 20 : rows; return rows; }; }]) @@ -54,8 +54,8 @@ export default return function() { var height, rows; height = $('#groups-container .list-table-container').height(); - rows = Math.floor(height / 31) - 2; - rows = (rows < 20) ? 20 : rows; + rows = Math.floor(height / 44) - 2; + // rows = (rows < 20) ? 20 : rows; return rows; }; }]) diff --git a/awx/ui/static/js/lists/InventoryGroups.js b/awx/ui/static/js/lists/InventoryGroups.js index 2e3483d6fa..ef88713e4d 100644 --- a/awx/ui/static/js/lists/InventoryGroups.js +++ b/awx/ui/static/js/lists/InventoryGroups.js @@ -23,7 +23,7 @@ export default key: true, ngClick: "groupSelect(group.id)", columnClick: "groupSelect(group.id)", - columnClass: 'col-lg-8 col-md-8 col-sm-8 col-xs-6' + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6' }, source: { label: 'Source', @@ -109,7 +109,7 @@ export default fieldActions: { - columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6 text-right', + columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6 text-right', label: false, sync_status: { @@ -169,4 +169,4 @@ export default dataPlacement: "top" } } - }); \ No newline at end of file + }); diff --git a/awx/ui/static/js/lists/InventoryHosts.js b/awx/ui/static/js/lists/InventoryHosts.js index 026fc59a43..0d6d8a882d 100644 --- a/awx/ui/static/js/lists/InventoryHosts.js +++ b/awx/ui/static/js/lists/InventoryHosts.js @@ -28,7 +28,7 @@ export default key: true, label: 'Hosts', ngClick: "editHost(host.id)", - columnClass: 'col-lg-8 col-md-9 col-sm-9 col-xs-7', + columnClass: 'col-lg-6 col-md-9 col-sm-9 col-xs-7', dataHostId: "{{ host.id }}", dataType: "host" }, @@ -50,7 +50,7 @@ export default fieldActions: { - columnClass: 'col-lg-4 col-md-3 col-sm-3 col-xs-5 text-right', + columnClass: 'col-lg-6 col-md-3 col-sm-3 col-xs-5 text-right', label: false, enabled_flag: { @@ -111,4 +111,4 @@ export default } } - }); \ No newline at end of file + });