From 96cdb34d7185008868ceb4d46f85fc384915023c Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 15 Feb 2022 11:31:49 +0100 Subject: [PATCH] first tiny fixes to get the installation running Signed-off-by: Michael Kaufmann --- .gitignore | 1 - cache/.keep | 0 lib/Froxlor/UI/Panel/UI.php | 6 +++--- templates/Froxlor/assets/img/logo.png | Bin 0 -> 2606 bytes templates/Froxlor/assets/img/logo_grey.png | Bin 0 -> 3487 bytes 5 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 cache/.keep create mode 100644 templates/Froxlor/assets/img/logo.png create mode 100644 templates/Froxlor/assets/img/logo_grey.png diff --git a/.gitignore b/.gitignore index 8fae7b37..272a8cdf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ img/ !templates/Froxlor/ !templates/Sparkle/ -!templates/Sparkl2/ !templates/misc/ templates/Sparkle/assets/css/custom.css vendor/ diff --git a/cache/.keep b/cache/.keep new file mode 100644 index 00000000..e69de29b diff --git a/lib/Froxlor/UI/Panel/UI.php b/lib/Froxlor/UI/Panel/UI.php index 93662b63..c072461a 100644 --- a/lib/Froxlor/UI/Panel/UI.php +++ b/lib/Froxlor/UI/Panel/UI.php @@ -33,7 +33,7 @@ class UI * * @var string */ - private static $default_theme = 'Sparkle2'; + private static $default_theme = 'Froxlor'; private static $install_mode = false; @@ -145,8 +145,8 @@ class UI $theme = self::$default_theme; if (!self::$install_mode) { // system default - if (\Froxlor\Froxlor::DBVERSION <= 201909150) { - \Froxlor\Settings::Set('panel.default_theme', 'Sparkle2'); + if (\Froxlor\Froxlor::DBVERSION <= 202299999) { + \Froxlor\Settings::Set('panel.default_theme', 'Froxlor'); } $theme = (\Froxlor\Settings::Get('panel.default_theme') !== null) ? \Froxlor\Settings::Get('panel.default_theme') : $theme; // customer theme diff --git a/templates/Froxlor/assets/img/logo.png b/templates/Froxlor/assets/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..58ced30f53b6437c8c27cea3246e26f031a8edbf GIT binary patch literal 2606 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 QKmY&$07*qoM6N<$f@qcZ*Z=?k literal 0 HcmV?d00001 diff --git a/templates/Froxlor/assets/img/logo_grey.png b/templates/Froxlor/assets/img/logo_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..370a8f41b6f9048c142bae913bf9dee98345bc0e GIT binary patch literal 3487 zcmV;Q4Pf$#P)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{Fkv~6#xJLAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF* zm;eA5Z<1fdMgRZ+32;bRa{vGf6951U69E94oEQKA0^mtRK~z}7?UzePlu;DNzk(hJ zWi5(G5+Q6xC^9M%icqo^W`!C>A(0egEusjbC-hqMqD9bV!ZuORYY2kEg$p5w9#H5) zuqRPqEi$#2J*WSX|AoWt-medHW-~5+F!!8uU;nxHobLw7WHJE7AO(6sI>+gy7NSWY z;>5s*VPXD4G>HXND@uoJ;Clr1AA^VB3HXtPjmR9`;ByAXP6eK8)egQ|wt7$nemdgC zmH?x8Weo?jAkYEMH75gOe+)d1YS3cY&T}Cr9Pt{JpyaN zbT9=h0H;)nxWoPxpcSkDg`g>lKs}tW!m?jgSLeRvTTlBmUbO_{#h0&6*GMptn~~fx zk3QK%4GV^}CxJJh4UC~}J9w?etM#0q2dYmgSOvzhy@oND)Lvv=d0f}IC<1-sMx^6L zumdc#a?4APK$?UlkZjT{EJnX8kweo#dFUfNEpxKjQu0Pj5l)v;X$e$m#f*41GN zbR?{p_^w#FW5b3zN4ybe87oS+O6EqOV^*KTv=>=+v%xC1e{nBG7V&&nM7P+6ygvE$!9nM9;U@aV12c8Eo%XF`uly|1FSk z!6DF2PwZd>YF0U*jkZ28mG(olZDTu+;|DAvogRVKsr+M-@(nfD)1eY5t&*tW`Va~v z`C$ot`78ASjyuZqe&(0d+bva z^Uf8l=oe>mO&~Y}-0