rewrite markup for buildheader
fill in status icons
This commit is contained in:
Lisa P
parent
bdfd78c9f1
commit
f117c939dd
|
|
@ -30,7 +30,7 @@
|
|||
@import "app/modules/navigation";
|
||||
@import "app/modules/row";
|
||||
@import "app/modules/loader";
|
||||
@import "app/modules/tiles";
|
||||
// @import "app/modules/tiles";
|
||||
@import "app/modules/buttons";
|
||||
@import "app/modules/icons";
|
||||
@import "app/modules/search";
|
||||
|
|
@ -43,21 +43,22 @@
|
|||
@import "app/modules/memberlist";
|
||||
@import "app/modules/forms";
|
||||
@import "app/modules/notice";
|
||||
@import "app/modules/build-header";
|
||||
|
||||
@import "app/layout";
|
||||
@import "app/layouts/dashboard";
|
||||
@import "app/layouts/error";
|
||||
@import "app/layouts/footer";
|
||||
@import "app/layouts/buildheader";
|
||||
@import "app/layouts/build-job";
|
||||
// @import "app/layouts/buildheader";
|
||||
// @import "app/layouts/build-job";
|
||||
@import "app/layouts/sidebar";
|
||||
@import "app/layouts/build-job";
|
||||
@import "app/layouts/sidebar";
|
||||
@import "app/layouts/profile";
|
||||
@import "app/layouts/top";
|
||||
@import "app/layouts/owner";
|
||||
@import "app/layouts/branches";
|
||||
@import "app/layouts/broadcasts";
|
||||
@import "app/layouts/repo";
|
||||
|
||||
@import "app/layouts/requests";
|
||||
@import "app/layouts/caches";
|
||||
|
|
|
|||
0
app/styles/app/layouts/repo.sass
Normal file
0
app/styles/app/layouts/repo.sass
Normal file
0
app/styles/app/modules/build-header.sass
Normal file
0
app/styles/app/modules/build-header.sass
Normal file
|
|
@ -1,73 +1,68 @@
|
|||
{{#if loading}}
|
||||
{{loading-indicator}}
|
||||
{{else}}
|
||||
<section class="tile tile--pass row {{build.state}}">
|
||||
<div class="tile-status">
|
||||
<span class="icon icon-status {{build.state}}" title={{build.state}}></span>
|
||||
<span class="request-kind {{build.eventType}} icon" title={{build.eventType}}></span>
|
||||
</div>
|
||||
|
||||
<div class="tile-main medium-8 columns">
|
||||
<h2 class="repo-main-commit">
|
||||
{{#if build.pullRequest}}
|
||||
<small class="repo-main-branch" title={{build.pullRequestTitle}}>Pull Request #{{build.pullRequestNumber}}</small>
|
||||
{{build.pullRequestTitle}}
|
||||
{{else}}
|
||||
<small class="repo-main-branch" title={{build.commit.branch}}>{{build.commit.branch}}</small>
|
||||
{{format-message build.commit.subject repo=build.repo}}
|
||||
{{/if}}
|
||||
</h2>
|
||||
<div class="repo-main-description">
|
||||
<section class="build-header {{build.state}}">
|
||||
<div class="build-commit">
|
||||
<h2 class="build-title {{build.state}}">
|
||||
{{status-icon status=build.state}}
|
||||
{{#if build.pullRequest}}
|
||||
<p>{{format-message build.commit.subject repo=build.repo}}</p>
|
||||
<small class="commit-branch" title={{build.pullRequestTitle}}>Pull Request #{{build.pullRequestNumber}}</small>
|
||||
{{build.pullRequestTitle}}
|
||||
{{else}}
|
||||
<small class="commit-branch" title={{build.commit.branch}}>{{build.commit.branch}}</small>
|
||||
{{format-message build.commit.subject repo=build.repo}}
|
||||
{{/if}}
|
||||
<pre class="body">{{format-message build.commit.body repo=build.repo pre=true}}</pre>
|
||||
</div>
|
||||
<div class="tile-author">
|
||||
{{#if commit.authorName}}
|
||||
<img src={{urlAuthorGravatarImage}}>{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}
|
||||
{{/if}}
|
||||
{{#unless commit.authorIsCommitter}}
|
||||
{{#if commit.committerName}}
|
||||
<img src={{urlCommitterGravatarImage}}>{{commit.committerName}} committed
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
</h2>
|
||||
<div class="commit-info">
|
||||
<p class="commit-description">
|
||||
{{#if build.pullRequest}}
|
||||
{{format-message build.commit.subject repo=build.repo}}<br>
|
||||
{{/if}}
|
||||
<span class="monospace">{{format-message build.commit.body repo=build.repo pre=true}}</span>
|
||||
</p>
|
||||
<ul class="list-icon">
|
||||
<li>
|
||||
<a class="commit-commit" href={{urlGithubCommit}}>
|
||||
Commit {{format-sha commit.sha}}</a>
|
||||
</li>
|
||||
<li>
|
||||
{{#if build.pullRequest}}
|
||||
<a class="commit-compare" title="See the commit on GitHub" href={{build.commit.compareUrl}}>#{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a>
|
||||
{{else}}
|
||||
{{#if build.commit.compareUrl}}
|
||||
<a class="commit-compare" title="See the diff on GitHub" href={{build.commit.compareUrl}}>
|
||||
Compare {{short-compare-shas build.commit.compareUrl}}</a>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</li>
|
||||
</ul>
|
||||
<p class="commit-author">
|
||||
{{#if commit.authorName}}
|
||||
<img src={{urlAuthorGravatarImage}}>{{commit.authorName}} authored{{#if commit.authorIsCommitter}} and committed{{/if}}
|
||||
{{/if}}
|
||||
{{#unless commit.authorIsCommitter}}
|
||||
{{#if commit.committerName}}
|
||||
<img src={{urlCommitterGravatarImage}}>{{commit.committerName}} committed
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tile-additional medium-4 columns end">
|
||||
<ul class="repo-main-info">
|
||||
<li class="repo-build-status">{{#link-to "build" repo build}}
|
||||
<span class="icon icon--hash"></span>
|
||||
{{build.number}} {{humanize-state build.state}}{{/link-to}}
|
||||
</li>
|
||||
<li>
|
||||
<a class="commit" href={{urlGithubCommit}}>
|
||||
<span class="icon icon--github"></span>
|
||||
Commit {{format-sha commit.sha}}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
{{#if build.pullRequest}}
|
||||
<a class="compare" href={{build.commit.compareUrl}}><span class="icon icon--github"></span> #{{build.pullRequestNumber}}: {{build.pullRequestTitle}}</a>
|
||||
{{else}}
|
||||
{{#if build.commit.compareUrl}}
|
||||
<a class="compare" href={{build.commit.compareUrl}}>
|
||||
<span class="icon icon--github"></span>
|
||||
Compare {{short-compare-shas build.commit.compareUrl}}</a>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</li>
|
||||
<li title="{{format-duration build.duration}}">
|
||||
<span class="icon icon--clock"></span>
|
||||
{{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}}
|
||||
</li>
|
||||
<li title="{{pretty-date build.finishedAt}}">
|
||||
<span class="icon icon--cal"></span>
|
||||
{{format-time build.finishedAt}}
|
||||
</li>
|
||||
<div class="build-info">
|
||||
<h3 class="build-status {{build.state}}">
|
||||
{{#link-to "build" repo build}}
|
||||
{{status-icon status=build.state}} #{{build.number}} {{humanize-state build.state}}{{/link-to}}
|
||||
</h3>
|
||||
<ul class="list-icon">
|
||||
<li><span title="{{format-duration build.duration}}" class="commit-clock">{{#if build.isFinished}}ran{{else}}running{{/if}} for {{format-duration build.duration}}</span></li>
|
||||
{{!-- <li><span>Elapsed time</span></li> --}}
|
||||
<li><span title="{{pretty-date build.finishedAt}}" class="commit-calendar">{{format-time build.finishedAt}}</span></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="build-tools">
|
||||
{{repo-actions build=build repo=build.repo user=auth.currentUser}}
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user