From 4f90406e91a728f0f8d4438034e92e557f2a2766 Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Wed, 23 Oct 2019 16:05:56 -0700
Subject: [PATCH 1/2] fix border/padding while loading jt edit form

---
 .../Template/JobTemplateEdit/JobTemplateEdit.jsx    | 12 ++++++++++--
 .../src/screens/Template/shared/JobTemplateForm.jsx | 13 +++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
index a0cf904ab2..53c2b55f30 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.jsx
@@ -179,11 +179,19 @@ class JobTemplateEdit extends Component {
     const canEdit = template.summary_fields.user_capabilities.edit;
 
     if (hasContentLoading) {
-      return <ContentLoading />;
+      return (
+        <CardBody>
+          <ContentLoading />
+        </CardBody>
+      );
     }
 
     if (contentError) {
-      return <ContentError error={contentError} />;
+      return (
+        <CardBody>
+          <ContentError error={contentError} />
+        </CardBody>
+      );
     }
 
     if (!canEdit) {
diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index bffdf85cef..57259647fa 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -8,6 +8,7 @@ import {
   Form,
   FormGroup,
   Card,
+  CardBody,
   Switch,
   Checkbox,
   TextInput,
@@ -165,19 +166,11 @@ class JobTemplateForm extends Component {
     }
 
     if (hasContentLoading) {
-      return (
-        <Card className="awx-c-card">
-          <ContentLoading />
-        </Card>
-      );
+      return <ContentLoading />;
     }
 
     if (contentError) {
-      return (
-        <Card className="awx-c-card">
-          <ContentError error={contentError} />
-        </Card>
-      );
+      return <ContentError error={contentError} />;
     }
     const AdvancedFieldsWrapper = template.isNew ? CollapsibleSection : 'div';
     return (

From 1d7bd835e648536830cc3efb1f9b0673bd746a9f Mon Sep 17 00:00:00 2001
From: Keith Grant <keithjgrant@redhat.com>
Date: Thu, 24 Oct 2019 09:01:50 -0700
Subject: [PATCH 2/2] remove unused imports

---
 awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index 57259647fa..88be879390 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -7,8 +7,6 @@ import { withFormik, Field } from 'formik';
 import {
   Form,
   FormGroup,
-  Card,
-  CardBody,
   Switch,
   Checkbox,
   TextInput,