From 71ce377352e7087c5a50f26684933304515dce7e Mon Sep 17 00:00:00 2001 From: Oliver Nordbjerg Date: Tue, 20 May 2014 11:02:20 +0200 Subject: [PATCH] Switch build status image to use Shields.io SVG icon. Closes #439 --- PHPCI/Controller/BuildStatusController.php | 16 ++++------------ public/assets/img/build-error.svg | 1 - public/assets/img/build-failed.png | Bin 1959 -> 0 bytes public/assets/img/build-failed.svg | 1 - public/assets/img/build-passing.png | Bin 2344 -> 0 bytes public/assets/img/build-passing.svg | 1 - 6 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 public/assets/img/build-error.svg delete mode 100644 public/assets/img/build-failed.png delete mode 100644 public/assets/img/build-failed.svg delete mode 100644 public/assets/img/build-passing.png delete mode 100644 public/assets/img/build-passing.svg diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index f7304413..5b6cdfd9 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -68,23 +68,15 @@ class BuildStatusController extends \PHPCI\Controller } /** - * Returns the appropriate build status image for a given project. + * Returns the appropriate build status image in SVG format for a given project. */ public function image($projectId) { $status = $this->getStatus($projectId); - header('Content-Type: image/png'); - die(file_get_contents(APPLICATION_PATH . 'public/assets/img/build-' . $status . '.png')); - } - - /** - * Returns the appropriate build status image in SVG format for a given project. - */ - public function svg($projectId) - { - $status = $this->getStatus($projectId); + $color = ($status == 'passing') ? 'green' : 'red'; + header('Content-Type: image/svg+xml'); - die(file_get_contents(APPLICATION_PATH . 'public/assets/img/build-' . $status . '.svg')); + die(file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg')); } public function view($projectId) diff --git a/public/assets/img/build-error.svg b/public/assets/img/build-error.svg deleted file mode 100644 index a6567a32..00000000 --- a/public/assets/img/build-error.svg +++ /dev/null @@ -1 +0,0 @@ -buildbuilderrorerror \ No newline at end of file diff --git a/public/assets/img/build-failed.png b/public/assets/img/build-failed.png deleted file mode 100644 index 2aa1e125c5c0206873a645ae94319cb6216941d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1959 zcmV;Y2Uz%tP)dbVG7wVRUJ4ZXi@?ZDjyCFEKDLF*7lRF46!12LMS# zK~!jg?V5i~)b|<3U*GQm$06Jah#lYo6LA3NB-v67unR=CTMkG9L4?o;gNnUm)+c#ICRw?;xVAxM^fa^8~zkBZ(rc2jib~s7w zL>+VQ*XANBME>-?kssHsW&g=@NRv}6UA&0gns58tUQ;iYHRp;@E^;P`(p^XoVN z$*kLZgY=un=o=iRyd*DTN5jExFko$I32Kww)I@eu)2(yc+Zo-pE2z!Q&saV_9&$Vy zAJcU@3OYN(vQN=!$=bFJjb0!21_&tn7vmHBto0z*Z4OoyE#;WWjOo${@BZouGF52+ zZ2nd$?;kmX#{+@@k3Lu;3l31TY8kq6E&uBE?$pU?CtZD(go!?vbe(SA@f59g-f_FZ zAb*xxTLX$7PXhU-3sP$<1)ZI8ga}4J(RY7%lA#fazy4w? z>(<=MC*9}S@k$3rdx!Y`BP#)L%y>&QLGaF*cHUaDRj&AkEV{?Tg5B%BlM)UyCKFR# zUGjIg&4#_bovdx!65*OmBtFh(@0KK_wl=ISEx2tquGZCsC49g{Zp8W(3Q?f6Fb9Cr z!dygAV8Y>?W96Utd*-PFG#N_2@7KQkDyT!Z1F5YIfVA>*(#p#L|C4{GB5E{bH#L#p z(E)fj>)4AghMpJbhaL4*C`6H6uXga4&TfAC+Q%qFftpo?@$>o)z%5C#z*!9qX!Lpj zrnxC|Vj>wkSYXMB_W+R&YZgKH`Yu0x{wlQh&GYCM2G8F*<&y9rc(7y*c zb#9ol;w4Paxahes;=8JefWeG)oMhIMh>^4MuVtU%UOJ)M2|Fk z560Yk+?R|7BCL+w%g?UowSA}f=+kp@qXoQmw+}%8Woinx$!SiWy>iPM%2WlcIvw>kQ4qG{Yd7LwY zqkeYJe{T)e2?u{W*3YzaRvs@c$mZuySFu53O{(Xil=JJ=(k*F+UX)cCzI6+(1D8t zm)Y!BrUlB-M;jZl8w_$86i&Bmp>UbaIE+TwKk$b2+~($xb7T4^_vW=Lc;{d*ZjT31 z5D;&)=JFP2kheG^mZcNQ+{R1hjrw*zG8`lMgD zYQ^nwqkp2B;{0rOZmmJBQqpg^9#8+0B!H+zUr~^aD2lwk?*x`FtnAr)9Ghc`vZ5vN z^e;&Qi0Q@1wvRvO-A{TE1%Vlti;Y#wd3pN=QWVKItM6oD5*@&BxR1^g13YqnAunuQ t8!x|-B#@XzPxAjqG7jH`Bt^dq`5!q~(K%~Sxabuildbuildfailedfailed \ No newline at end of file diff --git a/public/assets/img/build-passing.png b/public/assets/img/build-passing.png deleted file mode 100644 index e74657b7a453901510565b9c57965c8ce7a88967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2344 zcmV+@3D@?CP)dbVG7wVRUJ4ZXi@?ZDjyCFEKDLF*7lRF46!12!TmN zK~!jg?V4?DQ|A@Oe|B)vBwz=E*@$s)2WiQR2b4m|VoJJ+F%l(eX{RY^p(pJpB%eLT8aec*aU_7i`Y~3L!9F-E?D{)93CT6no9m+ zIgcgJil^NPVqnHjH($NYYkx4Zb;C-wzp$2rr@MKpzKONDi@0`ch{548L7OQ}rMmoS ze(==eaWg!@%$ad`zjn)xd&dZGBJ6V_ACBQe*e&a*rVMLlfl*z zD^{m9;J8d8L!F_H=o-y^%>bw~)W{^Vi1aPDTL4g|E78a`WT$7(NE^!jP<;ufkJSGA z3G4LU{;zn~c#ezKehO3zs482tASD&BZ`9kTQk z08VvY=eK+R#oZ~-4AN!or^C`mfl3~=pGUrLhWSP9VeU9a$;)2A39}XR)mwb@o9CIGnhe0E)l2xe=>l#yh(u7lTqQUhpfGO{ zMFmQZw|kyc=eUcO4qHr4_oYZ)By5|9%s5;Q3>E|CAv4D}91q&YU@-{WwLP^Voo?zi zvE}3zz;k0u6{W}|GE6s2bPRQ1ciE98%c9nXvfr0b5zAL^9kF6_+ORoo=sWe)_SDi? z+!#@`3+ePdpPu2`Ejxex)n?YMc%0AAUZU!4BgfjWQTj{{0HYJ05=|uXv>A5=mTW7R zep_(5+f7{Ob?<2KqQ9U=->Ii#r~^~4iBd(W-+A+pnU=m5Vc+3$&|qnxQdJpnZSUwR z$S9z(xKS8Ix_lkAJ++i(l?unA(T1}>+Wy*IcIqzGq3_h=a5*SzDvQYRArrYiAas9x3F-8;xe9i@x}I)ZKf69SO851C-rDvY*$bk}7VXY)zkS90IZ?Hb z6!VaoS5Cen?3XA?{La^1suQ*=Rh53B-x~pZ@rHbx)5dbsa;jUaG4+~){&zH5Uz+=x zgZ{!jyrJ-&@4eMYD8gp%-(RWXV5^d|UA+Jde&t_(CnfnmGpRvV-M;9#DQt^HBA&`w z7}lU@nD@!NpvSd2+JJej!O{SDM!7cxSEwp5SPU2}hJcJ;m#@P*V&%Y%144pmuo#d^ zq*Ucp`AsF!XniSfDi3;mx~d`=zEg-}BCvw+W!lA=^1>Wp`%nANvg>ch+27nv`<2@a zJ12xB4&dCS8#sJM_NmV6v|P9@?9WL{=2`WFnctLYN=mXyFcurxy<)fDxduxEHm41M zlC1wl0N-ujNC2Msvc9MuW3iD6RfQ139WDp@PCaE!Wi!(HQY0@5`ctMWW4II3GwtHc zI(0Vdzq^=Y?biS}+GgQsn+1Th6bT|kxbG!&NB(W0wfiQyi{~>wF-hCyTYlGi`pGO7 ze=GXMgis9pcpxI3cP^Joq{xzGLim#<%aBT>LKYuvbZO)oG;$3!t7|azn%LR46PwdU zOJ7Ssg%FJvqR-yL;X99elhjZ|v<&;^tIx7ovy3FM$nUsw+{M(rlwBl($C78^aE^24 zVsC)MQzS`j+qgWU4#bn@zGk6JbGRIoHb9P3SlPNc;FkU zGz&CgwGl1DibWz`-@JyGp3UWa&rPn}9OTmV0WMhj{B+xXw1UCmQT~3Si*eUo;rNoQ zx%~2_wJefLqv=On@GZ$gEr$3m?D*E~c9%V%1PfJuMWc;3)veXS^rg+2eq}DIwRgq* zIeyvq-ha07;o)|`Q=_M*%;G1-t9Vh9OPB2q9G;)of){D17h(;UFzBTtX3wDDitlyu{1S6)G+?&=c<-^16 zOu5~NMIyxavO0N28uE;^SS}qGd`G#rjtz!3M=NOSdg_F%9y}SgGEGT#dbY6i>20IV zPzyIc67Btjsy+aW#YVpeXga+%M;md*AJdmJ4M#d~j=8`M&anv&ox6-{^6vBvzXt3s zJGDKvfG4xR{|5S^&QSZU(5W-j9NTbA$nL$#n9XTJDv_eg(+ML=BiBT%jWbN#1x_Ls{VyGr8n979rb@;Pq`Z z+K0uA!~5kMgG{-n&_2JG#S7=MeRCmu51gmVc89XUc$)a|2^S?|(LO9@9Nw2^%|$F0 z^X~rB*uEU3X5T3sqhsV|&yS~l2_673eHdBy*%y5Dc{^f}h>6KbHmv#%Z*E=Btfa)3 z)!$@dayo$FXa|j_dw6D diff --git a/public/assets/img/build-passing.svg b/public/assets/img/build-passing.svg deleted file mode 100644 index 42f797eb..00000000 --- a/public/assets/img/build-passing.svg +++ /dev/null @@ -1 +0,0 @@ -buildbuildpassingpassing \ No newline at end of file