From c0917d212800ec5704cf8378637c417e22df82f1 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Tue, 6 Oct 2015 21:40:44 +0200 Subject: [PATCH 1/6] rearrange job filtering in sidebar --- app/controllers/repos.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/repos.coffee b/app/controllers/repos.coffee index 41565100..66562125 100644 --- a/app/controllers/repos.coffee +++ b/app/controllers/repos.coffee @@ -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 => From a9c39ceab6c5d9cfe73e64356f6036c57c5e4648 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 7 Oct 2015 15:28:06 +0200 Subject: [PATCH 2/6] update icons for running builds in sidebar --- app/styles/app/layouts/sidebar.sass | 1 - app/templates/components/queued-jobs.hbs | 30 +++++++++++++--- app/templates/components/running-jobs.hbs | 43 ++++++++++++++++++----- 3 files changed, 60 insertions(+), 14 deletions(-) diff --git a/app/styles/app/layouts/sidebar.sass b/app/styles/app/layouts/sidebar.sass index 1b77a76e..1e133d45 100644 --- a/app/styles/app/layouts/sidebar.sass +++ b/app/styles/app/layouts/sidebar.sass @@ -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 diff --git a/app/templates/components/queued-jobs.hbs b/app/templates/components/queued-jobs.hbs index 27b545e3..b4d4bf10 100644 --- a/app/templates/components/queued-jobs.hbs +++ b/app/templates/components/queued-jobs.hbs @@ -3,19 +3,41 @@ {{#each jobs as |job|}}
{{#if job.repo.slug}} - + {{status-icon status=job.state}} {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}}

- + + + + + {{#if job.repo.slug}} - {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}} + {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}} {{/if}}

- Queued + + + + + + + + + Queued

diff --git a/app/templates/components/running-jobs.hbs b/app/templates/components/running-jobs.hbs index a1a45fc2..96f7feaf 100644 --- a/app/templates/components/running-jobs.hbs +++ b/app/templates/components/running-jobs.hbs @@ -3,23 +3,48 @@ {{#each jobs as |job| }}
{{#if job.repo.slug}} - - {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} + {{status-icon status=job.state}} + {{#link-to "job" job.repo job}} + {{job.repo.slug}} + {{/link-to}} {{/if}}

- + + + + + {{#if job.repo.slug}} - {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}} + {{#link-to "job" job.repo job}}{{job.number}}{{/link-to}} {{/if}}

- - Duration: - - {{format-duration job.duration}} - + + + + + + + + + + Duration: + + {{format-duration job.duration}} + +

From 4da602c63213cf99a81915bf62ba34403ee2a6ea Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 7 Oct 2015 17:29:17 +0200 Subject: [PATCH 3/6] fix build tile links --- app/templates/components/build-tile.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/build-tile.hbs b/app/templates/components/build-tile.hbs index acd6fbdd..2aec28ff 100644 --- a/app/templates/components/build-tile.hbs +++ b/app/templates/components/build-tile.hbs @@ -1,5 +1,5 @@ {{#if build.number}} - {{#link-to "build" build.repository.slug build.id}} + {{#link-to "build" build.repository build.id}} {{status-icon status=build.state}} {{build.last_build.state}} From b7215bbeaf57082b4de8eb1c0011a0200069f4b9 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 7 Oct 2015 17:34:09 +0200 Subject: [PATCH 4/6] fix sync button trigger icon on profile page --- app/templates/account.hbs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/templates/account.hbs b/app/templates/account.hbs index abfc6c97..58e90143 100644 --- a/app/templates/account.hbs +++ b/app/templates/account.hbs @@ -34,7 +34,16 @@ {{else}}

last synced {{format-time user.syncedAt}}

From 24032d4040807798f17aa136756dab6221b69f67 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 7 Oct 2015 17:37:53 +0200 Subject: [PATCH 5/6] fix status coloring on owner page --- app/templates/components/owner-repo-tile.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs index f47ab4b7..e9163958 100644 --- a/app/templates/components/owner-repo-tile.hbs +++ b/app/templates/components/owner-repo-tile.hbs @@ -12,7 +12,7 @@ {{#if repo.default_branch.last_build}} -
+
{{#link-to "build" ownerName repoName repo.default_branch.last_build.id}} From 1d71f943ca1c2df9921a060070cffc03315a9244 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Wed, 7 Oct 2015 18:01:31 +0200 Subject: [PATCH 6/6] really fix build tile links --- app/templates/components/build-tile.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/build-tile.hbs b/app/templates/components/build-tile.hbs index 2aec28ff..89839608 100644 --- a/app/templates/components/build-tile.hbs +++ b/app/templates/components/build-tile.hbs @@ -1,5 +1,5 @@ {{#if build.number}} - {{#link-to "build" build.repository build.id}} + {{#link-to "build" build.id}} {{status-icon status=build.state}} {{build.last_build.state}}