From 9dcd6d52af079019700a5b3d635ec69a3d13f9db Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 29 Nov 2016 14:44:27 -0800
Subject: [PATCH 1/2] making labels section collapsible on job results

---
 .../src/job-results/job-results.block.less    |  9 +++++++
 .../src/job-results/job-results.controller.js | 12 +++++++++
 .../src/job-results/job-results.partial.html  | 26 +++++++++++++++----
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/job-results/job-results.block.less b/awx/ui/client/src/job-results/job-results.block.less
index 5b6e46e373..9165ac4d4c 100644
--- a/awx/ui/client/src/job-results/job-results.block.less
+++ b/awx/ui/client/src/job-results/job-results.block.less
@@ -94,6 +94,15 @@
     width: 100%;
 }
 
+.JobResults-expandArrow {
+    color: #D7D7D7;
+    font-size: 14px;
+    font-weight: bold;
+    margin-right: 10px;
+    text-transform: uppercase;
+    margin-left: 10px;
+}
+
 .JobResults-resultRowText--revision{
     font-family: monospace;
 }
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 454eed3e6e..282bf648d2 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -86,6 +86,18 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
         jobResultsService.relaunchJob($scope);
     };
 
+    $scope.lessLabels = false;
+    $scope.toggleLessLabels = function() {
+        if (!$scope.lessLabels) {
+            $('#job-results-labels').slideUp(200);
+            $scope.lessLabels = true;
+        }
+        else {
+            $('#job-results-labels').slideDown(200);
+            $scope.lessLabels = false;
+        }
+    };
+
     // get initial count from resolve
     $scope.count = count.val;
     $scope.hostCount = getTotalHostCount(count.val);
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 594dc01112..3e1399447a 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -305,11 +305,27 @@
                     <!-- LABELS DETAIL -->
                     <div class="JobResults-resultRow"
                         ng-show="labels && labels.length > 0">
-                        <label class="JobResults-resultRowLabel
-                            JobResults-resultRowLabel--fullWidth">
-                            Labels
-                        </label>
-                        <div class="LabelList
+                        <div class="JobResults-resultRow">
+                            <a class="JobResults-resultRowLabel
+                                JobResults-resultRowLabel--fullWidth"
+                                ng-show="lessLabels"
+                                href=""
+                                ng-click="toggleLessLabels()">
+                                    Labels
+                                <i class="JobResults-expandArrow
+                                    fa fa-caret-right"></i>
+                            </a>
+                            <a class="JobResults-resultRowLabel
+                                JobResults-resultRowLabel--fullWidth"
+                                ng-show="!lessLabels"
+                                href=""
+                                ng-click="toggleLessLabels()">
+                                    Labels
+                                <i class="JobResults-expandArrow
+                                    fa fa-caret-down"></i>
+                            </a>
+                        </div>
+                        <div id="job-results-labels" class="LabelList
                             JobResults-resultRowText
                             JobResults-resultRowText--fullWidth">
                             <div ng-repeat="label in labels"

From e53509520fbc7142117d5455e78ae038c1a5454f Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 29 Nov 2016 17:16:35 -0800
Subject: [PATCH 2/2] adding badge for indicating a job was launched by a
 workflow

on the jobs list and the job results page
---
 awx/ui/client/legacy-styles/ansible-ui.less       | 15 +++++++++++++++
 .../src/job-results/job-results.partial.html      |  9 +++++++++
 awx/ui/client/src/lists/AllJobs.js                | 11 +++++++++++
 awx/ui/client/src/shared/generator-helpers.js     |  6 +++++-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index b9b7cbc7cc..e925bff5d4 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -2222,3 +2222,18 @@ a:hover {
 .modal-body .alert {
     padding: 10px;
 }
+
+.WorkflowBadge{
+    background-color: @b7grey;
+    border-radius: 10px;
+    color: @default-bg;
+    display: inline-block;
+    font-family: 'Open Sans';
+    font-weight: bold;
+    font-style: normal;
+    font-size: x-small;
+    height: 14px;
+    margin-left: 5px;
+    padding-left: 2px;
+    width: 14px;
+}
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 3e1399447a..a3bbd11cf5 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -97,6 +97,15 @@
                                 data-placement="top">
                                 {{ job.summary_fields.job_template.name }}
                             </a>
+                            <a href="{{ workflow_result_link }}"
+                                aw-tool-tip="View workflow results"
+                                data-placement="top"
+                                data-original-title="" title="">
+                                <i class="WorkflowBadge"
+                                    ng-show="job.launch_type === 'workflow' ">
+                                    W
+                                </i>
+                            </a>
                         </div>
                     </div>
 
diff --git a/awx/ui/client/src/lists/AllJobs.js b/awx/ui/client/src/lists/AllJobs.js
index 437e605f18..e5a47371c4 100644
--- a/awx/ui/client/src/lists/AllJobs.js
+++ b/awx/ui/client/src/lists/AllJobs.js
@@ -41,6 +41,17 @@ export default
                 label: 'Name',
                 columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-6',
                 ngClick: "viewJobDetails(job)",
+                badgePlacement: 'right',
+                badgeCustom: true,
+                badgeIcon: `<a href="{{ workflow_result_link }}"
+                    aw-tool-tip="View workflow results"
+                    data-placement="top"
+                    data-original-title="" title="">
+                    <i class="WorkflowBadge"
+                        ng-show="job.launch_type === 'workflow' ">
+                        W
+                    </i>
+                </a>`
             },
             type: {
                 label: 'Type',
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index d60fdab399..0b350639e2 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -327,7 +327,11 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                     }
                     html += "\n";
                 }
-            } else {
+            }
+            else if(field.badgeCustom === true){
+                html += field.badgeIcon;
+            }
+            else {
                 if (field.badgeToolTip) {
                     html += "<a ";
                     html += (field.badgeNgHref) ? "ng-href=\"" + field.badgeNgHref + "\" " : "href=\"\"";