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

Remove long build descriptions (not properly used in the new UI)

Browse source
This commit is contained in:
Joseph Schorr 2015-06-29 12:36:39 +03:00
parent ff3d8bb013
commit 3342f2392d
7 changed files with 2 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

12
static/directives/trigger/bitbucket/trigger-description.html
View file

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

6
static/directives/trigger/custom-git/trigger-description.html
View file

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

12
static/directives/trigger/github/trigger-description.html
View file

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

12
static/directives/trigger/gitlab/trigger-description.html
View file

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

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

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

2
static/js/directives/ui/trigger-description.js
View file

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