From f6fea928b23cb4d72b44dbc8fd51c7ac18da58e9 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Wed, 10 Jul 2024 13:03:24 +0200
Subject: [PATCH] V2.7.0 fix favicon upload and prevent form webp-conversion

---
 media/custom/favicon-114x114.png                  | Bin 518 -> 0 bytes
 media/custom/favicon-144x144.png                  | Bin 602 -> 0 bytes
 media/custom/favicon-16x16.png                    | Bin 238 -> 0 bytes
 media/custom/favicon-180x180.png                  | Bin 723 -> 0 bytes
 media/custom/favicon-32x32.png                    | Bin 288 -> 0 bytes
 media/custom/favicon-72x72.png                    | Bin 430 -> 0 bytes
 .../typemill/Controllers/ControllerApiImage.php   |   5 ++++-
 system/typemill/Models/Storage.php                |   2 +-
 system/typemill/author/css/custom.css             |  11 ++++++++++-
 system/typemill/author/js/vue-forms.js            |   4 +++-
 system/typemill/settings/system.yaml              |   1 +
 themes/cyanine/landingpage.twig                   |   2 +-
 12 files changed, 20 insertions(+), 5 deletions(-)
 delete mode 100644 media/custom/favicon-114x114.png
 delete mode 100644 media/custom/favicon-144x144.png
 delete mode 100644 media/custom/favicon-16x16.png
 delete mode 100644 media/custom/favicon-180x180.png
 delete mode 100644 media/custom/favicon-32x32.png
 delete mode 100644 media/custom/favicon-72x72.png

diff --git a/media/custom/favicon-114x114.png b/media/custom/favicon-114x114.png
deleted file mode 100644
index dc2e17a496867a8921d7a7d78887ef16eccdd406..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmeAS@N?(olHy`uVBq!ia0vp^MIg+<1|<9Mw$=hE&H|6fVg?4jBOuH;Rhv(mfq`*{
zr;B4q#jUq@4852gMH(J%cT*K)TGSiW@q~%1iG9OY2D7;1hpuI3Oucu>EHo!rCnI~x
zi&ZywTq~O-*>mXo_uG5=Z#JGx>8@LUz2#r6w;Mx{0&9?hBi9lKE)|bP5fGZdq&b0!
z6Cu82-_|*wKAb!0xn=t{A4BJ_pNpr2hj%yLv9|6$yI7e^vP$=~#`^Wjvwr^TdVDpj
zA8y94t;~&)p{}+wXC$?~nm&EW^X@6@tG3*Ft1(UIm5iyc@a9!f7rJVyl@mZ(Sb%nF
zP5`-uHK;RvZT9Zn8}GaXYP4H^c}9<0ccaaY9R=%6gV(1@njb&@ZtE>&uu8DQUp-fy
z`{vHv`NzGsXLm`?+PnXJ?W)N<KTTwWK4ghvnC!Y*G*D#OjFrpQi8EJLR7$@7{hP%o
z#Mb7>+m|oz>~BzUT$h*Ql3qRAsqd=AT%a{Vz>rzu&?MsVH_DTp>HFV08$PyWGZyxL
vw0IepeW|_t=~XS%&;qGN4Mm_C|FYt*Cx$V~PMLfa7_khVu6{1-oD!M<85z@)

diff --git a/media/custom/favicon-144x144.png b/media/custom/favicon-144x144.png
deleted file mode 100644
index 9f4ebaeb10ba59744fde9c9669854b76a214cb19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>caTa()7BevL9RXp+soH$f3=B*>
zo-U3d6}R5rHS}V36lr+4Jx$Pa7DrP;;t^&KFKhh?+$!HU3cj&z-<qql)-@-XrG;g&
z+Ab;GJ&im+ro6X4Ad+9ViF>ops?&!LpKp-AWx&MJ(jXwf#Kfqm0Ax8haBu)wKmjKp
z3n&0)DS)H|1i(@(EFh_l|4a3DMm&F@@XGIah;X#Iug<%7MQkM{RZ`Z+kC$m~e3~K@
zuC6XPKQ+(n3x_khp&n~qMBey)IoRa$&XsD{bi`b*ulD*EAF=vw->R#dyl1Yx{_)?R
zIiJN}JbrqVt&$y=(|*{x?q`3++kWxhee<hFW*tAiWB(3~GHdsX4d2+9ukTjbKF4Pt
z^CynO)*#Oyd*R>yMd^wBj|=zsEnhb4#_gQ2lD&(r?|vZ22J#sPV<Wn!Kd$bo3kbVf
z8WNhi>g3wlYUvJtH*dc2?)%$-q}4A?*10d9bA5Nt+jnluuW$CAc|Y>it~XU~UFe2P
z48Pbs@%HD>H{O)_nr`gBy6T2w*2ji4bMvwj$~@rU#U2Nk&H+XgBo6k!;f@aps6D$!
RUyK0=JYD@<);T3K0RZ_6*<}C#

diff --git a/media/custom/favicon-16x16.png b/media/custom/favicon-16x16.png
deleted file mode 100644
index 04b4932a7f0f356be113f8abd99668efb4ae2157..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP;h~#
zi(`nz>Et_0mVBAt$aLU{gW`f43}O<^!9kN6C$_d~`2PR@FZIX2H<GIur+H5|DmZ;w
zIQ78x<^Gc2ZrxlcRj_p9#KzX{ZVl#tHUIh2jf14P3&bT#N(~D-x`mg%d_LQp=XrN`
zAa6oSQc^;Sl3vh+tAXda7j4_-!v5&~`}>k{vQ{lw4SC7RsTV7h%%(L?oH}(!%a`Z;
i%f$ED)>^q33o|6$(l0pF#kdyeRt8U3KbLh*2~7Z$%v*5)

diff --git a/media/custom/favicon-180x180.png b/media/custom/favicon-180x180.png
deleted file mode 100644
index ddca05075de94336dd728eeb045d296e1912b461..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmeAS@N?(olHy`uVBq!ia0vp^TR@nD4M^IaWitX&oCO|{#S9F5M?jcysy3fA0|Qg5
zr;B4q#jUq@ZM|XwC5}J*zxN#b^ppd~j;R%GZgV&=H{!+)&gn_&*UHSqR<>@rc|b(7
zNgy#nqTo@@9FZnX--*pW74ul{JhI)Nc(2iV&a-9jy&u?LlwxdRb8KGVc!5KTg%`{e
zG=VaeGXx+^w+jjoW-m}3gbCIHVj}BqJH-}iue&(VZqA$(i<vV_JSV+;ntHAKXdj!c
z%(KTgBX=EkR`;Cr<oDOos|(i3+*k-P3~GWx2GstCrlIljx=WvAnt5Bx%{Dpjo3lN1
z{{1^&YFB>$qIUSCitp?0hV<1x_hemZ-X(v0($$)GA{(8X7YJ?<#Oun#w^#p~e`s0m
z=XWnO&L$*WQt=eKoO!Bh?`+5SrLlJLu{&A2#pC<>H}BcMy{KUUu0Z(19eTh0p3d~2
zWp(qmz4n=<a`JM{w%v}?&#KwKe>X=dj1L$hW=wcPvZDIx`sG>f%E8Z$mTmR&x_NfN
z_g#AP_4JJFED9#6c<!4w@7eXkhx6F(Zppp(eQ);NAD3O8T5G?(@FS1|d;F|l`AhG9
z+1_*gw{Q1+`|b;L)3c8oUwxiEd!PQXo~g`W$B+`2@R-01(m!+WZ}}RcJ+Zs!E-;lc
Nc)I$ztaD0e0stk#Afo^P

diff --git a/media/custom/favicon-32x32.png b/media/custom/favicon-32x32.png
deleted file mode 100644
index 6b96a4f52c83013757573cfb514e4259df622843..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0s=!
z#W5t}aPplcOTNrcWMC9N%+MUj-eZ+;K=weB-huT?j~>v{@DM&-SO4e4hmWU3|L|SV
z(M=WDx_NOY^SyaCCku46vL?76ynT7OWL^DFC*jj}_xJTG9<zuN;ooJV@bclo1FFi-
z!l(Dy*Pr{4^E&Jg-voaC<(XzK<p&;gH@RnDH`-%c+GQ5_;myqqGa06v0jj#ajp5GC
zYSU_WR!@KU?aIm@vI<F=o|khv-Ze1xGxfwMELeX0fSQWSY_^l_{5<dVV-Co(%In2S
ioo!ppCsE1}%g9il=)BtHil92scMP7celF{r5}E)%6L3rb

diff --git a/media/custom/favicon-72x72.png b/media/custom/favicon-72x72.png
deleted file mode 100644
index 3fcd8efc3971c81e6851980b083cc743e84bc16e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9F5M?jcysy3fA0|R4%
zr;B4q#jUru4f75eh#dQvt}VFsir344X)9JGBrFQLX~`rlygf0|=@Cax%mSV{4ay-}
z-cuS=UWHs_QxqzH6LPY-{nM}iY5MP%?@3n=JLA3mb;}<qZbk<NMiv1u!N{S|z`z6~
z{)H;dcP(#jwCOp%ic8;Iy7GSBVTQXUR-Y_pu3)lCnJF%y%Ldf)_h;-G)7~q`7q2>W
z_vf3f=YHJjmdrltGEr~AF0t_I59cYATNyTUK+ONe*A@PD+nsM!ukJlty@`jp#9rpq
z=bCj~FG|fO=j>c^bcQ3)85dNKzb-yrI?L<Q`_)>1lDAJjZ^OU&Y`CjpXyAn;7O>+M
zba&m4?K4bTqvw6yMCn{BqnEpK<t)EY#=W{?lh%hNHsr{7&r#Wx=DqqTPm%{S%Y?q%
zf7$z|C+!Uj{h@gJkDtXKF~4q@haDhhf(-8X^F&%kH26H@myngf2w?DZ^>bP0l+XkK
Dv`D7>

diff --git a/system/typemill/Controllers/ControllerApiImage.php b/system/typemill/Controllers/ControllerApiImage.php
index a545470..4498765 100644
--- a/system/typemill/Controllers/ControllerApiImage.php
+++ b/system/typemill/Controllers/ControllerApiImage.php
@@ -189,8 +189,11 @@ class ControllerApiImage extends Controller
 		}
 
 		# for all other image types, check if they should be transformed to webp
-		if($this->settingActive('convertwebp'))
+		if(!isset($params['keepformat']) && $this->settingActive('convertwebp'))
 		{
+			echo '<pre>';
+			var_dump($params);
+			die('set wp');
 			$media->setExtension('webp');
 		}
 
diff --git a/system/typemill/Models/Storage.php b/system/typemill/Models/Storage.php
index 1bea062..40f36cc 100644
--- a/system/typemill/Models/Storage.php
+++ b/system/typemill/Models/Storage.php
@@ -741,7 +741,7 @@ class Storage
 
 		if(!$storedImage)
 		{
-			$this->errors[] = Translations::translate('Could not store the custom size of') . ' ' . $imageName;
+			$this->error = Translations::translate('Could not store the custom size of') . ' ' . $imageName;
 
 			return false;
 		}
diff --git a/system/typemill/author/css/custom.css b/system/typemill/author/css/custom.css
index 7a214bc..f30904b 100644
--- a/system/typemill/author/css/custom.css
+++ b/system/typemill/author/css/custom.css
@@ -52,11 +52,20 @@
 .fade-enter-active, .fade-leave-active {
   transition: opacity 0.5s ease-in-out;
 }
-
 .fade-enter, .fade-leave-to {
   opacity: 0;
 }
 
+/* enter or fade items in list with transition group */
+.list-enter-active, .list-leave-active {
+  transition: all 0.2s;
+}
+.list-enter, .list-leave-to {
+  opacity: 0;
+}
+
+
+
 .accordion-enter-active, .accordion-leave-active {
   transition: max-height 0.5s ease, padding 0.5s ease;
   overflow: hidden;
diff --git a/system/typemill/author/js/vue-forms.js b/system/typemill/author/js/vue-forms.js
index 49e697d..ab6a42d 100644
--- a/system/typemill/author/js/vue-forms.js
+++ b/system/typemill/author/js/vue-forms.js
@@ -741,7 +741,7 @@ app.component('component-customfields', {
 
 
 app.component('component-image', {
-	props: ['id', 'description', 'maxlength', 'hidden', 'readonly', 'required', 'disabled', 'placeholder', 'label', 'name', 'type', 'value', 'css', 'errors'],
+	props: ['id', 'description', 'maxlength', 'hidden', 'readonly', 'required', 'disabled', 'placeholder', 'label', 'name', 'type', 'value', 'css', 'errors', 'keepformat'],
 	components: {
 		medialib: medialib
 	},	
@@ -900,6 +900,7 @@ app.component('component-image', {
 				{
 					sharedself = this;
 					
+					let keepformat = this.keepformat ? true : false;
 					let reader = new FileReader();
 					reader.readAsDataURL(imageFile);
 					reader.onload = function(e) 
@@ -910,6 +911,7 @@ app.component('component-image', {
 							'image':			e.target.result,
 							'name': 			imageFile.name,
 							'publish':  		true,
+							'keepformat': 		keepformat
 						})
 					    .then(function (response) {
 							sharedself.update(response.data.name);
diff --git a/system/typemill/settings/system.yaml b/system/typemill/settings/system.yaml
index dd41ceb..e24e6e5 100644
--- a/system/typemill/settings/system.yaml
+++ b/system/typemill/settings/system.yaml
@@ -73,6 +73,7 @@ fieldsetmedia:
       type: image
       label: Favicon
       description: 'Only PNG format will work.'
+      keepformat: true
     liveimagewidth:
       type: number
       label: 'Standard width for live pictures'
diff --git a/themes/cyanine/landingpage.twig b/themes/cyanine/landingpage.twig
index d699bb6..c24a896 100644
--- a/themes/cyanine/landingpage.twig
+++ b/themes/cyanine/landingpage.twig
@@ -4,7 +4,7 @@
 
 		<div class="logo tl-l">
 			<p class="pv2 ma0">
-				<a class="link f4 fw4" href="{{ base_url }}" title="My Title">
+				<a class="link f5 fw4" href="{{ base_url }}" title="My Title">
 					{% if logo %}
 						<img src="{{ base_url }}/{{ logo }}" class="logo-image"/>
 					{% else %}