Merge branch 'newbuildview'

This commit is contained in:
Joseph Schorr 2015-03-05 16:17:29 -05:00
commit 43ab838998
33 changed files with 1095 additions and 36 deletions

View file

@ -0,0 +1,18 @@
<div class="build-info-bar-element" ng-class="build.phase">
<!-- Phase icon/color -->
<span class="phase-icon" ng-class="build.phase"></span>
<!-- Side information -->
<div class="build-side-info">
<!-- Build ID -->
<div class="build-side-id">{{ build.id }}</div>
<!-- Timing -->
<div class="timing" ng-if="showTime">
<i class="fa fa-clock-o"></i><span am-time-ago="build.started || 0"></span>
</div>
</div>
<div class="triggered-build-description" build="build" ng-if="build.trigger"></div>
<div ng-if="!build.trigger">Manually Started Build</div>
</div>

View file

@ -0,0 +1,37 @@
<div class="build-logs-view-element" ng-class="useTimestamps ? 'with-timestamps' : ''">
<button id="copyButton" class="btn btn-primary copy-button" data-clipboard-text="{{ buildLogsText }}">
<i class="fa fa-clipboard"></i>Copy Logs
</button>
<span class="cor-loader" ng-if="!logEntries"></span>
<span class="no-logs" ng-if="!logEntries.length">(Waiting for build to start)</span>
<div class="log-container" ng-class="container.type" ng-repeat="container in logEntries">
<div class="container-header" ng-class="container.type == 'phase' ? container.message : ''"
ng-switch on="container.type" ng-click="container.logs.toggle()">
<i class="fa chevron"
ng-class="container.logs.isVisible ? 'fa-chevron-down' : 'fa-chevron-right'"
ng-show="hasLogs(container)"></i>
<div ng-switch-when="phase">
<span class="container-content build-log-phase" phase="container"></span>
</div>
<div ng-switch-when="error">
<span class="container-content build-log-error" error="container" entries="logEntries"></span>
</div>
<div ng-switch-when="command">
<span class="container-content build-log-command" command="container"></span>
</div>
</div>
<!-- Display the entries for the container -->
<div class="container-logs" ng-show="container.logs.isVisible">
<div class="log-entry" bindonce ng-repeat="entry in container.logs.visibleEntries">
<span class="id" bo-text="$index + container.index + 1" ng-if="!useTimestamps"></span>
<span class="id" bo-text="formatDatetime(entry.datetime)" ng-if="useTimestamps"></span>
<span class="message" bo-html="processANSI(entry.message, container)"></span>
<span class="timestamp" bo-text="formatDatetime(entry.datetime)" ng-if="!useTimestamps"></span>
</div>
</div>
</div>
</div>

View file

@ -1,5 +1,4 @@
<div class="logs-view-element">
<div class="header">
<span class="header-text">
<span ng-show="!performer">Usage Logs</span>

View file

@ -1,9 +1,9 @@
<div class="resource-view-element">
<div class="quay-spinner" ng-show="resource.loading"></div>
<div class="resource-error" ng-show="!resource.loading && resource.hasError">
<div class="cor-loader" ng-show="getState(resources) == 'loading'"></div>
<div class="resource-error alert alert-info" ng-show="getState(resources) == 'error'">
{{ errorMessage }}
</div>
<div class="resource-content" ng-class="(!resource.loading && !resource.hasError) ? 'visible' : ''">
<div class="resource-content" ng-class="getState(resources) == 'ready' ? 'visible' : ''">
<span ng-transclude></span>
</div>
</div>

View file

@ -0,0 +1,4 @@
<span class="source-commit-link-elememt">
<i class="fa fa-dot-circle-o" data-title="Commit" data-container="body" bs-tooltip></i>
<a ng-href="{{ getUrl(commitSha, urlTemplate) }}" target="_blank">{{ commitSha.substring(0, 8) }}</a>
</span>

View file

@ -0,0 +1,15 @@
<span class="source-ref-link-element">
<span ng-switch on="getKind(ref)">
<!-- Branch -->
<span ng-switch-when="heads">
<i class="fa fa-code-fork" data-container="body" data-title="Branch" bs-tooltip></i>
<a ng-href="{{ getUrl(ref, branchTemplate, 'branch') }}" target="_blank">{{ getTitle(ref) }}</a>
</span>
<!-- Tag -->
<span ng-switch-when="tags">
<i class="fa fa-tag" data-container="body" data-title="Tag" bs-tooltip></i>
<a ng-href="{{ getUrl(ref, tagTemplate, 'tag') }}" target="_blank">{{ getTitle(ref) }}</a>
</span>
</span>
</span>

View file

@ -0,0 +1,56 @@
<div class="triggered-build-description-element">
<span ng-switch on="build.trigger.service">
<!-- GitHub -->
<span ng-switch-when="github">
<!-- Full Commit Information -->
<span ng-if="build.job_config.trigger_metadata.commit_info">
<div class="commit-message">
<a ng-href="{{ getGitHubRepoURL(build) }}/commit/{{ build.job_config.trigger_metadata.commit_sha }}"
target="_blank">
{{ build.job_config.trigger_metadata.commit_info.message }}
</a>
</div>
<div class="commit-information">
<span class="commit-who-when">
Authored
<span am-time-ago="build.job_config.trigger_metadata.commit_info.date"></span>
<span class="commit-who">
<img ng-src="{{ build.job_config.trigger_metadata.commit_info.author.avatar_url }}">
<a ng-href="{{ build.job_config.trigger_metadata.commit_info.author.url }}"
target="_blank">
{{ build.job_config.trigger_metadata.commit_info.author.username }}
</a>
</span>
</span>
<span class="source-commit-link"
commit-sha="build.job_config.trigger_metadata.commit_sha"
url-template="getGitHubRepoURL(build) + '/commit/{sha}'"></span>
<span class="source-ref-link"
ref="build.job_config.trigger_metadata.ref"
branch-template="getGitHubRepoURL(build) + '/tree/{branch}'"
tag-template="getGitHubRepoURL(build) + '/releases/tag/{tag}'"></span>
</div>
</span>
<!-- Just commit SHA -->
<span ng-if="build.job_config.trigger_metadata && !build.job_config.trigger_metadata.commit_info">
Triggered by commit
<span class="source-commit-link"
commit-sha="build.job_config.trigger_metadata.commit_sha"
url-template="getGitHubRepoURL(build) + '/commit/{sha}'"></span>
</span>
<!-- No information -->
<span ng-if="!build.job_config.trigger_metadata">
Triggered by commit to
<i class="fa fa-github fa-lg" data-title="GitHub" bs-tooltip="tooltip.title"></i>
<a ng-href="{{ getGitHubRepoURL(build) }}" target="_new">
{{ build.trigger.config.build_source }}
</a>
</span>
</span>
<!-- Unknown -->
<span ng-switch-default></span>
</span>
</div>