From 3342f2392d0042595b90fd8c6bd2746ed3db4b19 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Mon, 29 Jun 2015 12:36:39 +0300
Subject: [PATCH] Remove long build descriptions (not properly used in the new
 UI)

---
 static/directives/repo-view/repo-panel-builds.html   |  2 +-
 .../trigger/bitbucket/trigger-description.html       | 12 ------------
 .../trigger/custom-git/trigger-description.html      |  6 ------
 .../trigger/github/trigger-description.html          | 12 ------------
 .../trigger/gitlab/trigger-description.html          | 12 ------------
 static/directives/triggered-build-description.html   |  2 +-
 static/js/directives/ui/trigger-description.js       |  2 --
 7 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/static/directives/repo-view/repo-panel-builds.html b/static/directives/repo-view/repo-panel-builds.html
index 435da1b85..33c704503 100644
--- a/static/directives/repo-view/repo-panel-builds.html
+++ b/static/directives/repo-view/repo-panel-builds.html
@@ -133,7 +133,7 @@
           </tr>
 
           <tr ng-repeat="trigger in triggers | filter:{'is_active':true}">
-            <td><div class="trigger-description" trigger="trigger" short="true"></div></td>
+            <td><div class="trigger-description" trigger="trigger"></div></td>
             <td>{{ trigger.config.subdir || '/' }}</td>
             <td>{{ trigger.config.branchtag_regex || 'All' }}</td>
             <td>
diff --git a/static/directives/trigger/bitbucket/trigger-description.html b/static/directives/trigger/bitbucket/trigger-description.html
index 997ae746b..5cfa4ecb1 100644
--- a/static/directives/trigger/bitbucket/trigger-description.html
+++ b/static/directives/trigger/bitbucket/trigger-description.html
@@ -4,16 +4,4 @@
   <a href="{{ trigger.repository_url }}" target="_new">
     {{ trigger.config.build_source }}
   </a>
-  <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
-    <div>
-      <span class="trigger-description-subtitle">Branches/Tags:</span>
-      <span ng-if="trigger.config.branchtag_regex">Matching Regular Expression {{ trigger.config.branchtag_regex }}</span>
-      <span ng-if="!trigger.config.branchtag_regex">(All Branches and Tags)</span>
-    </div>
-
-    <div>
-      <span class="trigger-description-subtitle">Dockerfile:</span>
-      <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span>
-    </div>
-  </div>
 </span>
\ No newline at end of file
diff --git a/static/directives/trigger/custom-git/trigger-description.html b/static/directives/trigger/custom-git/trigger-description.html
index abd3ecd7d..eb8c53c40 100644
--- a/static/directives/trigger/custom-git/trigger-description.html
+++ b/static/directives/trigger/custom-git/trigger-description.html
@@ -1,10 +1,4 @@
 <span>
   <i class="fa fa-git-square fa-lg" style="margin-right: 6px;" data-title="git" bs-tooltip="tooltip.title"></i>
   Push to {{ trigger.config.build_source }}
-  <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
-    <div>
-      <span class="trigger-description-subtitle">Dockerfile:</span>
-      <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span<
-    </div>
-  </div>
 </span>
\ No newline at end of file
diff --git a/static/directives/trigger/github/trigger-description.html b/static/directives/trigger/github/trigger-description.html
index 668a03785..5a01c4aed 100644
--- a/static/directives/trigger/github/trigger-description.html
+++ b/static/directives/trigger/github/trigger-description.html
@@ -4,16 +4,4 @@
   <a href="{{ trigger.repository_url }}" target="_new">
     {{ trigger.config.build_source }}
   </a>
-  <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
-    <div>
-      <span class="trigger-description-subtitle">Branches/Tags:</span>
-      <span ng-if="trigger.config.branchtag_regex">Matching Regular Expression {{ trigger.config.branchtag_regex }}</span>
-      <span ng-if="!trigger.config.branchtag_regex">(All Branches and Tags)</span>
-    </div>
-
-    <div>
-      <span class="trigger-description-subtitle">Dockerfile:</span>
-      <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span>
-    </div>
-  </div>
 </span>
\ No newline at end of file
diff --git a/static/directives/trigger/gitlab/trigger-description.html b/static/directives/trigger/gitlab/trigger-description.html
index 232b110ab..737bed214 100644
--- a/static/directives/trigger/gitlab/trigger-description.html
+++ b/static/directives/trigger/gitlab/trigger-description.html
@@ -4,16 +4,4 @@
   <a ng-href="{{ trigger.repository_url }}" target="_new">
     {{ trigger.config.build_source }}
   </a>
-  <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;" ng-if="!short">
-    <div>
-      <span class="trigger-description-subtitle">Branches/Tags:</span>
-      <span ng-if="trigger.config.branchtag_regex">Matching Regular Expression {{ trigger.config.branchtag_regex }}</span>
-      <span ng-if="!trigger.config.branchtag_regex">(All Branches and Tags)</span>
-    </div>
-
-    <div>
-      <span class="trigger-description-subtitle">Dockerfile:</span>
-      <span>{{ TriggerService.getDockerfileLocation(trigger) }}</span>
-    </div>
-  </div>
 </span>
diff --git a/static/directives/triggered-build-description.html b/static/directives/triggered-build-description.html
index 91fb6a23f..990413b69 100644
--- a/static/directives/triggered-build-description.html
+++ b/static/directives/triggered-build-description.html
@@ -13,7 +13,7 @@
     <!-- Source information only (i.e. no info) -->
     <div class="tbd-content" ng-switch-when="source">
       Triggered by
-      <div class="trigger-description" short="true" trigger="build.trigger"
+      <div class="trigger-description" trigger="build.trigger"
            style="display: inline-block; margin-left: 4px;"></div>
     </div>
 
diff --git a/static/js/directives/ui/trigger-description.js b/static/js/directives/ui/trigger-description.js
index f8ad3f630..df7135f16 100644
--- a/static/js/directives/ui/trigger-description.js
+++ b/static/js/directives/ui/trigger-description.js
@@ -10,10 +10,8 @@ angular.module('quay').directive('triggerDescription', function () {
     restrict: 'C',
     scope: {
       'trigger': '=trigger',
-      'short': '=short'
     },
     controller: function($scope, $element, KeyService, TriggerService) {
-      // TODO(jschorr): Clean up and remove the 'short' once we're on new layout.
       $scope.KeyService = KeyService;
       $scope.TriggerService = TriggerService;
       TriggerService.populateTemplate($scope, 'trigger-description');