From 02a1f166d5c8091792a4f8eaf3244f2f57644e69 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 7 Oct 2012 13:55:57 +0200 Subject: [PATCH] change tools button to have a menu, add requeue menu item, make status image stuff a popup --- Gemfile.lock | 4 +- assets/images/ui/close.png | Bin 0 -> 1173 bytes assets/scripts/app/models/build.coffee | 10 +- assets/scripts/app/models/user.coffee | 2 +- assets/scripts/app/templates/jobs/list.hbs | 1 + .../app/templates/repos/show/tools.hbs | 66 +- assets/scripts/app/views.coffee | 6 + assets/scripts/app/views/repo/show.coffee | 30 +- assets/styles/_mixins/colors.sass | 2 + assets/styles/app/popup.sass | 28 + assets/styles/main/repository.sass | 3 +- assets/styles/main/tools.sass | 35 +- lib/travis/assets/filters.rb | 1 + public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/styles/app.css | 1571 +++++++++-------- public/version | 2 +- 17 files changed, 939 insertions(+), 826 deletions(-) create mode 100644 assets/images/ui/close.png diff --git a/Gemfile.lock b/Gemfile.lock index 5055ddda..5c8eae9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 8abc3309372e8a9c4e3506cbf45362c49e91b24d + revision: 2b290b9571db627cd796b4d11d5c6153b8d649c1 specs: travis-api (0.0.1) backports (~> 2.5) @@ -61,7 +61,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 94dbbf2fea57b56383e26152ae3a4cece02d2df0 + revision: 05ea6a6696b3be32839afcaa126afaf3f2522536 branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/images/ui/close.png b/assets/images/ui/close.png new file mode 100644 index 0000000000000000000000000000000000000000..40d1f626e2493668459ff109b45d031328c4229d GIT binary patch literal 1173 zcmaJ>Uq};i9KW&$u`CIS{&SsC5p8$3HRmpuY`d8QPi8r(W~^boX034KfEJ z^^inSXpuhj5=2CygA{slAe2cjQOOide2F56@Ws~e%xMp;AKd+Z-yfgP=ll2WdSm^` z(vn>z7>1RGYS}Q_%dDrk2)z&6wnWgj69!{2qBg@MuLH~{s!ae7$$Se4172*uG!CjT ztcZ}JF&N|O7(tcoyoIrwvWD0gR#k0kybuQvZvrin;w8R~ydrQ(^b%)W9K~q?&??n- z=pfQj9~C;{f=48(PvBK1g9Ky%dEAuS6oWCn#Ii1f&ekyRjA?T6@B~`&KMZQT*KrewJ{gZ;M zt;#CKN|{i>NR!t{+D=(1<$)acf2b_4q74`ZYw`Y5*od}kfD8jeP3Qt@TyweQN@D^# z;GwEVRkbZ&#l}_@sz$4-;em(?=XgO4@#Ci#&V3#D3@wFOPg{H?ku8u7-RtFy_Xxeo&*2QlQIMF9@wy`c6 z?Ck99>gpOC9GsY#7#|-W8yg!P9i5w->*?tk7#NtGoSdDVotm0TrBX{vOViWSGcz*_ z3k%t7c6fNWySsaSetu|ZsK38|adEM)uWw{zB$LUc)9G9;_q1cL8+q9W!}Sql7GBtw z9ed6rWP6D9Ma_?5!^zD>zG7$HhwPQDx!nD}4-cNl{OdP9D{bDiKSNE~!mcB=W%5<_ z-1?W_O70{M-q`m3?!ENJxbMfdn=cZN;%|#i_ns2_kDI;9L$+qa;k`=b#a-pw-yPcd v{d4O5?Zv8w?9a!yT$v|{-CwJJow>FS+m|ktKVh$}9}pG_*0WFj7gE0guq>>j literal 0 HcmV?d00001 diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 07d601e0..2500cae7 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -1,6 +1,6 @@ require 'travis/model' -@Travis.Build = Travis.Model.extend Travis.DurationCalculations, +@Travis.Build = Travis.Model.extend Travis.DurationCalculations, Travis.Ajax, eventType: DS.attr('string') repoId: DS.attr('number') commitId: DS.attr('number') @@ -26,6 +26,10 @@ require 'travis/model' @get('data.job_ids.length') > 1 ).property('data.job_ids.length') + isFinished: (-> + @get('state') == 'finished' + ).property('state') + requiredJobs: (-> @get('jobs').filter (data) -> !data.get('allowFailure') ).property('jobs.@each.allowFailure') @@ -41,6 +45,10 @@ require 'travis/model' $.map(headers.concat(keys), (key) -> return $.camelize(key)) ).property('config') + requeue: (-> + @post '/requests', build_id: @get('id') + ) + @Travis.Build.reopenClass byRepoId: (id, parameters) -> @find($.extend(parameters || {}, repository_id: id)) diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index 62f1aa4d..5e453fd0 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -27,7 +27,7 @@ require 'travis/model' permissions: (-> unless @permissions @permissions = Ember.ArrayProxy.create() - @ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data).permissions + @ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data.permissions) @permissions ).property() diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs index 43f3a751..c0be30be 100644 --- a/assets/scripts/app/templates/jobs/list.hbs +++ b/assets/scripts/app/templates/jobs/list.hbs @@ -43,6 +43,7 @@ {{#unless view.required}}