External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 13:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-22 17:03:59 -05:00
parent d9817ac826
commit 337bbc0a9c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/static/js/lists/HomeGroups.js
View File

@@ -23,14 +23,13 @@ angular.module('HomeGroupListDefinition', [])
key: true, key: true,
label: 'Group', label: 'Group',
ngClick: "editGroup(group.id, group.inventory)", ngClick: "editGroup(group.id, group.inventory)",
columnClass: 'col-lg-5 ellipsis' columnClass: 'col-lg-4 col-md3 col-sm-3 col-xs-6 ellipsis'
//linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}"
}, },
inventory_name: { inventory_name: {
label: 'Inventory', label: 'Inventory',
sourceModel: 'inventory', sourceModel: 'inventory',
sourceField: 'name', sourceField: 'name',
//columnClass: 'col-lg-3 col-md3 col-sm-2 ellipsis', columnClass: 'col-lg-3 col-md2 col-sm-2 hidden-xs elllipsis',
linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}" linkTo: "\{\{ '/#/inventories/' + group.inventory + '/' \}\}"
}, },
/*failed_hosts: { /*failed_hosts: {

4
awx/ui/static/js/lists/HomeHosts.js
View File

@@ -23,14 +23,14 @@ angular.module('HomeHostListDefinition', [])
name: { name: {
key: true, key: true,
label: 'Name', label: 'Name',
columnClass: 'col-lg-3 col-md3 col-sm-2', columnClass: 'col-lg-4 col-md3 col-sm-3 col-xs-7 ellipsis',
ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')" ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')"
}, },
inventory_name: { inventory_name: {
label: 'Inventory', label: 'Inventory',
sourceModel: 'inventory', sourceModel: 'inventory',
sourceField: 'name', sourceField: 'name',
columnClass: 'col-lg-3 col-md3 col-sm-2', columnClass: 'col-lg-3 col-md2 col-sm-2 hidden-xs elllipsis',
linkTo: "\{\{ '/#/inventories/' + host.inventory \}\}" linkTo: "\{\{ '/#/inventories/' + host.inventory \}\}"
}, },
enabled: { enabled: {

4
awx/ui/static/lib/ansible/list-generator.js
View File

@@ -244,7 +244,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "<thead>\n"; html += "<thead>\n";
html += "<tr>\n"; html += "<tr>\n";
if (list.index) { if (list.index) {
html += "<th class\"col-lg-1 col-md-1 col-sm-1\">#</th>\n"; html += "<th class=\"col-lg-1 col-md-1 col-sm-1 hidden-xs\">#</th>\n";
} }
for (var fld in list.fields) { for (var fld in list.fields) {
if ( (list.fields[fld].searchOnly == undefined || list.fields[fld].searchOnly == false) && if ( (list.fields[fld].searchOnly == undefined || list.fields[fld].searchOnly == false) &&
@@ -298,7 +298,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
html += "\""; html += "\"";
html += ">\n"; html += ">\n";
if (list.index) { if (list.index) {
html += "<td class=\"index-column\">{{ $index + (" + list.iterator + "Page * " + list.iterator + "PageSize) + 1 }}.</td>\n"; html += "<td class=\"index-column hidden-xs\">{{ $index + (" + list.iterator + "Page * " + list.iterator + "PageSize) + 1 }}.</td>\n";
} }
var cnt = 2; var cnt = 2;
var base = (list.base) ? list.base : list.name; var base = (list.base) ? list.base : list.name;