From e7d4b284cdc44c9cf92d8dcce0d92dd04a1d782e Mon Sep 17 00:00:00 2001 From: Mathias Meyer Date: Mon, 9 Sep 2013 16:40:23 +0200 Subject: [PATCH] Make action links actual icons. This change pushes the cog menu to the top, where it belongs, as it now only includes repository-relevant actions. The icons now reflect things relating to the build/job itself, and have replace the cog meny. --- assets/images/icons/align-justify.png | Bin 0 -> 351 bytes assets/images/icons/off.png | Bin 0 -> 1066 bytes assets/images/icons/repeat.png | Bin 0 -> 960 bytes assets/scripts/app/templates/builds/show.hbs | 1 - assets/scripts/app/templates/jobs/show.hbs | 1 - assets/scripts/app/templates/repos/show.hbs | 3 +- .../app/templates/repos/show/actions.hbs | 29 +++++---- .../app/templates/repos/show/tools.hbs | 4 +- assets/scripts/app/views/repo/show.coffee | 27 ++++++--- assets/styles/layout.sass | 2 +- assets/styles/main/tools.sass | 57 ++++++++++++++++-- 11 files changed, 93 insertions(+), 31 deletions(-) create mode 100755 assets/images/icons/align-justify.png create mode 100755 assets/images/icons/off.png create mode 100755 assets/images/icons/repeat.png diff --git a/assets/images/icons/align-justify.png b/assets/images/icons/align-justify.png new file mode 100755 index 0000000000000000000000000000000000000000..96bfc24ba040159eb311c4296b44807ac0e99600 GIT binary patch literal 351 zcmV-l0igbgP)m3UBFEn!ff zt&U=GywAup^8&q1t$sc3N%On~BrbxVQ#Ro4TGb@Uvx+QJ-^|LbFC{gwre xKX4B=zzC=XbplO$4{EG}sdz}F%LQ8P`2wGJgL7)0Vq^dS002ovPDHLkV1kD=mQ(-$ literal 0 HcmV?d00001 diff --git a/assets/images/icons/off.png b/assets/images/icons/off.png new file mode 100755 index 0000000000000000000000000000000000000000..1282e2f30c9304b4ad23d49d6b9d21944fc3f6d9 GIT binary patch literal 1066 zcmV+_1l9YAP)ABe)QCb*Jh-7= zLR=siZ%XtcaX}=msBuAX{Jn8rsHu6?-P5gL!N;q5%U9pjRCQP93WY*0EpoZsI&c#V zgKkilmMc`3MO-I>3Ld&c6Q%XnFhSb3#VFik_%gY&2&^||ZZmwDTv-HWnmB23q`-VW z-vru$wOaWklTbSaECh-2D>y@&m&6TV49G!v0XDn2jIWnsWe3H}=^*EQDen#T1gLd$ z;`-((hGYr&0^G@eiC+onClPqV;}E{vph0=!Y=uCIXM*Rz6{r23N=Q6XAn{tD|A5x3 zy-TcKxuR^DK#J?9R@|^et;_|n;9B#i)bEB*;@O%W}5toR($Q6`a z+EyT2!xiTCyIfAIKQ0iG!x2Qsh~-@Z#*r(ix#S&;;FSY3RdX#{6iCua5c;LZ&B6pL zsC97n0(a%yevjr^Rs~)O5cK1(F$)u}pw!YPfqTFeru_knUwu+6r`B4%pZFJOqHl@C z?m@SP{2AaGP+@B2@CBcZ@+Mgetf%}S6ATjzHJKoBgKL!JLq>r-IhGmzqDus}2ZDD3 zesx%g;d0v~(%GPEWiPh%CoGmtll-+}@q(R!H5o{T>J zx!inm{Jne9-FH@>nxjDXpW1i$${u4{i$C|nD0rv|QI#pqe% z|7t5;T9*b$M=XD61?9=#VHITb&7;22;234Q$YHH$A%T*(yCOTgV|9R{Kj7y${W)19 zB)BI^`<>RwO5=mS1$+$5vn|A_0?!5t<@Gc@R9uZ89`oIe|1AhUo>br*l0E@lIoDpO zMu?RQ?~VYs%(LC9QD0G@3~0L|NKO%J)S{%88hKyu1z&;tqqTo2j%!?CN#v~nkr2KF zYvKqsPOhBT0ia@hD}QaX=7+2=a5hDuzgj0aL(V49;*;WQ0INU`7z0{k+2Fx&dCLS! zfYud5>`o@H#LM6ucmn*(gPZI2FS;V4`V|68BKI*_Xy3RKrRkrBJN<{d{u)SHfqY=6 z5nS-kg@omf*~NcBe4$>fu;N*L knFVGQ5LYjU;J2hyVZp07*qoM6N<$f-W=kRsaA1 literal 0 HcmV?d00001 diff --git a/assets/images/icons/repeat.png b/assets/images/icons/repeat.png new file mode 100755 index 0000000000000000000000000000000000000000..f89bf28b018e827d0fb5032abba6e58a53ce78f3 GIT binary patch literal 960 zcmV;x13&zUP)P~-2!H(_$~&1CL-FM0XkFmu1<%z1NX?w$Jz{r&wl~fUxxRE!EFk3i<|ua#zttT zcide^+Bd`=fw#q+*|dv+Hc`yB#)89QL#DH)W)TTrL2R~86L0hD{5~<=zP&&{AjXr8 znKL-#7DK3=nk{tKy~IosU!d!gtLNiUpvR2kh_xp7pg>4EB1E0UX1KxgwA5+I#Duw6 zSRe#V;9G#`Vje+$E_`~CoxxP zdS^eh^6PNwRAQM~U?paK{PL^Z<~jIhW@E;+X7Uv^=BXzn@Ha(|4YFhx1AZb|D9dz< ztr_fL0G(i}Zf+M>T}ViP1X^pYg*7xOR5X_UkU*`?m18L+G?oND2n4OQ8Au&HcW4GR z;-=9XHl0}?Dj!LIZIoJN;_M6DU3U`8ePE?Vr|NUS@u<~%dP<78fgk55Qdr3&{{r~* zgz&|={!RRo{jo#+!5JJ-oA%Lk2J&rSp+$;c2UUISzXMK?)pl6*S>Le#W?0DW5T67o zrjK#WQZJ|nEnqn)fS9RfJ!1M|NdvL0VqIhVz-WEA--mmaHLm3wa*O>0NS1)xz`8x9 z`YyniwDz2qpg<*HdQKhy<<6#-!Y(&xo;E7b5kaoM-?~7anbULi1~>$AJ^S3aYKLtS z$b!ZOY9_cHtOISJ0mvj=|5n`v_loTk1~8BD#FH(Tz$`0*r{S9p`VjLa8?VH5Spq8| iU?dKASQsg{{commit.committerName}} {{/if}} - {{view Travis.RepoActionsView}} {{/with}} diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs index 56e4a8ac..fd233cc2 100644 --- a/assets/scripts/app/templates/jobs/show.hbs +++ b/assets/scripts/app/templates/jobs/show.hbs @@ -41,7 +41,6 @@
{{commit.committerName}}
{{/if}} - {{view Travis.RepoActionsView}} {{/with}}
{{t jobs.message}}
{{formatMessage job.commit.message repoBinding=job.repo}}
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs index 4e030667..7d7d3cf7 100644 --- a/assets/scripts/app/templates/repos/show.hbs +++ b/assets/scripts/app/templates/repos/show.hbs @@ -7,12 +7,13 @@

{{#linkTo "repo" this}}{{slug}}{{/linkTo}}

+ {{view Travis.RepoShowToolsView}}

{{description}}

{{view Travis.RepoShowTabsView}} - {{view Travis.RepoShowToolsView}} + {{view Travis.RepoActionsView}} {{/with}}
diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 23de48d5..8d185f19 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -1,37 +1,42 @@
    -
  • - Status Images + {{#if view.displayStatusImages}} +
  • + + +
    • + {{/if}} {{#if view.displayCancelBuild}} -
  • +
  • Cancel Build + {{bindAttr class="view.canCancelBuild::disabled"}}>
    • {{/if}} {{#if view.displayCancelJob}} -
  • +
  • Cancel Job + {{bindAttr class="view.canCancelJob::disabled"}}>
    • {{/if}} {{#if view.displayRequeueBuild}} -
  • +
  • Restart Build + {{bindAttr class="view.canRequeueBuild::disabled"}}>
    • {{/if}} {{#if view.displayRequeueJob}} -
  • +
  • Restart Job + {{bindAttr class="view.canRequeueJob::disabled"}}>
    • {{/if}} {{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog does not refresh 'if' properly, need further investigation}} {{#if view.jobIdForLog}} -
  • - Download Log +
  • +
    • {{/if}}
diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs index df2e666a..02b74023 100644 --- a/assets/scripts/app/templates/repos/show/tools.hbs +++ b/assets/scripts/app/templates/repos/show/tools.hbs @@ -1,5 +1,6 @@
- + +
    {{#if view.displayRegenerateKey}}
  • @@ -11,6 +12,7 @@
    • {{/if}}
+