parent
d6cb7334d3
commit
f0f864a375
3 changed files with 54 additions and 1 deletions
|
@ -51,3 +51,21 @@
|
||||||
.triggered-build-description-element .fa-user {
|
.triggered-build-description-element .fa-user {
|
||||||
margin-right: 4px;
|
margin-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.triggered-build-description-element .long-commit-description {
|
||||||
|
margin-top: 10px;
|
||||||
|
font-size: 13px;
|
||||||
|
white-space: pre;
|
||||||
|
font-family: Consolas, "Lucida Console", Monaco, monospace;
|
||||||
|
border-left: 1px solid #eee;
|
||||||
|
padding-left: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggered-build-description-element .long-description-toggle {
|
||||||
|
padding: 2px;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.triggered-build-description-element .long-description-toggle:hover {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
|
@ -29,7 +29,12 @@
|
||||||
<div class="commit-message">
|
<div class="commit-message">
|
||||||
<span class="anchor" is-only-text="!TriggerService.getFullLinkTemplate(build, 'commit')"
|
<span class="anchor" is-only-text="!TriggerService.getFullLinkTemplate(build, 'commit')"
|
||||||
target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', TriggerService.getCommitSHA(build.trigger_metadata)) }}">
|
target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', TriggerService.getCommitSHA(build.trigger_metadata)) }}">
|
||||||
{{ build.trigger_metadata.commit_info.message }}
|
{{ getMessageSummary(build.trigger_metadata.commit_info.message) }}
|
||||||
|
</span>
|
||||||
|
<span class="long-description-toggle"
|
||||||
|
ng-if="hasLongDescription(build.trigger_metadata.commit_info.message)"
|
||||||
|
ng-click="toggleLongDescription()">
|
||||||
|
...
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="commit-information">
|
<div class="commit-information">
|
||||||
|
@ -54,5 +59,6 @@
|
||||||
tag-template="TriggerService.getFullLinkTemplate(build, 'tag')"></span>
|
tag-template="TriggerService.getFullLinkTemplate(build, 'tag')"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="long-commit-description" ng-if="showLongDescription">{{ getMessageLongDescription(build.trigger_metadata.commit_info.message) }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -13,6 +13,35 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
|
||||||
},
|
},
|
||||||
controller: function($scope, $element, KeyService, TriggerService) {
|
controller: function($scope, $element, KeyService, TriggerService) {
|
||||||
$scope.TriggerService = TriggerService;
|
$scope.TriggerService = TriggerService;
|
||||||
|
$scope.showLongDescription = false;
|
||||||
|
|
||||||
|
$scope.toggleLongDescription = function() {
|
||||||
|
$scope.showLongDescription = !$scope.showLongDescription;
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.hasLongDescription = function(message) {
|
||||||
|
if (!message) { return ''; }
|
||||||
|
return message.length >= 80 || message.split('\n').length > 1;
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.getMessageSummary = function(message) {
|
||||||
|
if (!message) { return ''; }
|
||||||
|
var lines = message.split('\n');
|
||||||
|
return lines[0].substring(0, 79).trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.getMessageLongDescription = function(message) {
|
||||||
|
if (!message) { return ''; }
|
||||||
|
var lines = message.split('\n');
|
||||||
|
if (lines[0].length >= 80) {
|
||||||
|
lines[0] = lines[0].substring(80);
|
||||||
|
} else {
|
||||||
|
lines.splice(0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return lines.join('\n').trim();
|
||||||
|
};
|
||||||
|
|
||||||
$scope.$watch('build', function(build) {
|
$scope.$watch('build', function(build) {
|
||||||
if (!build) { return; }
|
if (!build) { return; }
|
||||||
|
|
||||||
|
|
Reference in a new issue