From f106b596ea7e0c2541f9cbd245bb75bd52bc6620 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 8 Jul 2016 16:27:43 -0400 Subject: [PATCH] give description column top/bottom padding, and center action cell for tall rows --- awx/ui/client/legacy-styles/lists.less | 5 +++++ .../job-templates-list.partial.html | 16 +++++++++------- awx/ui/client/src/shared/form-generator.js | 4 ++-- .../list-generator/list-generator.factory.js | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index f2120c139e..6282ab340e 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -80,6 +80,11 @@ table, tbody { border-top:0px!important; } +.List-tableCell.description-column { + padding-top: 15px; + padding-bottom: 15px; +} + .List-actionButtonCell { padding-top:5px; padding-right: 15px; diff --git a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html index da60bce8cf..8329747c6c 100644 --- a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html +++ b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html @@ -32,13 +32,15 @@ - - - + +
+ + +
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index 5417829724..4b889eeb75 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1960,7 +1960,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat // Row level actions if (collection.fieldActions) { - html += ""; + html += "
"; for (act in collection.fieldActions) { fAction = collection.fieldActions[act]; html += ""; } - html += ""; + html += "
"; html += "\n"; } diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js index 30c4625a59..9fc63e0969 100644 --- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js +++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js @@ -524,7 +524,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate // Row level actions - innerTable += ""; + innerTable += "
"; for (field_action in list.fieldActions) { if (field_action !== 'columnClass') { @@ -573,7 +573,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate } } } - innerTable += "\n"; + innerTable += "
\n"; } innerTable += "\n";