From def56c971c9217cb97a5a4035599c9de39ff7e4d Mon Sep 17 00:00:00 2001
From: Joseph Schorr <jschorr@gmail.com>
Date: Tue, 25 Feb 2014 00:19:38 -0500
Subject: [PATCH] Fix entering of docker file folders manually, and show the
 linked docker file in the build trigger view

---
 static/directives/resource-view.html        | 4 +---
 static/directives/trigger-description.html  | 7 +++++++
 static/directives/trigger-setup-github.html | 2 +-
 static/js/app.js                            | 5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/static/directives/resource-view.html b/static/directives/resource-view.html
index 7763fa52a..0952bf2f4 100644
--- a/static/directives/resource-view.html
+++ b/static/directives/resource-view.html
@@ -1,7 +1,5 @@
 <div class="resource-view-element">
-  <div class="resource-spinner" ng-class="resource.loading ? 'visible' : ''">
-    <div class="small-spinner"></div>
-  </div>
+  <div class="quay-spinner" ng-show="resource.loading"></div>
   <div class="resource-error" ng-show="!resource.loading && resource.hasError">
     {{ errorMessage }}
   </div>
diff --git a/static/directives/trigger-description.html b/static/directives/trigger-description.html
index 11f48e57d..d56a52b9b 100644
--- a/static/directives/trigger-description.html
+++ b/static/directives/trigger-description.html
@@ -2,6 +2,13 @@
   <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>
+    <div style="margin-top: 4px; margin-left: 26px; font-size: 12px; color: gray;">
+    <span ng-if="trigger.config.subdir">Dockerfile:
+      <a href="https://github.com/{{ trigger.config.build_source }}/tree/master/{{ trigger.config.subdir }}/Dockerfile" target="_blank">
+        //{{ trigger.config.subdir }}/Dockerfile
+      </a>
+    </span>
+    </div>
   </span>
   <span ng-switch-default>
     Unknown
diff --git a/static/directives/trigger-setup-github.html b/static/directives/trigger-setup-github.html
index d7c4b73f2..46c6a29f5 100644
--- a/static/directives/trigger-setup-github.html
+++ b/static/directives/trigger-setup-github.html
@@ -29,7 +29,7 @@
     <div class="slideinout" ng-show="currentRepo">
       <div style="margin-top: 10px">Dockerfile Location:</div>
       <div class="dropdown-select" placeholder="'(Repository Root)'" selected-item="currentLocation"
-           lookahead-items="locations">
+           lookahead-items="locations" handle-input="handleLocationInput(input)">
         <!-- Icons -->
         <i class="dropdown-select-icon none-icon fa fa-folder-o fa-lg"></i>
         <i class="dropdown-select-icon fa fa-folder fa-lg"></i>
diff --git a/static/js/app.js b/static/js/app.js
index 56c57780d..a830e570e 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2553,7 +2553,6 @@ quayApp.directive('dropdownSelect', function ($compile) {
     restrict: 'C',
     scope: {
       'selectedItem': '=selectedItem',
-      'enteredText': '=enteredText',
       'placeholder': '=placeholder',
       'lookaheadItems': '=lookaheadItems',
       'handleItemSelected': '&handleItemSelected',
@@ -2692,6 +2691,10 @@ quayApp.directive('triggerSetupGithub', function () {
       $scope.setupReady = false;
       $scope.loading = true;
            
+      $scope.handleLocationInput = function(location) {
+        $scope.trigger['config']['subdir'] = location || '';
+      };
+
       $scope.setLocation = function(location) {
         $scope.currentLocation = location;
         $scope.trigger['config']['subdir'] = location || '';