From c9cfaf65a07ab2c5b316a91c84dbdf6ef2fbe96c Mon Sep 17 00:00:00 2001
From: Vadiem Janssens <info@vadiemjanssens.nl>
Date: Fri, 19 Jun 2020 09:47:54 +0200
Subject: [PATCH] Add headingLevels to Title, minor improvements

Signed-off-by: Vadiem Janssens <info@vadiemjanssens.nl>
---
 .../screens/Template/shared/JobTemplateForm.jsx  |  9 +++++----
 .../Template/shared/WorkflowJobTemplateForm.jsx  | 16 +++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
index 8df4dc1875..98773323be 100644
--- a/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
@@ -555,7 +555,7 @@ function JobTemplateForm({
                 <SubFormLayout>
                   {allowCallbacks && (
                     <>
-                      <Title size="md">
+                      <Title size="md" headingLevel="h4">
                         {i18n._(t`Provisioning Callback details`)}
                       </Title>
                       <FormColumnLayout>
@@ -580,13 +580,14 @@ function JobTemplateForm({
                           }
                         />
                       </FormColumnLayout>
-
-                      <br />
                     </>
                   )}
+
+                  {allowCallbacks && enableWebhooks && (<br />)}
+
                   {enableWebhooks && (
                     <>
-                      <Title size="md">{i18n._(t`Webhook details`)}</Title>
+                      <Title size="md" headingLevel="h4">{i18n._(t`Webhook details`)}</Title>
                       <FormColumnLayout>
                         <WebhookSubForm
                           enableWebhooks={enableWebhooks}
diff --git a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
index ad6aedd2ce..f7dfeb3a16 100644
--- a/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
+++ b/awx/ui_next/src/screens/Template/shared/WorkflowJobTemplateForm.jsx
@@ -215,15 +215,13 @@ function WorkflowJobTemplateForm({
       </FormGroup>
 
       {enableWebhooks && (
-        <>
-          <SubFormLayout>
-            <Title size="md">{i18n._(t`Webhook details`)}</Title>
-            <WebhookSubForm
-              enableWebhooks={enableWebhooks}
-              templateType={template.type}
-            />
-          </SubFormLayout>
-        </>
+        <SubFormLayout>
+          <Title size="md" headingLevel="h4">{i18n._(t`Webhook details`)}</Title>
+          <WebhookSubForm
+            enableWebhooks={enableWebhooks}
+            templateType={template.type}
+          />
+        </SubFormLayout>
       )}
 
       {submitError && <FormSubmitError error={submitError} />}