From 4ea757c91a6127f07a3ed65429841484df786be8 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 23 Nov 2020 14:38:36 -0500
Subject: [PATCH] Move jt/wfjt created/modified details to the end right before
 the full width details

---
 .../JobTemplateDetail/JobTemplateDetail.jsx   | 20 +++++++-------
 .../WorkflowJobTemplateDetail.jsx             | 26 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
index e25032e527..8f3fe4ffcd 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateDetail/JobTemplateDetail.jsx
@@ -219,16 +219,6 @@ function JobTemplateDetail({ i18n, template }) {
           value={verbosityDetails[0].details}
         />
         <Detail label={i18n._(t`Timeout`)} value={timeout || '0'} />
-        <UserDateDetail
-          label={i18n._(t`Created`)}
-          date={created}
-          user={summary_fields.created_by}
-        />
-        <UserDateDetail
-          label={i18n._(t`Last Modified`)}
-          date={modified}
-          user={summary_fields.modified_by}
-        />
         <Detail
           label={i18n._(t`Show Changes`)}
           value={diff_mode ? i18n._(t`On`) : i18n._(t`Off`)}
@@ -278,6 +268,16 @@ function JobTemplateDetail({ i18n, template }) {
         {renderOptionsField && (
           <Detail label={i18n._(t`Options`)} value={renderOptions} />
         )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={created}
+          user={summary_fields.created_by}
+        />
+        <UserDateDetail
+          label={i18n._(t`Last Modified`)}
+          date={modified}
+          user={summary_fields.modified_by}
+        />
         {summary_fields.credentials && summary_fields.credentials.length > 0 && (
           <Detail
             fullWidth
diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
index 2f6b99821a..2a5242b9a0 100644
--- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
+++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateDetail/WorkflowJobTemplateDetail.jsx
@@ -135,9 +135,6 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             )}
           />
         )}
-        {renderOptionsField && (
-          <Detail label={i18n._(t`Options`)} value={renderOptions} />
-        )}
         <Detail
           label={i18n._(t`Webhook Service`)}
           value={toTitleCase(template.webhook_service)}
@@ -162,6 +159,19 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
             }
           />
         )}
+        {renderOptionsField && (
+          <Detail label={i18n._(t`Options`)} value={renderOptions} />
+        )}
+        <UserDateDetail
+          label={i18n._(t`Created`)}
+          date={created}
+          user={summary_fields.created_by}
+        />
+        <UserDateDetail
+          label={i18n._(t`Modified`)}
+          date={modified}
+          user={summary_fields.modified_by}
+        />
         {summary_fields.labels?.results?.length > 0 && (
           <Detail
             fullWidth
@@ -185,16 +195,6 @@ function WorkflowJobTemplateDetail({ template, i18n }) {
           value={extra_vars}
           rows={4}
         />
-        <UserDateDetail
-          label={i18n._(t`Created`)}
-          date={created}
-          user={summary_fields.created_by}
-        />
-        <UserDateDetail
-          label={i18n._(t`Modified`)}
-          date={modified}
-          user={summary_fields.modified_by}
-        />
       </DetailList>
       <CardActionsRow>
         {summary_fields.user_capabilities &&