suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-404

Browse Source
This commit is contained in:
Lisa P 2015-10-07 19:07:06 +02:00
commit e646edbc0e
7 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repos.coffee
View File

@ -53,7 +53,7 @@ Controller = Ember.Controller.extend
runningJobs: (->
# TODO: this should also query for received jobs
result = @store.filter('job', {}, (job) ->
['started', 'received'].indexOf(job.get('state')) != -1
['queued', 'started', 'received'].indexOf(job.get('state')) != -1
)
result.set('isLoaded', false)
result.then =>
@ -63,7 +63,7 @@ Controller = Ember.Controller.extend
queuedJobs: (->
result = @get('store').filter('job', {}, (job) ->
['created', 'queued'].indexOf(job.get('state')) != -1
['created'].indexOf(job.get('state')) != -1
)
result.set('isLoaded', false)
result.then =>

1
app/styles/app/layouts/sidebar.sass
View File

@ -38,7 +38,6 @@ $sb-font-size: 14px
.icon
width: 1.3em
height: 1.4em
margin-right: .1em
.tabnav--sidebar
font-size: $sb-font-size

11
app/templates/account.hbs
View File

@ -34,7 +34,16 @@
{{else}}
<div class="sync-button">
<button {{action 'sync'}} class="button">
<span class="icon icon-sync"></span>Sync
<span class="icon">
<svg x="0px" y="0px" viewBox="1 1 17 17" xml:space="preserve">
<g id="Trigger">
<path fill="#A7AEAE" d="M17.2,7.9C17,7.6,16.6,7.7,16.3,8l-1,1.2C14.9,6,12.2,3.6,9,3.6c-3.6,0-6.4,2.9-6.4,6.4s2.9,6.4,6.4,6.4
c1.8,0,3.6-0.8,4.8-2.2c0.2-0.3,0.2-0.7-0.1-0.9c-0.3-0.2-0.7-0.2-0.9,0.1c-1,1.1-2.4,1.7-3.9,1.7c-2.8,0-5.1-2.3-5.1-5.1
S6.1,4.9,9,4.9c2.7,0,4.9,2.1,5.1,4.7l-1.7-1.1c-0.3-0.2-0.7-0.1-0.9,0.2s-0.1,0.7,0.2,0.9l2.8,1.8c0,0,0,0,0,0
c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.3-0.1c0,0,0.1,0,0.1-0.1c0,0,0.1-0.1,0.1-0.1l2-2.4C17.6,8.5,17.5,8.1,17.2,7.9z"/>
</g>
</svg>
</span>Sync
</button>
<p class="sync-last">last synced {{format-time user.syncedAt}}</p>
</div>

2
app/templates/components/build-tile.hbs
View File

@ -1,5 +1,5 @@
{{#if build.number}}
{{#link-to "build" build.repository.slug build.id}}
{{#link-to "build" build.id}}
{{status-icon status=build.state}}
{{build.last_build.state}}

2
app/templates/components/owner-repo-tile.hbs
View File

@ -12,7 +12,7 @@
</div>
</div>
{{#if repo.default_branch.last_build}}
<div class="row-item">
<div class="row-item row-color">
<div class="one-line">
{{#link-to "build" ownerName repoName repo.default_branch.last_build.id}}
<span class="icon">

30
app/templates/components/queued-jobs.hbs
View File

@ -3,19 +3,41 @@
{{#each jobs as |job|}}
<div class="tile tile--sidebar {{job.state}}">
{{#if job.repo.slug}}
<span class="icon icon--job {{job.state}}"></span>
{{status-icon status=job.state}}
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{/if}}
<p class="tile-title float-right">
<span class="icon icon--hash"></span>
<span class="icon">
<svg version="1.1" id="Layer_1" x="0px" y="0px"
viewBox="-289 191 20 20" style="enable-background:new -289 191 20 20;" xml:space="preserve">
<path fill="#A5ACAD" class="st0" d="M-272.4,198.4C-272.4,198.4-272.4,198.4-272.4,198.4l-3.4,0l0.3-3.3c0-0.3-0.2-0.6-0.5-0.6
c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.4l-3.2,0l0.3-3.6c0-0.3-0.2-0.6-0.5-0.6c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.7l-3.2,0
c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5c0,0,0,0,0,0l3.1,0l-0.2,2.9l-3.5,0c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5
c0,0,0,0,0,0l3.4,0l-0.3,3.3c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.4l3.2,0l-0.3,3.6
c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.7l3.2,0c0.3,0,0.5-0.2,0.5-0.6c0-0.3-0.2-0.5-0.5-0.5c0,0,0,0,0,0
l-3.1,0l0.2-2.9l3.5,0c0.3,0,0.5-0.2,0.5-0.6C-271.8,198.7-272.1,198.4-272.4,198.4z M-277.2,202.4l-3.2,0l0.2-2.9l3.2,0
L-277.2,202.4z"/>
</svg>
</span>
{{#if job.repo.slug}}
{{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
{{#link-to "job" job.repo job}}<span class="label-align">{{job.number}}</span>{{/link-to}}
{{/if}}
</p>
<p>
<span class="icon icon--clock"></span> Queued
<span class="icon">
<svg version="1.1" id="Layer_1" x="0px" y="0px"
viewBox="-289 191 20 20" style="enable-background:new -289 191 20 20;" xml:space="preserve">
<g>
<path fill="#A5ACAD" class="st0" d="M-278.9,207.7c-3.7,0-6.7-3-6.7-6.7s3-6.7,6.7-6.7s6.7,3,6.7,6.7S-275.2,207.7-278.9,207.7z M-278.9,195.4
c-3.1,0-5.6,2.5-5.6,5.6s2.5,5.6,5.6,5.6c3.1,0,5.6-2.5,5.6-5.6S-275.8,195.4-278.9,195.4z"/>
<path fill="#A5ACAD" class="st0" d="M-276.7,203.1c-0.1,0-0.2,0-0.3-0.1l-2.4-1.5c-0.2-0.1-0.2-0.3-0.2-0.4v-3.8c0-0.3,0.2-0.5,0.5-0.5
s0.5,0.2,0.5,0.5v3.5l2.1,1.4c0.2,0.2,0.3,0.5,0.2,0.7C-276.4,203-276.5,203.1-276.7,203.1z"/>
</g>
</svg>
</span>
<span class="label-align">Queued</span>
</p>
</div>

43
app/templates/components/running-jobs.hbs
View File

@ -3,23 +3,48 @@
{{#each jobs as |job| }}
<div class="tile tile--sidebar {{job.state}}">
{{#if job.repo.slug}}
<span class="icon icon--job {{job.state}}"></span>
{{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}}
{{status-icon status=job.state}}
{{#link-to "job" job.repo job}}
<span class="label-align">{{job.repo.slug}}</span>
{{/link-to}}
{{/if}}
<p class="tile-title float-right">
<span class="icon icon--hash"></span>
<span class="icon">
<svg version="1.1" id="Layer_1" x="0px" y="0px"
viewBox="-289 191 20 20" style="enable-background:new -289 191 20 20;" xml:space="preserve">
<path fill="#A5ACAD" class="st0" d="M-272.4,198.4C-272.4,198.4-272.4,198.4-272.4,198.4l-3.4,0l0.3-3.3c0-0.3-0.2-0.6-0.5-0.6
c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.4l-3.2,0l0.3-3.6c0-0.3-0.2-0.6-0.5-0.6c-0.3,0-0.6,0.2-0.6,0.5l-0.3,3.7l-3.2,0
c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5c0,0,0,0,0,0l3.1,0l-0.2,2.9l-3.5,0c-0.3,0-0.5,0.2-0.5,0.6c0,0.3,0.2,0.5,0.5,0.5
c0,0,0,0,0,0l3.4,0l-0.3,3.3c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.4l3.2,0l-0.3,3.6
c0,0.3,0.2,0.6,0.5,0.6c0,0,0,0,0,0c0.3,0,0.5-0.2,0.5-0.5l0.3-3.7l3.2,0c0.3,0,0.5-0.2,0.5-0.6c0-0.3-0.2-0.5-0.5-0.5c0,0,0,0,0,0
l-3.1,0l0.2-2.9l3.5,0c0.3,0,0.5-0.2,0.5-0.6C-271.8,198.7-272.1,198.4-272.4,198.4z M-277.2,202.4l-3.2,0l0.2-2.9l3.2,0
L-277.2,202.4z"/>
</svg>
</span>
{{#if job.repo.slug}}
{{#link-to "job" job.repo job}}{{job.number}}{{/link-to}}
{{#link-to "job" job.repo job}}<span class="label-align">{{job.number}}</span>{{/link-to}}
{{/if}}
</p>
<p>
<span class="icon icon--clock"></span>
Duration:
<abbr class="duration" title={{job.startedAt}}>
{{format-duration job.duration}}
</abbr>
<span class="icon">
<svg version="1.1" id="Layer_1" x="0px" y="0px"
viewBox="-289 191 20 20" style="enable-background:new -289 191 20 20;" xml:space="preserve">
<g>
<path fill="#A5ACAD" class="st0" d="M-278.9,207.7c-3.7,0-6.7-3-6.7-6.7s3-6.7,6.7-6.7s6.7,3,6.7,6.7S-275.2,207.7-278.9,207.7z M-278.9,195.4
c-3.1,0-5.6,2.5-5.6,5.6s2.5,5.6,5.6,5.6c3.1,0,5.6-2.5,5.6-5.6S-275.8,195.4-278.9,195.4z"/>
<path fill="#A5ACAD" class="st0" d="M-276.7,203.1c-0.1,0-0.2,0-0.3-0.1l-2.4-1.5c-0.2-0.1-0.2-0.3-0.2-0.4v-3.8c0-0.3,0.2-0.5,0.5-0.5
s0.5,0.2,0.5,0.5v3.5l2.1,1.4c0.2,0.2,0.3,0.5,0.2,0.7C-276.4,203-276.5,203.1-276.7,203.1z"/>
</g>
</svg>
</span>
<span class="label-align">
Duration:
<abbr class="duration" title={{job.startedAt}}>
{{format-duration job.duration}}
</abbr>
</span>
</p>
</div>