From d9817ac82664e42a25e47a3f29b4fa580667b0cb Mon Sep 17 00:00:00 2001 From: chris Houseknecht Date: Wed, 22 Jan 2014 17:03:34 -0500 Subject: [PATCH] AC-948 applied ellipsis to home/groups and home/hosts pages. Added CSS on all list pages to drop index column when viewport is XS. Fixed padding on cancel icon for home/groups page. After kicking off an inventory sync on home/hosts page refresh() is now called. --- awx/ui/static/js/helpers/JobSubmission.js | 5 +++-- awx/ui/static/js/lists/HomeGroups.js | 4 ++-- awx/ui/static/less/ansible-ui.less | 3 +++ awx/ui/static/lib/ansible/list-generator.js | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index e3ff70d892..5a6e040f70 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -438,9 +438,10 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential scope.selected_group_id = group_id; scope.refreshGroups(); } - else { - scope.$emit('HostReloadComplete'); + else if (scope.refresh) { + scope.refresh(); } + scope.$emit('HostReloadComplete'); } }); diff --git a/awx/ui/static/js/lists/HomeGroups.js b/awx/ui/static/js/lists/HomeGroups.js index a0a706eb9f..a4756afa3f 100644 --- a/awx/ui/static/js/lists/HomeGroups.js +++ b/awx/ui/static/js/lists/HomeGroups.js @@ -23,14 +23,14 @@ angular.module('HomeGroupListDefinition', []) key: true, label: 'Group', ngClick: "editGroup(group.id, group.inventory)", - columnClass: 'col-lg-3 col-md3 col-sm-2' + columnClass: 'col-lg-5 ellipsis' //linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}" }, inventory_name: { label: 'Inventory', sourceModel: 'inventory', sourceField: 'name', - columnClass: 'col-lg-3 col-md3 col-sm-2', + //columnClass: 'col-lg-3 col-md3 col-sm-2 ellipsis', linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}" }, /*failed_hosts: { diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index a719c2da67..ac7b727f5b 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -129,6 +129,8 @@ a:focus { } } +#home_groups_table .actions .cancel { padding-right: 3px; } + .success-badge { color: #ffffff; background-color: #5cb85c; @@ -734,6 +736,7 @@ input[type="checkbox"].checkbox-no-label { .table-hover tbody tr:hover > td, .table-hover tbody tr:hover > th { background-color: #fff; + border-top: 1px solid #ddd; } .table-hover-inverse tbody tr:hover > td, diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js index d55cbee1dd..c6fdebad89 100644 --- a/awx/ui/static/lib/ansible/list-generator.js +++ b/awx/ui/static/lib/ansible/list-generator.js @@ -244,7 +244,7 @@ angular.module('ListGenerator', ['GeneratorHelpers']) html += "\n"; html += "\n"; if (list.index) { - html += "#\n"; + html += "#\n"; } for (var fld in list.fields) { if ( (list.fields[fld].searchOnly == undefined || list.fields[fld].searchOnly == false) &&