Remove long build descriptions (not properly used in the new UI)
This commit is contained in:
parent
ff3d8bb013
commit
3342f2392d
7 changed files with 2 additions and 46 deletions
|
@ -133,7 +133,7 @@
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr ng-repeat="trigger in triggers | filter:{'is_active':true}">
|
<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.subdir || '/' }}</td>
|
||||||
<td>{{ trigger.config.branchtag_regex || 'All' }}</td>
|
<td>{{ trigger.config.branchtag_regex || 'All' }}</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
|
@ -4,16 +4,4 @@
|
||||||
<a href="{{ trigger.repository_url }}" target="_new">
|
<a href="{{ trigger.repository_url }}" target="_new">
|
||||||
{{ trigger.config.build_source }}
|
{{ trigger.config.build_source }}
|
||||||
</a>
|
</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>
|
</span>
|
|
@ -1,10 +1,4 @@
|
||||||
<span>
|
<span>
|
||||||
<i class="fa fa-git-square fa-lg" style="margin-right: 6px;" data-title="git" bs-tooltip="tooltip.title"></i>
|
<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 }}
|
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>
|
</span>
|
|
@ -4,16 +4,4 @@
|
||||||
<a href="{{ trigger.repository_url }}" target="_new">
|
<a href="{{ trigger.repository_url }}" target="_new">
|
||||||
{{ trigger.config.build_source }}
|
{{ trigger.config.build_source }}
|
||||||
</a>
|
</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>
|
</span>
|
|
@ -4,16 +4,4 @@
|
||||||
<a ng-href="{{ trigger.repository_url }}" target="_new">
|
<a ng-href="{{ trigger.repository_url }}" target="_new">
|
||||||
{{ trigger.config.build_source }}
|
{{ trigger.config.build_source }}
|
||||||
</a>
|
</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>
|
</span>
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<!-- Source information only (i.e. no info) -->
|
<!-- Source information only (i.e. no info) -->
|
||||||
<div class="tbd-content" ng-switch-when="source">
|
<div class="tbd-content" ng-switch-when="source">
|
||||||
Triggered by
|
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>
|
style="display: inline-block; margin-left: 4px;"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -10,10 +10,8 @@ angular.module('quay').directive('triggerDescription', function () {
|
||||||
restrict: 'C',
|
restrict: 'C',
|
||||||
scope: {
|
scope: {
|
||||||
'trigger': '=trigger',
|
'trigger': '=trigger',
|
||||||
'short': '=short'
|
|
||||||
},
|
},
|
||||||
controller: function($scope, $element, KeyService, TriggerService) {
|
controller: function($scope, $element, KeyService, TriggerService) {
|
||||||
// TODO(jschorr): Clean up and remove the 'short' once we're on new layout.
|
|
||||||
$scope.KeyService = KeyService;
|
$scope.KeyService = KeyService;
|
||||||
$scope.TriggerService = TriggerService;
|
$scope.TriggerService = TriggerService;
|
||||||
TriggerService.populateTemplate($scope, 'trigger-description');
|
TriggerService.populateTemplate($scope, 'trigger-description');
|
||||||
|
|
Reference in a new issue