External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removes some unused classes. Fix host desc ellipsis and responsiveness. Add desc to group hosts

Browse Source
This commit is contained in:
mabashian 2019-07-10 11:42:33 -04:00
parent 14bdf8deb3
commit b46db98b5a
10 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/inventories-hosts/hosts/host.list.js
View File

@ -71,7 +71,6 @@ export default ['i18n', function(i18n) {
columnClass: 'col-sm-4',
dataHostId: "{{ host.id }}",
dataType: "host",
class: 'InventoryManage-breakWord'
},
inventory: {
label: i18n._('Inventory'),

28
awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html
View File

@ -43,9 +43,9 @@
<div></div>
<div></div>
<div class="d-flex h-100">
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="name" column-iterator="host" column-no-sort="undefined" column-label="Name" column-custom-class="col-lg-3 col-md-3 col-sm-3 col-xs-7" query-set="host_queryset"></div>
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="description" column-iterator="host" column-no-sort="undefined" column-label="Description" column-custom-class="d-none d-sm-flex col-sm-3 ellipsis" query-set="host_queryset"></div>
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="inventory" column-iterator="host" column-no-sort="undefined" column-label="Inventory" column-custom-class="d-none d-sm-flex col-sm-3 ellipsis" query-set="host_queryset"></div>
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="name" column-iterator="host" column-no-sort="undefined" column-label="Name" column-custom-class="col-lg-3 col-md-4" query-set="host_queryset"></div>
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="description" column-iterator="host" column-no-sort="undefined" column-label="Description" column-custom-class="d-none d-lg-flex col-lg-3" query-set="host_queryset"></div>
<div class="List-tableHeader" base-path="hosts" collection="hosts" dataset="host_dataset" column-sort="" column-field="inventory" column-iterator="host" column-no-sort="undefined" column-label="Inventory" column-custom-class="col-lg-3 col-md-4" query-set="host_queryset"></div>
<div class="List-tableHeader List-tableHeader--actions actions-column col-lg-3 text-right" translate>Actions</div>
</div>
</div>
@ -64,21 +64,23 @@
</a>
</div>
</div>
<div class="d-flex h-100">
<div class="List-tableCell name-column InventoryManage-breakWord col-lg-3">
<div class="d-flex h-100" style="min-width: 0;">
<div class="List-tableCell name-column col-lg-3 col-md-4">
<div class="host-name">
<a ui-sref="hosts.edit({host_id:host.id})">{{host.name }}</a>
<a ui-sref="hosts.edit({host_id:host.id})">{{ host.name }}</a>
</div>
</div>
<div class="List-tableCell name-column InventoryManage-breakWord d-none d-sm-flex col-sm-3 ellipsis">
{{host.description }}
</div>
<div class="List-tableCell inventory_name-column d-none d-sm-flex col-sm-3 ellipsis">
<div class="host-name">
<a href="#/inventories/inventory/{{host.inventory}}">{{host.inventory_name}}</a>
<div class="List-tableCell description-column d-none d-lg-flex col-lg-3">
<div class="d-inline-block text-truncate">
{{ host.description }}
</div>
</div>
<div class="List-actionsContainer col-lg-3">
<div class="List-tableCell inventory_name-column col-lg-3 col-md-4">
<div class="host-name d-inline-block text-truncate">
<a href="#/inventories/inventory/{{host.inventory}}">{{ host.inventory_name }}</a>
</div>
</div>
<div class="List-actionsContainer col-md-3 col-sm-4">
<div class="List-actionButtonCell List-tableCell">
<button id="insights-action" class="List-actionButton " ng-class="{'List-actionButton--selected' : $stateParams['host_id'] == host.id && $state.is('hosts.edit.insights')}" data-placement="top" ng-click="goToInsights(host.id)" aw-tool-tip="{{strings.get('inventory.VIEW_INSIGHTS')}}" data-tip-watch="strings.get('inventory.VIEW_INSIGHTS')" ng-show="host.insights_system_id && host.summary_fields.inventory.hasOwnProperty('insights_credential_id')">
<i class="fa fa-info"></i>

1
awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js
View File

@ -38,7 +38,6 @@ export default ['i18n', function(i18n) {
key: true,
ngClick: "goToGroupGroups(group.id)",
columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6',
class: 'InventoryManage-breakWord',
}
},

1
awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js
View File

@ -40,7 +40,6 @@
key: true,
uiSref: "inventories.edit.groups.edit({group_id:group.id})",
columnClass: 'col-lg-10 col-md-10 col-sm-10 col-xs-10',
class: 'InventoryManage-breakWord',
}
},

1
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js
View File

@ -39,7 +39,6 @@
key: true,
uiSref: "inventories.edit.groups.edit({group_id:nested_group.id})",
columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6',
class: 'InventoryManage-breakWord',
}
},

16
awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js
View File

@ -66,16 +66,24 @@ export default ['i18n', function(i18n) {
label: i18n._('Hosts'),
uiSref: "inventories.edit.hosts.edit({host_id: nested_host.id})",
ngClass: "{ 'host-disabled-label': !nested_host.enabled }",
columnClass: 'col-lg-6 col-md-8 col-sm-8 col-xs-7',
columnClass: 'col-lg-4 col-md-8 col-sm-8 col-xs-7',
dataHostId: "{{ nested_host.id }}",
dataType: "nested_host",
class: 'InventoryManage-breakWord'
}
},
description: {
label: i18n._('Description'),
columnClass: 'd-none d-lg-flex col-lg-4',
template: `
<div class="d-inline-block text-truncate">
{{ nested_host.description }}
</div>
`
},
},
fieldActions: {
columnClass: 'col-lg-6 col-md-4 col-sm-4 col-xs-5 text-right',
columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-5 text-right',
edit: {
ngClick: "editHost(nested_host.id)",
icon: 'icon-edit',

8
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
View File

@ -67,11 +67,15 @@ export default ['i18n', function(i18n) {
columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-7',
dataHostId: "{{ host.id }}",
dataType: "host",
class: 'InventoryManage-breakWord'
},
description: {
label: i18n._('Description'),
columnClass: 'd-none d-lg-flex col-lg-3'
columnClass: 'd-none d-lg-flex col-lg-3',
template: `
<div class="d-inline-block text-truncate">
{{ host.description }}
</div>
`
},
groups: {
label: i18n._("Related Groups"),

1
awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js
View File

@ -39,7 +39,6 @@
key: true,
ngClick: "goToGroupGroups(nested_group.id)",
columnClass: 'col-lg-6 col-md-6 col-sm-6 col-xs-6',
class: 'InventoryManage-breakWord',
}
},

1
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
View File

@ -40,7 +40,6 @@
key: true,
uiSref: "inventories.edit.inventory_sources.edit({inventory_source_id:inventory_source.id})",
columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
class: 'InventoryManage-breakWord',
},
source: {
label: i18n._('Type'),

2
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -363,7 +363,7 @@ export default ['$compile', 'Attr', 'Icon',
innerTable += `</div>`;
}
innerTable += `<div class='d-flex h-100'>`;
innerTable += `<div class='d-flex h-100' style='min-width: 0;'>`;
if (list.index) {
innerTable += "<div class=\"d-none d-sm-flex index-column List-tableCell\">{{ $index + ((" + list.iterator + "_page - 1) * " + list.iterator + "_page_size) + 1 }}.</div>\n";