From 074fe8a3d10515b5b70b76d91fda0dc882b8a7df Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Mon, 12 Dec 2016 16:33:37 -0800
Subject: [PATCH 1/4] adding some fields to the job results left hand side
 panel

---
 .../src/job-results/job-results.controller.js |   3 +-
 .../src/job-results/job-results.partial.html  | 104 +++++-------------
 2 files changed, 32 insertions(+), 75 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js
index b2f83ede02..ce92fb95f7 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -31,6 +31,7 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
         $scope.machine_credential_link = getTowerLink('credential');
         $scope.cloud_credential_link = getTowerLink('cloud_credential');
         $scope.network_credential_link = getTowerLink('network_credential');
+        $scope.schedule_link = getTowerLink('schedule');
     };
 
     // uses options to set scope variables to their readable string
@@ -64,7 +65,7 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
 
     // turn related api browser routes into tower routes
     getTowerLinks();
-    
+
     // the links below can't be set in getTowerLinks because the
     // links on the UI don't directly match the corresponding URL
     // on the API browser
diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index b12c7af487..85e4bfedf0 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -62,6 +62,20 @@
                 <!-- LEFT PANE DETAILS GROUP -->
                 <div>
 
+                    <!-- STATUS DETAIL -->
+                    <div class="JobResults-resultRow">
+                        <label class="JobResults-resultRowLabel">
+                            Status
+                        </label>
+                        <div class="JobResults-resultRowText">
+                            <i
+                                class="JobResults-statusResultIcon
+                                    fa
+                                    icon-job-{{ job.status }}">
+                            </i> {{ status_label }}
+                        </div>
+                    </div>
+
                     <!-- START TIME DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.started">
@@ -135,6 +149,22 @@
                         </div>
                     </div>
 
+                    <!-- SCHEDULED BY DETAIL -->
+                    <div class="JobResults-resultRow toggle-show"
+                        ng-show="job.summary_fields.schedule.name">
+                        <label
+                            class="JobResults-resultRowLabel">
+                            Schedule
+                        </label>
+                        <div class="JobResults-resultRowText">
+                            <a href="{{ scheduled_by_link }}"
+                                aw-tool-tip="Edit the Schedule"
+                                data-placement="top">
+                                {{ job.summary_fields.schedule.name }}
+                            </a>
+                        </div>
+                    </div>
+
                     <!-- INVENTORY DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.summary_fields.inventory.name">
@@ -348,80 +378,6 @@
                         </div>
                     </div>
 
-                    <!-- STATUS DETAIL -->
-                    <!-- <div
-                        class="form-group
-                            JobResults-resultRow
-                            toggle-show">
-                        <label
-                            class="JobResults-resultRowLabel
-                                col-lg-2 col-md-2
-                                col-sm-2 col-xs-3
-                                control-label">
-                            Status
-                        </label>
-                        <div class="JobResults-resultRowText
-                            col-lg-10 col-md-10 col-sm-10 col-xs-9">
-                            <i
-                                class="JobResults-statusIcon--results
-                                    fa
-                                    icon-job-{{ job.status }}">
-                            </i> {{ status_label }}
-                        </div>
-                    </div> -->
-
-                    <!-- SCHEDULED BY DETAIL -->
-                    <!-- <div
-                        class="form-group
-                            JobResults-resultRow toggle-show"
-                        ng-show="job.summary_fields.schedule_by.username">
-                        <label
-                            class="JobResults-resultRowLabel
-                                col-lg-2 col-md-2
-                                col-sm-2 col-xs-3
-                                control-label">
-                            Launched By
-                        </label>
-                        <div class="JobResults-resultRowText">
-                            <a href="{{ scheduled_by_link }}"
-                                aw-tool-tip="Edit the Schedule"
-                                data-placement="top">
-                                {{ job.summary_fields.scheduled_by.username }}
-                            </a>
-                        </div>
-                    </div> -->
-
-                    <!-- ELAPSED TIME DETAIL -->
-                    <!-- <div
-                        class="form-group
-                            JobResults-resultRow toggle-show"
-                        ng-show="job_status.started">
-                        <label
-                            class="JobResults-resultRowLabel
-                                col-lg-2 col-md-2
-                                col-sm-2 col-xs-3
-                                control-label">
-                            Elapsed
-                        </label>
-                        <div class="JobResults-resultRowText">
-                            {{ job_status.elapsed }}
-                        </div>
-                    </div> -->
-
-                    <!-- EXPLANATION DETAIL -->
-                    <!-- <div
-                        class="form-group
-                            JobResults-resultRow
-                            toggle-show"
-                        ng-show="job_status.explanation">
-                        <label
-                            class="JobResults-resultRowLabel
-                                col-lg-2 col-md-2
-                                col-sm-2 col-xs-3
-                                control-label">
-                            Explanation
-                        </label> -->
-
                         <!-- PREVIOUS TASK SUCCEEDED -->
                         <!-- <div class="JobResults-resultRowText
                             col-lg-10 col-md-10 col-sm-10 col-xs-9

From 3fc575dd125210aa8f549377d336aca9e3ac82b4 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 13 Dec 2016 10:59:33 -0800
Subject: [PATCH 2/4] fix for job status on job results, and launched by

---
 .../src/job-results/job-results.partial.html  | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index 85e4bfedf0..cf45b792aa 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -62,20 +62,6 @@
                 <!-- LEFT PANE DETAILS GROUP -->
                 <div>
 
-                    <!-- STATUS DETAIL -->
-                    <div class="JobResults-resultRow">
-                        <label class="JobResults-resultRowLabel">
-                            Status
-                        </label>
-                        <div class="JobResults-resultRowText">
-                            <i
-                                class="JobResults-statusResultIcon
-                                    fa
-                                    icon-job-{{ job.status }}">
-                            </i> {{ status_label }}
-                        </div>
-                    </div>
-
                     <!-- START TIME DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.started">
@@ -154,7 +140,7 @@
                         ng-show="job.summary_fields.schedule.name">
                         <label
                             class="JobResults-resultRowLabel">
-                            Schedule
+                            Launched By
                         </label>
                         <div class="JobResults-resultRowText">
                             <a href="{{ scheduled_by_link }}"
@@ -446,7 +432,10 @@
                 <div class="StandardOut-panelHeader">
                     <div class="StandardOut-panelHeaderText">
                         <i class="JobResults-statusResultIcon
-                            fa icon-job-{{ job.status }}">
+                            fa icon-job-{{ job.status }}"
+                            aw-tool-tip="Job {{status_label}}"
+                            aw-tip-placement="top"
+                            data-original-title>
                         </i>
                         {{ job.name }}
                     </div>

From 4532945d5ac2ec4773cfe4ff3f3812cda33319f0 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 13 Dec 2016 14:35:51 -0800
Subject: [PATCH 3/4] adding result_traceback to the UI

---
 .../src/job-results/job-results.partial.html  | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index cf45b792aa..340d4b1ca5 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -85,6 +85,19 @@
                         </div>
                     </div>
 
+                    <!-- RESULTS TRACEBACK DETAIL -->
+                    <div class="JobResults-resultRow"
+                        ng-show="job.result_traceback">
+                        <label class="JobResults-resultRowLabel">
+                            Results Traceback
+                        </label>
+                        <div class="JobResults-resultRowText
+                            job_status_traceback"
+                            ng-bind-html="job.result_traceback">
+                        </div>
+                    </div>
+
+
                     <!-- TEMPLATE DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.summary_fields.job_template.name">
@@ -401,23 +414,6 @@
 
                     <!-- </div> -->
 
-                    <!-- RESULTS TRACEBACK DETAIL -->
-                    <!-- <div
-                        class="form-group
-                            JobResults-resultRow
-                            toggle-show" ng-show="job.result_traceback">
-                        <label
-                            class="JobResults-resultRowLabel
-                                col-lg-2 col-md-12
-                                col-sm-12 col-xs-12">
-                            Results Traceback
-                        </label>
-                        <div class="JobResults-resultRowText
-                            col-lg-10 col-md-12 col-sm-12 col-xs-12
-                            job_status_traceback"
-                            ng-bind-html="job.result_traceback">
-                        </div>
-                    </div> -->
 
                 </div>
 

From 49259e3588a47f226df864a4fcd4291304be4b20 Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 13 Dec 2016 16:26:29 -0800
Subject: [PATCH 4/4] adding explanation to left hand panel

---
 .../src/job-results/job-results.controller.js    |  4 +++-
 .../src/job-results/job-results.partial.html     | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js
index ce92fb95f7..adfe541bc4 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -85,7 +85,9 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
         jobData.summary_fields.source_workflow_job.id){
             $scope.workflow_result_link = `/#/workflows/${jobData.summary_fields.source_workflow_job.id}`;
     }
-
+    if(jobData.result_traceback) {
+        $scope.job.result_traceback = jobData.result_traceback.trim().split('\n').join('<br />');
+    }
     // use options labels to manipulate display of details
     getTowerLabels();
 
diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index 340d4b1ca5..4b2d8be6ea 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -85,14 +85,24 @@
                         </div>
                     </div>
 
+                    <!-- EXPLANATION DETAIL -->
+                    <div class="JobResults-resultRow"
+                        ng-show="job.job_explanation">
+                        <label class="JobResults-resultRowLabel">
+                            Explanation
+                        </label>
+                        <div class="JobResults-resultRowText">
+                            {{job.job_explanation}}
+                        </div>
+                    </div>
+
                     <!-- RESULTS TRACEBACK DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="job.result_traceback">
                         <label class="JobResults-resultRowLabel">
                             Results Traceback
                         </label>
-                        <div class="JobResults-resultRowText
-                            job_status_traceback"
+                        <div class="JobResults-resultRowText"
                             ng-bind-html="job.result_traceback">
                         </div>
                     </div>
@@ -410,7 +420,7 @@
                                 <i class="fa fa-question-circle">
                                 </i>
                             </a>
-                        </div> -->
+                        </div>
 
                     <!-- </div> -->