From 0ca1668518d92695b97993a5214a6f45790276df Mon Sep 17 00:00:00 2001 From: DivineOmega Date: Sat, 20 Jun 2015 23:30:54 +0100 Subject: [PATCH] Initial dynamic favicon code Syntax and logic fixes New favicons Contribution Guidelines Removed trailing spaces Style tweaks Comma Suggested code changes Changed high and medium alert icons to be exclamation marks protruding through a circle Moved favicon logic to IndexComposer Style fixes Removed whitespace --- app/Composers/IndexComposer.php | 8 ++++++++ public/img/favicon-high-alert.ico | Bin 0 -> 1286 bytes public/img/favicon-high-alert.png | Bin 0 -> 713 bytes public/img/favicon-medium-alert.ico | Bin 0 -> 1286 bytes public/img/favicon-medium-alert.png | Bin 0 -> 763 bytes resources/views/layout/master.blade.php | 9 +++++++-- 6 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 public/img/favicon-high-alert.ico create mode 100644 public/img/favicon-high-alert.png create mode 100644 public/img/favicon-medium-alert.ico create mode 100644 public/img/favicon-medium-alert.png diff --git a/app/Composers/IndexComposer.php b/app/Composers/IndexComposer.php index 3fafd749..ff9a33f7 100644 --- a/app/Composers/IndexComposer.php +++ b/app/Composers/IndexComposer.php @@ -28,6 +28,7 @@ class IndexComposer $withData = [ 'systemStatus' => 'danger', 'systemMessage' => trans('cachet.service.bad'), + 'favicon' => 'favicon', ]; if (Component::notStatus(1)->count() === 0) { @@ -43,6 +44,13 @@ class IndexComposer } } + // Determine favicon to use + if (Component::where('status', 4)->count() > 0 || Incident::where('status', 2)->count() > 0) { + $withData['favicon'] = 'favicon-high-alert'; + } elseif (Component::whereIn('status', [2, 3])->count() > 0 || Incident::whereIn('status', [1, 3])->count() > 0) { + $withData['favicon'] = 'favicon-medium-alert'; + } + $view->with($withData); } } diff --git a/public/img/favicon-high-alert.ico b/public/img/favicon-high-alert.ico new file mode 100644 index 0000000000000000000000000000000000000000..968e1f2932a349f23a0f4526ac6d29a50c9ffaa5 GIT binary patch literal 1286 zcmb7@!D|yi6o+4IVzq6ujcJ*wGOl;IvsTcxG3o%mRGZHoAh;2B!6aXC|bpZk{=v3E`U zH-4{Mc6Gcrb7NO#^yL8aGw{T$f3QlGLvbJ0rp@|1xfJKNJx?TJp}E0agqUlv1q(vKe^B*DF^_kRz(d!FyA4{aqjP;2-!j^TU|ub}Zbdn0KJ_nKejd7>9(kH1 z{w;i_|2@H;`ZMOMT01!v80R5jn4q?_#&tfd-2`%}9ao)k6`r%d$gd5FAU?{4*#4Nu zdE&I5%UvF&%09F)@bgRBZo98&+?m?m(1-CwG|gkmc(iMwzLaWfo_DtMT!^R6dJlW@ zW>47H6J|aWc-H-%s@8O)I#Q!8%~?IPM|<$OV&d1Mp899|6TN-5%N-s;K7QX4oPCzK z6$9eGu9qylBvk^842DwC|8B<3jO9N8XsME820 GBYyxxi*WV; literal 0 HcmV?d00001 diff --git a/public/img/favicon-high-alert.png b/public/img/favicon-high-alert.png new file mode 100644 index 0000000000000000000000000000000000000000..1a1f405c3c4df81b1d464c30c86c14d1867d4175 GIT binary patch literal 713 zcmV;)0yh1LP)x zK~y-)Ws^-vR8bVifA_sNuW=l`653>XYY;WaS_nnE7DCo0TC|9^ZA6MTWg%2VONkan zv=oB2)eu1om#y3cQY4yY@6BZD1m5vu#&Nv2#f;;OT{xV>;r!3XJ^v#(@KT9*q~CX& zJ7=e|SO7u#pn7pV32TEQ80`>FV6y8A9znz&Q+R-BdCEE&? z&8WZ!Hh@;A20RA505qbZt}Ed+5GdISyom~)0y#h!C^;4IEnozgHn0S-`nkN=kbx~= z8@LM$8z?11ofQj89`Rrv&_&DX?zCRBX3paD>~{bnP*M~vExzC@AWLw$E7YGI4{ic+ zV7NQ2*UFIn5zMg&fszh@FUT8s2sC=|DV2!34sZ!rd9Di|Q;B$_TrzfXFM;!Wr)nB# zN``s@cnmc5`|eo}I04MuZjQG2f_R{0Mu@|cMtO*^RQ&}5ZZg!X00zD}Wu2^U!4Wh7 zw(O@CjDbip)cI;G#Vvt0Z0|Q1U^b zqz#n30t7OGOr22}=59&PdhC8q-=S5t|&>y%&uSO;GH=#(v8p%vv&YsU;1TeBY1clhaHNjPBfuK) zqy+EBbs@YFKNM?s#d+X9FbFIZErZ=@JztjqU{T5I4vYcE_ZNUuW4~TE_Fi8m_qT?n v|DChn@4ExQ1)#lhbu$Iahu*Xf4#xije;VJVr>$!D00000NkvXXu0mjfeUme1 literal 0 HcmV?d00001 diff --git a/public/img/favicon-medium-alert.ico b/public/img/favicon-medium-alert.ico new file mode 100644 index 0000000000000000000000000000000000000000..90669b21a1afe893dbc27c36a4b3e036635a144f GIT binary patch literal 1286 zcmb7@J!n%=7=}-3TQ#-V^fqmzHT4Iiv!Wsv9dyt^2L%fS5fOCA;3C*XxRZl82u?0$ z5l5k z#=pGCz2oNp;CbDcNDuliMp^=o65AM`fM;&}y%9_8ZT2A+apMWr(mz$zI+QHy(Dbq% zfLv)s%N%m9K?QQ+?fLM&UbJ6O!oN%OxOhxE9^#WNIvx@u?-s~jO&Lq0f78{@*yD+G z-1%z%6jZwS#mo>^BOs)LH2V&G@gz}EY(dv4EFlM zGc~)WN2v!|J3d?M9+R1KXyQHMderyA{@O%a(E4O3SG7I%J030K&77b+$E)jMcRXf$ z#qH|}X+u71~pe7~}uE|9wxYW9$^oDDG}zijFJ zlBH*WaR=Y)y0xSExwGrEzxi!MvyPi;WwWV@MN^e_m?}A7s#%Cyrh0g+!R#=xBjg+a O!&KElQ^{PdP4x$TRNgHB literal 0 HcmV?d00001 diff --git a/public/img/favicon-medium-alert.png b/public/img/favicon-medium-alert.png new file mode 100644 index 0000000000000000000000000000000000000000..79c1e873e732266aac2fcc8cefc67f259dbd8e83 GIT binary patch literal 763 zcmVr+G+p*0*FaO zK~y-)ZIe+*R6!VpznLAc?rJGs6GE`aWI<^W5hQ|$K!t53D5&tkhayCJ3CcjIh@MJ% z5F(;_2!aF&!mwNe2_otts6=ihf>Il1*A`i|qW@)JIOojynR5jH%s_u> zK_sj;*6n$b!~h81J>6Nd;+fUv0}Eyy=fv&MbRy%4e6ka_4+4q$mU}PLZ#vLfxTtzY zQB|#Q;`XMWX;z9XEZ_%FA@j(6z*QiH2qFT1goO&?#O(^;Zjr@BU<+hq+g_bcWL`uh`f>Ipja80{_Pp0245^a4A8 zYaJ(38QBnX=Yd|J%2M2)7_qA$ke36+`ky*+y9+o6yq|aVm9?h)9pxTi5xC%I7`ip+ zeLC1y7^<{oGjIlI1!mGdt&Q#O^j`u16C?IvDd+>LvsaowUNmrL#WSay4=lL3p8TiI tRwS(U0=t3D+15?|Of%fH-%b3B{|(}1^R`~uj|>0+002ovPDHLkV1n!dLz(~p literal 0 HcmV?d00001 diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 21de846a..976d862b 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -19,8 +19,13 @@ - - + @if (isset($favicon)) + + + @else + + + @endif