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

Merge pull request #2781 from alecmerdler/QUAY-734

Browse source 
Manual Build Trigger UI Fix
This commit is contained in:
Alec Merdler 2017-07-14 14:01:27 -04:00 • committed by GitHub
commit 6f1e8ae9b2
10 changed files with 70 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/directives/dockerfile-build-dialog.html
View file

@ -1,7 +1,7 @@
<div class="dockerfile-build-dialog-element">
<!-- Modal message dialog -->
<div class="modal fade dockerfilebuildModal">
<div class="co-dialog modal-dialog">
<div class="co-dialog modal-dialog modal-lg">
<div class="modal-content" ng-show="triggersResource && triggersResource.loading">
<div class="cor-loader"></div>
</div>
@ -38,12 +38,14 @@
<thead>
<tr>
<td>Trigger Description</td>
<td>Branches/Tags</td>
<td></td>
</tr>
</thead>
<tbody>
<tr ng-repeat="trigger in triggers">
<td><span class="trigger-description" trigger="trigger"></span></td>
<td><trigger-description trigger="trigger"></trigger-description></td>
<td>{{ trigger.config.branchtag_regex || 'All' }}</td>
<td>
<a href="javascript:void(0)" ng-click="runTriggerNow(trigger)"
ng-if="trigger.can_invoke">Run Trigger Now</a>

2
static/directives/manual-trigger-build-dialog.html
View file

@ -7,7 +7,7 @@
<h4 class="modal-title">Manually Start Build Trigger</h4>
</div>
<div class="modal-body">
<div class="trigger-description" trigger="trigger"></div>
<trigger-description trigger="trigger"></trigger-description>
<form name="runForm" id="runForm">
<table width="100%">

2
static/directives/repo-view/repo-panel-builds.html
View file

@ -138,7 +138,7 @@
</tr>
<tr ng-repeat="trigger in triggers | filter:{'is_active':true}">
<td><div class="trigger-description" trigger="trigger"></div></td>
<td><trigger-description trigger="trigger"></trigger-description></td>
<td>{{ trigger.config.dockerfile_path || '/Dockerfile' }}</td>
<td>{{ trigger.config.context || '/' }}</td>
<td>{{ trigger.config.branchtag_regex || 'All' }}</td>

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

@ -1,3 +0,0 @@
<span class="trigger-description-element" ng-switch on="trigger.service">
<span ng-include="triggerTemplate" ng-if="triggerTemplate"></span>
</span>

4
static/directives/triggered-build-description.html
View file

@ -13,8 +13,8 @@
<!-- Source information only (i.e. no info) -->
<div class="tbd-content" ng-switch-when="source">
Triggered by
<div class="trigger-description" trigger="build.trigger"
style="display: inline-block; margin-left: 4px;"></div>
<trigger-description trigger="build.trigger"
style="display: inline-block; margin-left: 4px;"></trigger-description>
</div>
<!-- Just commit SHA -->