vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix entering of docker file folders manually, and show the linked docker file in the build trigger view

Browse source
This commit is contained in:
Joseph Schorr 2014-02-25 00:19:38 -05:00
parent ef02e769fb
commit def56c971c
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/directives/resource-view.html
View file

@ -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>

7
static/directives/trigger-description.html
View file

@ -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

2
static/directives/trigger-setup-github.html
View file

@ -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>

5
static/js/app.js
View file

@ -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 || '';