From 8b301f91ab43f6ba9134666af3d86267de1235fa Mon Sep 17 00:00:00 2001 From: Jose Ariza Date: Wed, 15 May 2019 09:04:50 -0500 Subject: [PATCH 1/6] #3348 added description to host list Signed-off-by: Jose Ariza --- .../inventories-hosts/hosts/hosts.partial.html | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html index 2c1f3b0747..b3639d9f4e 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html @@ -43,9 +43,10 @@
-
-
-
Actions
+
+
+
+
Actions
@@ -64,17 +65,22 @@
-
+ -
+ + -
+
- + {{host.description }}
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js index 29d39fa632..f65628b012 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js @@ -64,33 +64,27 @@ export default ['i18n', function(i18n) { label: i18n._('Hosts'), uiSref: ".edit({inventory_id: host.inventory_id,host_id: host.id})", ngClass: "{ 'host-disabled-label': !host.enabled }", - columnClass: 'col-lg-3 col-md-3 col-sm-8 col-xs-7', + columnClass: 'col-lg-3 col-md-6 col-sm-8 col-xs-7', dataHostId: "{{ host.id }}", dataType: "host", class: 'InventoryManage-breakWord' }, description: { - key: true, label: i18n._('Description'), - uiSref: ".edit({inventory_id: host.inventory_id,host_id: host.id})", - ngClass: "{ 'host-disabled-label': !host.enabled }", - columnClass: 'col-lg-3 col-md-3 col-sm-8 col-xs-7', - dataHostId: "{{ host.id }}", - dataType: "host", - class: 'InventoryManage-breakWord' + columnClass: 'd-none d-lg-flex col-lg-3' }, groups: { label: i18n._("Related Groups"), type: 'related_groups', nosort: true, showDelete: true, - columnClass: 'd-none d-md-flex List-tableCell col-lg-3 col-md-3' + columnClass: 'd-none d-lg-flex List-tableCell col-lg-3' } }, fieldActions: { - columnClass: 'col-lg-2 col-sm-3 col-xs-5 text-right', + columnClass: 'col-lg-3 col-md-6 col-sm-4 col-xs-5 text-right', edit: { ngClick: "editHost(host)", icon: 'icon-edit', From 24df1d7be65c1242e09a91c04252a4c35b478e07 Mon Sep 17 00:00:00 2001 From: Jose Ariza Date: Sat, 15 Jun 2019 12:31:11 -0500 Subject: [PATCH 4/6] #3348 improved listing on mobile Signed-off-by: Jose Ariza --- .../client/src/inventories-hosts/hosts/hosts.partial.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html index c0a16fd465..18b1c1449b 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html @@ -43,8 +43,8 @@
-
-
+
+
Actions
@@ -70,10 +70,10 @@ {{host.name }}
-
+
{{host.description }}
-
+
From 14bdf8deb30c02c6001625548144ead3239b1e69 Mon Sep 17 00:00:00 2001 From: Jose Ariza Date: Sat, 15 Jun 2019 13:22:47 -0500 Subject: [PATCH 5/6] #3348 improved related listing on mobile Signed-off-by: Jose Ariza --- .../inventories/related/hosts/related-host.list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js index f65628b012..dd23cb3ff1 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js @@ -64,7 +64,7 @@ export default ['i18n', function(i18n) { label: i18n._('Hosts'), uiSref: ".edit({inventory_id: host.inventory_id,host_id: host.id})", ngClass: "{ 'host-disabled-label': !host.enabled }", - columnClass: 'col-lg-3 col-md-6 col-sm-8 col-xs-7', + columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-7', dataHostId: "{{ host.id }}", dataType: "host", class: 'InventoryManage-breakWord' From b46db98b5a1cd7e10ad1fc70ad63c0aaa801909f Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 10 Jul 2019 11:42:33 -0400 Subject: [PATCH 6/6] Removes some unused classes. Fix host desc ellipsis and responsiveness. Add desc to group hosts --- .../src/inventories-hosts/hosts/host.list.js | 1 - .../hosts/hosts.partial.html | 28 ++++++++++--------- .../groups/hosts-related-groups.list.js | 1 - .../inventories/related/groups/groups.list.js | 1 - .../nested-groups/group-nested-groups.list.js | 1 - .../nested-hosts/group-nested-hosts.list.js | 16 ++++++++--- .../related/hosts/related-host.list.js | 8 ++++-- .../nested-groups/host-nested-groups.list.js | 1 - .../related/sources/sources.list.js | 1 - .../list-generator/list-generator.factory.js | 2 +- 10 files changed, 34 insertions(+), 26 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/hosts/host.list.js b/awx/ui/client/src/inventories-hosts/hosts/host.list.js index 9ca7a4114a..fbc4ea48ad 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/host.list.js +++ b/awx/ui/client/src/inventories-hosts/hosts/host.list.js @@ -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'), diff --git a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html index 18b1c1449b..9d0058458c 100644 --- a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html +++ b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html @@ -43,9 +43,9 @@
-
-
-
+
+
+
Actions
@@ -64,21 +64,23 @@
-
-
+
+ -
- {{host.description }} -
-
-
- {{host.inventory_name}} +
+
+ {{ host.description }}
-
+ +
`; } - innerTable += `
`; + innerTable += `
`; if (list.index) { innerTable += "
{{ $index + ((" + list.iterator + "_page - 1) * " + list.iterator + "_page_size) + 1 }}.
\n";