From c494c889f56e79e0aa55c220e357604c8724c922 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Thu, 20 Feb 2014 13:27:59 -0500
Subject: [PATCH] Add info to the build pane that shows if a trigger started
 the build

---
 static/directives/trigger-description.html |  9 +++++++++
 static/js/app.js                           | 17 +++++++++++++++++
 static/js/controllers.js                   |  6 +++++-
 static/partials/repo-admin.html            | 12 ++----------
 static/partials/repo-build.html            |  4 ++++
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 static/directives/trigger-description.html

diff --git a/static/directives/trigger-description.html b/static/directives/trigger-description.html
new file mode 100644
index 000000000..11f48e57d
--- /dev/null
+++ b/static/directives/trigger-description.html
@@ -0,0 +1,9 @@
+<span class="trigger-description-element" ng-switch on="trigger.service">
+  <span ng-switch-when="github">
+    <i class="fa fa-github fa-lg" style="margin-right: 6px" title="GitHub" bs-tooltip="tooltip.title"></i>
+    Push to GitHub repository <a href="https://github.com/{{ trigger.config.build_source }}" target="_new">{{ trigger.config.build_source }}</a>
+  </span>
+  <span ng-switch-default>
+    Unknown
+  </span>
+</span>
diff --git a/static/js/app.js b/static/js/app.js
index cdb939745..20851b2b8 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2527,6 +2527,23 @@ quayApp.directive('buildLogError', function () {
 });
 
 
+quayApp.directive('triggerDescription', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/trigger-description.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'trigger': '=trigger'
+    },
+    controller: function($scope, $element) {
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('buildLogCommand', function () {
   var directiveDefinitionObject = {
     priority: 0,
diff --git a/static/js/controllers.js b/static/js/controllers.js
index a071e6572..fe7ca7004 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -936,7 +936,11 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
   };
 
   $scope.adjustLogHeight = function() {
-    $('.build-logs').height($(window).height() - 415);
+    var triggerOffset = 0;
+    if ($scope.currentBuild && $scope.currentBuild.trigger) {
+      triggerOffset = 85;
+    }
+    $('.build-logs').height($(window).height() - 415 - triggerOffset);
   };
 
   $scope.askRestartBuild = function(build) {
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 2964c8936..1c165e32f 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -211,7 +211,7 @@
         <div id="trigger" class="tab-pane">
           <div class="panel panel-default">
             <div class="panel-heading">Build Triggers
-              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Callbacks from various services (suchas GitHub) which can cause the repository to be built and updated."></i>
+              <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Triggers from various services (such as GitHub) which tell the repository to be built and updated."></i>
             </div>
 
             <div class="panel-body">
@@ -230,15 +230,7 @@
                   <tbody>
                     <tr ng-repeat="trigger in triggers">
                       <td>
-                        <div ng-switch on="trigger.service">
-                          <div ng-switch-when="github">
-                            <i class="fa fa-github fa-lg" style="margin-right: 6px" title="GitHub" bs-tooltip="tooltip.title"></i>
-                            Push to GitHub repository <a href="https://github.com/{{ trigger.config.build_source }}" target="_new">{{ trigger.config.build_source }}</a>
-                          </div>
-                          <div ng-switch-default>
-                            Unknown
-                          </div>
-                        </div>
+                        <div class="trigger-description" trigger="trigger"></div>
                       </td>
                       <td style="white-space: nowrap;">
                         <div class="dropdown" style="display: inline-block">
diff --git a/static/partials/repo-build.html b/static/partials/repo-build.html
index dbd04342d..252396007 100644
--- a/static/partials/repo-build.html
+++ b/static/partials/repo-build.html
@@ -39,6 +39,10 @@
     <div class="col-sm-10">      
       <div class="tab-content" onresize="adjustLogHeight()">
         <div ng-repeat="build in builds" class="tab-pane build-pane" ng-class="currentBuild == build ? 'active' : ''">
+          <div class="alert alert-info" ng-show="build.trigger">
+            Triggered by: <span class="trigger-description" trigger="build.trigger" style="margin-left: 10px"></span>
+          </div>
+
           <div class="build-header">
             <div class="timing">
               <i class="fa fa-clock-o"></i>