From 285a4170f70a8195a7d04141997df8d28a09c3d4 Mon Sep 17 00:00:00 2001 From: Deltacms Date: Mon, 10 Oct 2022 09:10:39 +0200 Subject: [PATCH] Modifications 4307 --- CHANGES.md | 10 ++- README.md | 2 +- core/core.php | 5 +- core/include/update.inc.php | 6 +- core/layout/common.css | 5 ++ core/layout/main.php | 21 +++-- core/module/install/ressource/defaultdata.php | 6 +- .../ressource/themes/theme_default.zip | Bin 41311 -> 41288 bytes .../themes/theme_hirondelles_960px.zip | Bin 41316 -> 41347 bytes .../ressource/themes/theme_montagne_960px.zip | Bin 32536 -> 32575 bytes .../themes/theme_sansbanniere_fluide.zip | Bin 41474 -> 41508 bytes core/module/page/view/edit/edit.php | 6 +- core/module/theme/lang/en/lex_theme.php | 7 +- core/module/theme/lang/fr/lex_theme.php | 7 +- core/module/theme/theme.php | 19 +++- core/module/theme/view/header/header.css | 4 + core/module/theme/view/header/header.js.php | 84 +++++++----------- core/module/theme/view/header/header.php | 25 ++++-- module/agenda/agenda.php | 30 +------ module/agenda/view/creation/creation.php | 19 ++++ module/agenda/view/edition/edition.php | 27 ++++-- 21 files changed, 169 insertions(+), 114 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 092f702..80913a1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,16 @@ # Changelog +## Version 4.3.07 de Deltacms +- Modifications : + - Configuration / Thème / Header : nouvelle option bannière visible uniquement sur la page d'accueil, +- Correction : + - Snipcart : modification dans Core / Page / Edition pour compatibilité avec ce module, + - Agenda 5.4 : correction d'un bug critique lié à la limitation des droits liés aux évènements, mise à jour indispensable, + - Configuration / Thème / Header : correction de plusieurs bugs notamment pour l'affichage en mode aperçu. + ## Version 4.3.06 de Deltacms - Corrections : - - Personnalisation des thémes : color picker absent du paramétrage de la bannière et du footer. + -¨Personnalisation des thémes : color picker absent du paramétrage de la bannière et du footer. ## Version 4.3.05 de Deltacms - Modifications : diff --git a/README.md b/README.md index a3872de..00b162f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# DeltaCMS 4.3.06 +# DeltaCMS 4.3.07 DeltaCMS est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation. L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une des principales langues européennes. diff --git a/core/core.php b/core/core.php index 5ac997a..f8e4bae 100644 --- a/core/core.php +++ b/core/core.php @@ -48,7 +48,7 @@ class common { // Numéro de version const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/'; - const DELTA_VERSION = '4.3.06'; + const DELTA_VERSION = '4.3.07'; const DELTA_UPDATE_CHANNEL = "v4"; public static $actions = []; @@ -2388,7 +2388,8 @@ class core extends common { // Bannière au contenu personnalisé if ($this->getData(['theme','header','feature']) === 'feature' ) { // Hauteur de la taille du contenu perso - $css .= 'header {height:'. $this->getData(['theme', 'header', 'height']) . '; min-height:' . $this->getData(['theme', 'header', 'height']) . ';overflow: hidden;}'; + // $css .= 'header {height:'. $this->getData(['theme', 'header', 'height']) . '; min-height:' . $this->getData(['theme', 'header', 'height']) . ';overflow: hidden;}'; + $css .= 'header {height:'. $this->getData(['theme', 'header', 'height']) . '; min-height:20px;overflow: hidden;}'; //$css .= '.bannerDisplay img { width: auto;max-height:' . $this->getData(['theme', 'header', 'height']) . ';}'; } diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 5eaaaf0..f92935d 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -60,8 +60,10 @@ if ($this->getData(['core', 'dataVersion']) < 4202) { $this->setData(['core', 'dataVersion', 4202]); } -if ($this->getData(['core', 'dataVersion']) < 4306) { +if ($this->getData(['core', 'dataVersion']) < 4307) { + $this->setData(['theme', 'header', 'homePageOnly', false]); + $this->setData(['theme', 'header', 'heightSelect', $this->getData(['theme', 'header', 'height']) ]); // Mise à jour - $this->setData(['core', 'dataVersion', 4306]); + $this->setData(['core', 'dataVersion', 4307]); } ?> diff --git a/core/layout/common.css b/core/layout/common.css index 0a58f6e..42ccf95 100644 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -106,6 +106,11 @@ a:active { outline: none; } +/* pour rendre toute la bannière cliquable */ +a.headertitle { + display: block; +} + /* Titres */ h1 { font-size: 1.8em; diff --git a/core/layout/main.php b/core/layout/main.php index 198a25a..8501baa 100644 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -103,15 +103,19 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT + getUrl(0) !== 'theme' ){ + if( $this->getUrl(0) !== $this->getData(['locale', 'homePageId' ]) && $this->getData(['theme','header','homePageOnly']) === true) $homePageOnly = true; + }?> getData(['theme', 'header', 'position']) === 'body'): ?> getData(['theme', 'header', 'position']) === 'hide' ? 'displayNone' : ''; + $headerClass = ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : ''; $headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : ''; $headerClass .= $this->getData(['theme', 'header', 'wide']) === 'none' ? '' : 'container'; ?>
> - getData(['theme','header','linkHomePage']) && $this->getData(['theme','header','feature']) === 'wallpaper' ) ? '' : ''; ?> getData(['theme','header','feature']) === 'wallpaper' ): ?> + getData(['theme','header','linkHomePage']) ) ? '' : ''; ?> getData(['theme', 'header', 'textHide']) === false // Affiche toujours le titre de la bannière pour l'édition du thème @@ -121,13 +125,14 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT   + getData(['theme','header','linkHomePage']) ) ? '' : ''; ?>
getData(['theme','header','featureContent']);?>
- getData(['theme','header','linkHomePage']) && $this->getData(['theme','header','feature']) === 'wallpaper' ) ? '' : ''; ?> + @@ -169,13 +174,13 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT ) ): ?> - getData(['theme','header','linkHomePage']) && $this->getData(['theme','header','feature']) === 'wallpaper' ) ? '' : ''; ?> getData(['theme', 'header', 'position']) === 'hide' ? 'displayNone' : ''; + $headerClass = ($this->getData(['theme', 'header', 'position']) === 'hide' || $homePageOnly === true) ? 'displayNone' : ''; $headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : ''; ?>
> getData(['theme','header','feature']) === 'wallpaper' ): ?> + getData(['theme','header','linkHomePage']) ) ? '' : ''; ?> getData(['theme', 'header', 'textHide']) === false // Affiche toujours le titre de la bannière pour l'édition du thème @@ -185,14 +190,14 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT   + getData(['theme','header','linkHomePage']) ) ? '' : ''; ?>
getData(['theme','header','featureContent']);?> -
+
- getData(['theme','header','linkHomePage']) && $this->getData(['theme','header','feature']) === 'wallpaper' ) ? '' : ''; ?> - + getData(['theme', 'menu', 'position']) === 'site-second' || $this->getData(['theme', 'menu', 'position']) === 'site' diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 1d710ef..74e6fdc 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -70,7 +70,7 @@ class init extends common { ] ], 'core' => [ - 'dataVersion' => 4306, + 'dataVersion' => 4307, 'lastBackup' => 0, 'lastClearTmp' => 0, 'lastAutoUpdate' => 0, @@ -321,6 +321,7 @@ class init extends common { 'fontSize' => '2em', 'fontWeight' => 'normal', 'height' => '200px', + 'heightSelect' => '200px', 'image' => 'theme/defaut/banniere_1500x200.jpg', 'imagePosition' => 'center center', 'imageRepeat' => 'no-repeat', @@ -335,7 +336,8 @@ class init extends common { 'tinyHidden' => true, 'feature' => 'wallpaper', 'featureContent' => '

Bannière vide

', - 'width' => 'container' + 'width' => 'container', + 'homePageOnly' => false ], 'menu' => [ 'backgroundColor' => 'rgba(32, 59, 82, 0.85)', diff --git a/core/module/install/ressource/themes/theme_default.zip b/core/module/install/ressource/themes/theme_default.zip index 0e04a2cb16eb76b8c919547bd21e2cbacce1346d..4bc9e6c6b8bd00d223239d9c9d0049549f2832c3 100644 GIT binary patch delta 2678 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 delta 2681 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 D-$dM$ diff --git a/core/module/install/ressource/themes/theme_hirondelles_960px.zip b/core/module/install/ressource/themes/theme_hirondelles_960px.zip index e86352fcba17bacebb35365213eefba191ae18f0..9b85b7325e6023240cf389dce8b3744c64579a08 100644 GIT binary patch delta 2697 zcmZuzS5y-S77Yn7bTS|aDhNn#Q3)blKy?iC@m@tq_?B72syWISvct5PJWX!Ejw{B1>~^Gix3KB2>ltnC<;bm+Ll?e2dvaE7$HL z-;~nMqf?w|X6_Z8TWwIMF9zS+vU48MolF=xMBSKo7aAjrk%jg$#S?*YB+CB#B#XWU zKl6){MUkb-Y~|Pr0ZnhK^1iTT_(ggRXd;VDG2n zdoEY->p6Z+eFfiy2e3n5>?Jh8sH5j-E@U@X#Rqg>{}ear32PAhc)`bQ%bFABIWLK1N(#voYM&!%&k(QYl1KFE(rQ_mfB5kKeW*jO>pTS8^n?w<7h#^n&_=;u6XIDHZS!c%G4~m(+v0J^7odX`6>Jc#^fFSf8Yi1; zmvrif1Jvs3W@S(FWu(7{yB2>^M}0Q@q7t9|zM?U(c8V?6BcpX`wh!}U_~}@J-njKE zt(Fb$*VC#epnrN;8=f!sferwGBu{`OQ1eE^6#u$LZm16u&0LHFAvQM%7Zc7TwLhNND-pyi42m^w|nxaq`A;&LV*Sog0{54-eMe8#q-Lr z^QMag#=tfPJgQrN$xrx!%~&=R>R2ylE@9+|F&K zFxzJD0jNylRjw&2zsR-tDrUJZbn_g)wHEq zR>;*%E-)cSet%X~1J(v#Q_KU3BU|)|O5N`+A0>J2WvZDrZ5h_82r;-1BAv1A4%EY>OtbC<9w*hP1X>6M;2D1%ciGN*BHXb_`=yFb*hsMg{P zCq5%jEQdxA30t2yQ*W)`ef&1W6<0MDmQ`Xf5czlr`mb?hgiH64`ms%dS^mg&eVLF}Tg}@cLK3V3JD_#~i|d#^&2&6|u9CGm2ebUJCbgDo9`4y5QCwVX`8ud_ zM^JL=lGkNaX(i;4HQV@Or$>%&7!8!SBZz>+9Y6yKI%K~#o|cWvf@bgv*#s@wqpv$s zmnJA%Ptjy+wL@siDqVDWZwBXH(4^o%)(Jb!W&mZ4MkZ5HzWGy0r9Px=c{l??P>}6> zU;mbUf~VofS4Za>q!*cfOf13G$l|LtT4&ZW#uX*PDV1*du}`0DF*_?`s3LDP422CD z8u<-=2bX=uqb3jm_|wJ-!E{?)x-DIuR7x>8L#uo&Q`}UO(EHI{QB}sZc%j(_ai=@M zRuTI~n2$2ct(HtIN{r1T8(r!{k(Mo<$UncADjq)sBbpahCdA zpmrAAx;;n|T=wfN9X9OAxcGutV_186Vp8>u5%Nmu27QrNyr%QkXtLggvuANh((gp! z{`6mHG^&W?kmnD{qR!Yatox10b!#=oHlhg~H^X@zUqkF6`){?|t@k}a=uV$Djj3cQ z*3LZO+-&8sEjU4&|)kE*TVJKL7cQZi<*&Qt(NwMBKk-;~-l`GdFZ zRMKa4!K1`@_JmKj^;N4V zuDX5?zOObr{-$Yg`k4Si*5+)xFQH*O?vW{mf`@tWhm*2O`EC zM@c&YRqbf)h^-hjrfA`Zl7g+G8RfbpYv*sat5G49{$OY>e`J=rTswEYxy;q&uMK{j ziSiBIr_q{9&s`~ds*;NhclXcBCGzQ-Y_9J%tXSBLe93=$2K@WJlkeV!)qG&=1~L3f zZ2#_3Sksb3)It9*!vO&20Dq$(*)*3={J$sv`V^c1z@POO*1~2$$ul4>v%3Z~!2c}# z5<`g75;OjchgD4fq+SdA#s~oTx%)dqob3JWA&vol{@$Llj(&ds%aDAM%L6(KD@^9W LY18ZE{*wF`(OweA delta 2688 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 UzxM#Zg9IXJ5O-RDANQmACzOdmGynhq delta 2401 zcmZ{mdpOg78^?!XQ*)T1#K=g?aYKki6j3?M*?tZUC1ztz6}~DIGHf}7tSL%!D9!n_ zG%2TILX?zKzZ@#0mFTDEdip(w>v`_$zOTK?>iQJv$Vh07a70eHUYvfef zwd#F)S1W70MF%eb9Df<9OVx`)9y-*X8r^!PZ77W-zEQIRK5=TDEW7#wc?O$TRXBCK zhmmX>s8XMm z7Dx12cyEcWu9kGCwXB2ciWJ<}wJ7t_9)L+kZFI^%#%i%ZS`2@uSxVcRsPFH?loS^W z6*HSz3X32nL*k0l!=;UzEunU zf&WDM6!!8!>lLf*u1Z(bJFNEQ?CE3qly~B1u9x0YA7+g^9B3>a2L7}-DiAO8Ld8MK zD|k5J_7U#P0gPxvi&c;&234MVE=T`Fs9CWG4lR82xUs%%<3-5|;#I6*>5n6NGsqJX zg9bPQT^OdF4LiYDT!!BB%{BW-U`QkrXM0LMETC>nSvTdOX^#-yH_#1>@n!1@h!%_J zIOpaij_p@R#AIy&; z*vA8*rs&EKbPheqtp9+uw% zTw~+FmHzN5HPUesBVOZU=-vFNyFVWx92`Fh&rw*rMw+|iDtw zl05rX*iH7S!lrhxq9?a<%OnS-haLZz>@2CUlL8(2qF|;B|P=EmJHl3U2yKc4e<;=u6>#)5k}unr*)G6kAV=jI1wWyg%b}drH+^ zd{r9T2Mth@gRx@$YM;t_1JAmJPPW&)SQ|m~!$Y0H!yTObp9C&lz|*@#?%XrucG@30 zeSxHkcMFopqELRwKzFOhe58(NUHGv%!b<_1AlNQze_^+$EwBgarf>n0PdwO;fS5-=8*9`dPNrU^U z+LM5yZKDa7053|x)a}*IGk9cL+F)pX;CZ<(ege z)vqwfmTy=PeJgKe>#ihlW{Gdx!ROoai(X|OR-B!0Yd@PVb4zpMvap3Aq}CmH?%-Ug zoZk@%@|0YB*@4W~ERkxA+FBe#$^oF%5%EIMoh5;8=A7w4U7b?nw~_$#NLmJ4(is+xy=g+NYZ-Gy-wE@WnOGkg;3Q z7*uk}&UU%L8F4qeYu>Cn3TUU%YTxeT99{p=lIOT`ZbYtFt~eHUGxaM!Ge z`KN$a@%6W_>jBp*v^z}&tlPE+UhVO`YOi_ANNcX!Hu^1NIfe&Oau1vM5I$h(kPryR zuG&C*8cPZz9ovFo#}Z>BsOvCdSoO{^wfk+>N(y4a46SL8^v9l`$Sn_$7I80~SP9LkRsJ=GZj-u3EZw zyyEVESN?tHq(Pv~{<~_=KNO;YWj4bI2>#apuQvw|(=iJs%AF=Z3(bkN_PDDKeZuZ-c4O(SW4Lc-$}PUznUQ AkN^Mx diff --git a/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip b/core/module/install/ressource/themes/theme_sansbanniere_fluide.zip index fce41fac89de8ae8a434bf182b02a66c692a53e8..49ef8b4c92ed0c41e83b5364a11002c10b449af8 100644 GIT binary patch delta 2895 zcmZ{mXH*jk5`{y85_&ZuGyw^UKtLb}0@4u#1mYq!^iZTq4K*av%cBLPh!iObN_%vX zj`S9!OO+mq2#QEs-=4F__x7Bfe{*K;oquybLMO1G6UeEr4WeWN00CgYGnASk08vJ! zqyzxMnE(K`l>J;N?yZrl^Jf{R^X8UzN(MK+ESU!>u15jkwOrfE&&;HkcC~qXzIRTj zr^SgB_okj7arTydo~g>JHLG}4=&<4+Z2$F3TU!f0h7aEcU2kj36txVCbdc*pP}e50 z$uhcMVr8KK!H!oZr|mYdIgvxBK^r=E86t)Y9aZ>)&sqaKaBtbDmnrK>i6V)FTf$%7 z^}Na_IH$9`X3Yg_3LjDxC=CRg2PJpK(%0o)z`8Wc)L3&nQ3dGBdc~>^0TIJ48*xL5 zrkEUUtYjDu^biIAiY4;6gpFvN2@F&5D`;|bZDo%3$P6_ht#75H>@o?2AQ5R3bIr|vvs8*nBh+z(#d@1?&v2u6v zUuo_<*Ms$fT2mdQryjy|c`Lau9u`8o_mUp@L`rGHWKZcOgo(8)sAv-_j^JxfVr$=f z3%Oq#wsoed?CJV3<<-8g6AA6%-R%x~+DYZFYDcA`Oc2MIZ%jM!U1n*HfE3M-WT5G? zy@u0p-gl#Eorq6&ZN+$en1YV{0{wuCvWk6DJm#7(ucb2TSkeo0yv^_!o1IcsnlGK!d8y`N;F32^8_j-w?$M}3-mHmB?rA7T_=v#(=b-a9U{4*)7MMlnBW_{{7hO!27 zbx81dvv56olgCnYcf)3a#zfUO>EzxMg-2Y^c9(F?~p^v1D^~-uM9`?UNurUrv0XY2x9kcJ2#`(VNvSCLa}n_gP5t zV^-Qq}4+6Vf+iGQRUvckQDt-&mte-j*XKoyWoMRqy?cjmydNQXN`=dynKA+MO|Zq z_*8fL*LPGumtsh&8iLFmq<~}@1jNa;J^pw%p)V&bhZ*@P-*bm;t|Z4F`YjD~-f<%I z<;`1E7T1;{d8TOV{0A^&D*gt!v?B&^PmPWXr|6fhvgsT0r-MToF>k((K6^qy&Tl+% zFLSV)G2sIA&tHLWJwTsd0stVp%Y8&iz$O=v($h~ZtMPla`8{TBN+|U_g~o?ZaP`x@Kxsj|K*8pWP?hbAoScQg5XE(Oo5^VIz$I+$=Z6cG+>KH1 z)3E~H8*^Xp21(*L56p*bSV$Zhm=7d$s9T7b;~#euZx)EJuMX0r^3&^xKA>mh9sZ{hzqwv(*e5jpl5# z{LLUni%I#J@nAu{Z6JAFWT_ojuVt5(&tV)q1GZQl6Eihl6GY1a?NJ_=oZA;1uQjn0Twe0+$NNn5x;gLxi7jTzT}Te3G6AnRL+ zMq-pb2eS*z{O|J^`fFiwG+**inh{!ZbC{zh`cPHFQXWkvvY^(htFK2Fx;DkW_gL^Bq6B0e?ARR+fDzmO{y}Bl5}lA57lb#t$x~Td9mK zC#7EM#2*2Q8s11&Wxub`6vW%kmS@(%jA@nYVEy#$bD~#ccG$*QSBt;R-_V51dbR;Z zT9qsE8Hom5E%({xYiPR*gkE`uV`8JIXbWQ*Ik^%g>#xDh z(HIK#LcCUj-l#39pU5@sNT+70ETJP#ev4BQ9*K)4*O$Eu^%JAL-?4(OiSUSh>jQ@m zzq{aFVlsbnVttzbW&$?$!hmTpL-T`|T7>1A`9gMkScG2d09g-jK?0vep{k0UDvFq@ zHvwkUt=$H=8oY0sEDH*~t+*Iyq`nA|_YVqkIqdZ_J;-DVt@s1L-KVTA} z%cX~{y`<&ZDSood{33GCW~DiZQj4OkDU{Pww$`l-JM|!qd{t`wt2A$(-LUtJf=S>q ziSr0t?aA&|#nesdBhBf)tPW;>w4zrAN%ftBMd71J`^NbfV@{ z5CIvKwe~UnAMEnQx|=1_8$)SQ`^vAURPQl1Ty@jS(@Cf2o#6!wEX#xW2A&rVNL1zF z%ML`H^}GAS?7ewL*{iO8Jog`Zm5Y;Wc6G<0XKT-eq;EgHCn_VL?!oQ_eSGngod6-; z@InfA3~BZFp*;w2nWurvv_%TAgD|At%kexOAJIJ+O@{68s~7^!2F4L|g(AYb?FW6I zh)3`K^LhH&fG@>c0@!`EuY-bxrocDK#TKAl0@3-}>TC&c_j9~Sas0c{cS90*$0;0% zcf*NE3OVzI3VW>+o!Aiv+V5>-;keq9JOA>>?6r?{Lk< zOyqmL7t*gN;^RP`)=43eb`^8WQ5a{gr?3=qNBYOb(7t*|xl@wZt?4AbZ%AW}5JRat zh0k}fTO$Es_9Y(SzF~fOvM{)TpRRkTIWKTWEA}fsGOhp<%pss>L7tMLZx6KC4%_t% z0CSA!s0`(>huhTut4n!1=L2O(2v-Rp2t$jT_@~U_DWcd z#=rBUxUAn^G&aRDhB}oV>G|$_8$fqniNYK oh{*p6_{|}C2Fbs?Qvd+TzX>kz8Vo5)49Jx2Jf_PVxqnUm4T|eXuK)l5 delta 2838 zcmZ{mc{CIb_r`}|vLwscMrdRx+t`b;FB2JS_$p(Gv4t$dpwu+hWFNaolPra?#gKi^ zIcQEO_Y17V>_N&}8lllO^I%$0+9BI9*CTFq)N z4^Ong2j5KO8g5Qv(%;M)JB(%GF83o9A1U1+vtHmoUVp>OvHHkgu&*d%JE#VC=Pu8{h`|_ zoH;w>mpgvr$7q-ysuL$7f+;MC$_-nPF8oAVJEw(0fm264Zm4*H3nOEL43nG{8jXIth}mf74=8TWkK(*QT< zqH~G$lQ#SEF*xcub=G3*-R|j)njo$z*$4}D`F3ldIra-HHLY2HN6*kl=@+he?QP?X zEgQHFEYftRo}rA~)}BWlC*6Y0ki7Q3_NB-T9aZ1|_wt~?!T!P)?q72N|LYFK z-|q0FuhMUw9stkw(wOeSsr1VBgi3iOSpB2Qj;-c7e*ZNl=aQX#j zJu`f0v4XIg^c(2T(|ojT#j`Uqpf}4|_;+SZ5}IQ%Ni{cRuLejy6U;A@rIZB*yQ-55 zbt{AwjKU&)m7ilr%=pcGVOLy_0T;}Ize6ZZ>_IO(f?3Pdm|6WVEQhDE)|u z4A)bd@5nspb0u}Jx>bqo-7+_RT`+bdw>icB0}W6E2y`>L7)Q`-KP=L@tR|n*IO8Kd z_wL)H#;GJ-dP#}7=4S;IruXhJ85Q*um~A@ra= zE0a`VmE)oH!%a>YERaUVOa0+JJ*{2go8`u4luK;yx}R7JK8dXq2X07WV6U%r`Z^X1 zK=9VM?av1XwWbm{(-loQ!O`(Fg|x)^o(!XpI>s+T!bRT+Y2*CxxhEq=Dj`9E(udRJ zG-!)ZI!~E4ytA`kfag>8@-OE8jKE!Q=&D2p_Mb6QjenOa&Bj!z%u{ItD)(iN2cx@( z2w`rtI)vn2{9?p2DB8OztCAbaar89bCu|IwGJV8?;%0PflDo@s zJkp8eC$VU2fBhZbqI3NG_a*g0qp=&D(a?R{NgG9hSMjf+ZAI~KGISbxPD;Iv&)smBA)u)^E+FVj8 z2uo_($aC7ztUoYjS3e7{vQOY_xx0(AEj(Grc$=|F_FKd&WJM=XmFDRryg@6iJcvil zE^ald7O&#g8nqZPn_vr5HocHw?sRw_j%Kb3#QusYdo3Pas^?sOekj2kFd6C3~-guF;!@*Ln%gs{- zJsK-FLD2PdkF~sK)LHUq74Ou;-t;Toq|T9Qm2X50=QSHeac|e5$NG6%nzzpia>PlL zZcb!B-#@((45q5aFIq#d%i?MpBMoxwQoA=Kws_$dGOCWl{$%v^rMfMC2$yL91;wfi zr4xin_1@q%$x8jT9V{%iTB+gX5gT>C@HF}`7 zNhs3jq9krk*zKHVi=9r8Wo}~qOsNlf#>YvKwd;uW|A3Jmfd8Edl^CW;Aj2Pi{C6@x zmrfAj1pW`A{GB9!t2&9DDB$*Y^Z%y{0PrVs{#G^q5*+}5ar1MMM&I?jEA8j%fgN@ug#Q%XX0l2Z$VN6kr!Bvhb2uA5unbO He'; -echo ''; +if ($this->getData(['page', $this->getUrl(2), 'moduleId']) === 'snipcart' ){ + echo ''; +} else { + echo ''; +} echo ''; echo template::formOpen('pageEditForm'); ?> diff --git a/core/module/theme/lang/en/lex_theme.php b/core/module/theme/lang/en/lex_theme.php index fc82c15..d2795ab 100644 --- a/core/module/theme/lang/en/lex_theme.php +++ b/core/module/theme/lang/en/lex_theme.php @@ -134,7 +134,7 @@ $text['core_theme_view']['header'][2] = 'Settings'; $text['core_theme_view']['header'][3] = 'Position'; $text['core_theme_view']['header'][4] = 'Type of content'; $text['core_theme_view']['header'][5] = 'Maximum height'; -$text['core_theme_view']['header'][6] = 'The maximum height is 600 pixels, even if the selected image size is larger.
When the adaptation is set to Responsive, the height decreases in proportion to the width.'; +$text['core_theme_view']['header'][6] = 'The maximum height is 600 pixels, even if the selected image size is larger.'; $text['core_theme_view']['header'][7] = 'Width'; $text['core_theme_view']['header'][8] = 'Hide banner in small screen'; $text['core_theme_view']['header'][9] = 'Align banner with content'; @@ -152,7 +152,7 @@ $text['core_theme_view']['header'][20] = 'Character case'; $text['core_theme_view']['header'][21] = 'Proportional to that defined in the site'; $text['core_theme_view']['header'][22] = 'Content alignment'; $text['core_theme_view']['header'][23] = 'Wallpaper'; -$text['core_theme_view']['header'][24] = 'Select an image with the following recommended dimensions'; +$text['core_theme_view']['header'][24] = 'Select an image, tips in the documentation'; $text['core_theme_view']['header'][25] = 'Image'; $text['core_theme_view']['header'][26] = 'Repeat'; $text['core_theme_view']['header'][27] = 'Adaptation'; @@ -164,6 +164,7 @@ $text['core_theme_view']['header'][32] = ' | ratio : '; $text['core_theme_view']['header'][33] = 'Custom content'; $text['core_theme_view']['header'][34] ='Save'; $text['core_theme_view']['header'][35] = "Height of the selected image ("; +$text['core_theme_view']['header'][36] = "Banner only visible on the home page"; $text['core_theme_view']['index'][0] = 'Click on an area to access its customisation options. You can also display hidden areas using the button below'; $text['core_theme_view']['index'][1] = 'Home'; $text['core_theme_view']['index'][2] = 'Help'; @@ -370,7 +371,7 @@ $headerFontSizes = [ '2.4vmax' => 'Very large (240%)' ]; $headerHeights = [ - 'unset' => 'Free', // texte dynamique cf header.js.php + 'unset' => 'Content height', '100px' => 'Very small (100px) ', '150px' => 'Small (150px)', '200px' => 'Medium (200px)', diff --git a/core/module/theme/lang/fr/lex_theme.php b/core/module/theme/lang/fr/lex_theme.php index 745d8af..2edb1b2 100644 --- a/core/module/theme/lang/fr/lex_theme.php +++ b/core/module/theme/lang/fr/lex_theme.php @@ -134,7 +134,7 @@ $text['core_theme_view']['header'][2] = 'Paramètres'; $text['core_theme_view']['header'][3] = 'Position'; $text['core_theme_view']['header'][4] = 'Nature de contenu'; $text['core_theme_view']['header'][5] = 'Hauteur maximale'; -$text['core_theme_view']['header'][6] = 'La hauteur maximale est de 600 pixels, même si les dimensions de l\'image sélectionnée sont supérieures.
Lorsque l\'adaptation est positionnée sur Responsive, la hauteur diminue proportionnellement à la largeur.'; +$text['core_theme_view']['header'][6] = 'La hauteur maximale est de 600 pixels, même si les dimensions de l\'image sélectionnée sont supérieures.'; $text['core_theme_view']['header'][7] = 'Largeur'; $text['core_theme_view']['header'][8] = 'Masquer la bannière en écran réduit'; $text['core_theme_view']['header'][9] = 'Aligner la bannière avec le contenu'; @@ -152,7 +152,7 @@ $text['core_theme_view']['header'][20] = 'Casse'; $text['core_theme_view']['header'][21] = 'Proportionnelle à celle définie dans le site.'; $text['core_theme_view']['header'][22] = 'Alignement du contenu'; $text['core_theme_view']['header'][23] = 'Papier peint'; -$text['core_theme_view']['header'][24] = 'Sélectionner une image aux dimensions recommandées ci-dessous'; +$text['core_theme_view']['header'][24] = 'Sélectionner une image, conseils dans la documentation'; $text['core_theme_view']['header'][25] = 'Image'; $text['core_theme_view']['header'][26] = 'Répétition'; $text['core_theme_view']['header'][27] = 'Adaptation'; @@ -164,6 +164,7 @@ $text['core_theme_view']['header'][32] = ' | ratio : '; $text['core_theme_view']['header'][33] = 'Contenu personnalisé'; $text['core_theme_view']['header'][34] ='Enregistrer'; $text['core_theme_view']['header'][35] = "Hauteur de l\'image sélectionnée ("; +$text['core_theme_view']['header'][36] = "Bannière visible uniquement sur la page d'accueil"; $text['core_theme_view']['index'][0] = 'Cliquez sur une zone afin d\'accéder à ses options de personnalisation. Vous pouvez également afficher les zones cachées à l\'aide du bouton ci-dessous.'; $text['core_theme_view']['index'][1] = 'Accueil'; $text['core_theme_view']['index'][2] = 'Aide'; @@ -369,7 +370,7 @@ $headerFontSizes = [ '2.4vmax' => 'Très grande (240%)' ]; $headerHeights = [ - 'unset' => 'Libre', // texte dynamique cf header.js.php + 'unset' => 'Hauteur du contenu', '100px' => 'Très petite (100px) ', '150px' => 'Petite (150px)', '200px' => 'Moyenne (200px)', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index c07f1cb..8fb5379 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -434,7 +434,7 @@ class theme extends common { 'font' => $this->getInput('themeHeaderFont'), 'fontSize' => $this->getInput('themeHeaderFontSize'), 'fontWeight' => $this->getInput('themeHeaderFontWeight'), - 'height' => $this->getInput('themeHeaderHeight'), + 'heightSelect' => $this->getInput('themeHeaderHeight'), 'wide' => $this->getInput('themeHeaderWide'), 'image' => $this->getInput('themeHeaderImage'), 'imagePosition' => $this->getInput('themeHeaderImagePosition'), @@ -449,7 +449,8 @@ class theme extends common { 'imageContainer' => $this->getInput('themeHeaderImageContainer'), 'tinyHidden' => $this->getInput('themeHeaderTinyHidden', helper::FILTER_BOOLEAN), 'feature' => $this->getInput('themeHeaderFeature'), - 'featureContent' => $featureContent + 'featureContent' => $featureContent, + 'homePageOnly' => $this->getInput('themeHeaderHomePageOnly', helper::FILTER_BOOLEAN) ]]); // Modification de la position du menu selon la position de la bannière if ( $this->getData(['theme','header','position']) == 'site' ) @@ -466,6 +467,20 @@ class theme extends common { ) { $this->setData(['theme', 'menu', 'position','site']); } + // Suppression de l'image en contenu personnalisé + if( $this->getData(['theme','header','feature']) == 'feature'){ + $this->setData(['theme','header', 'image',""]); + } + // Application de la hauteur de l'image sélectionnée si hauteur de l'image sur hauteur du contenu + if( $this->getData(['theme', 'header', 'feature']) ==='wallpaper' && + $this->getData(['theme', 'header', 'image']) !== '' && + $this->getData(['theme', 'header', 'heightSelect']) === 'unset' ){ + $infoImage = getimagesize( self::FILE_DIR.'source/'. $this->getData(['theme', 'header', 'image']) ); + $this->setData(['theme', 'header', 'height', $infoImage[1]."px"]); + } else { + // Si pas d'image ou bannière personnalisée + $this->setData(['theme', 'header', 'height', $this->getData(['theme', 'header', 'heightSelect']) ]); + } // Valeurs en sortie $this->addOutput([ diff --git a/core/module/theme/view/header/header.css b/core/module/theme/view/header/header.css index 1ae84fd..ab378e8 100644 --- a/core/module/theme/view/header/header.css +++ b/core/module/theme/view/header/header.css @@ -27,4 +27,8 @@ text-transform: none; font-size: 1.0em; margin: 10px; +} + +#site { + overflow: visible; } \ No newline at end of file diff --git a/core/module/theme/view/header/header.js.php b/core/module/theme/view/header/header.js.php index 2d7a728..4ee9cb9 100644 --- a/core/module/theme/view/header/header.js.php +++ b/core/module/theme/view/header/header.js.php @@ -13,8 +13,12 @@ * @author Frédéric Tempez * @copyright Copyright (C) 2018-2021, Frédéric Tempez */ + - $(document).ready(function(){ +var tmpImg = new Image(); + + +$(document).ready(function(){ $("header").css("line-height", ""); $("header").css("height", ""); }); @@ -28,73 +32,49 @@ $("input, select").on("change", function() { // Contenu perso if ($("#themeHeaderFeature").val() == "feature") { - - css = "header{min-height: " + $("#themeHeaderHeight").val() + ";height:" + $("#themeHeaderHeight").val() + "; overflow:hidden; background-position:top; background-repeat: no-repeat; line-height:1.15; background-color:unset; background-image:unset; text-align:unset;}"; + // $("#themeHeaderHeight").val() unset pour 'Hauteur du contenu', sinon valeur en px + css = "header{min-height: 20px; height:" + $("#themeHeaderHeight").val() + "; overflow:hidden; background-position:top; background-repeat: no-repeat; line-height:1.15; background-color:unset; background-image:unset; text-align:unset;}"; $("#featureContent").appendTo("header").show(); $("#themeHeaderTitle").hide(); - - // Modifier le texte du sélecteur de hauteur - $("#themeHeaderHeight option:eq(0)").text("Hauteur du contenu personnalisé"); - } // Couleurs, image, alignement et hauteur de la bannière if ($("#themeHeaderFeature").val() == "wallpaper") { - + // Masque le contenu perso $("#featureContent").hide(); - // Récupérer la taille de l'image - var tmpImg = new Image(); + + tmpImg.src= "" + "site/file/source/" + $("#themeHeaderImage").val(); + // Déterminer la taille de l'image tmpImg.onload = function() { // Informations affichées $("#themeHeaderImageHeight").html(tmpImg.height + "px"); $("#themeHeaderImageWidth").html(tmpImg.width + "px"); $("#themeHeaderImageRatio").html(tmpImg.width / tmpImg.height); - - // Limiter la hauteur à 600 px - if (tmpImg.height > 600) { - tmpImgHeight = 600; - } else { - tmpImgHeight = tmpImg.height; - } - - //Modifier la dropdown liste si une image n'est pas sélectionnée - if ($("#themeHeaderImage").val() !== "" ) { - // Une image est ajoutée ou changée - if ($("#themeHeaderHeight option").length === 5) { - // Pas d'image précédemment on ajoute l'option - $("#themeHeaderHeight ").prepend(''); - } - // Modifier la valeur - $("#themeHeaderHeight option:eq(0)").val(tmpImgHeight + "px"); - // Modifier l'option - $("#themeHeaderHeight option:eq(0)").html( textOption + tmpImgHeight + "px)"); - } }; - - if ($("#themeHeaderImage").val() === "" && - $("#themeHeaderHeight option").length === 6 ) { - $("#themeHeaderHeight option:eq(0)").remove(); - } - - tmpImg.src= "" + "site/file/source/" + $("#themeHeaderImage").val(); - + var headerFont = $("#themeHeaderFont").val(); - - css = "header{text-align:" + $("#themeHeaderTextAlign").val() + ";"; - if ($("#themeHeaderImage").val()) { - // Une image est sélectionnée - css += "background-image:url('site/file/source/" + $("#themeHeaderImage").val() + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + ";"; - css += "background-size:" + $("#themeHeaderImageContainer").val() + ";"; - // Pas d'image sélectionnée + css = "header{text-align:" + $("#themeHeaderTextAlign").val() + ";"; + + // Sélection d'une image réalisée + if( $("#themeHeaderImage").val() !== ""){ + + css += "background-image:url('site/file/source/" + $("#themeHeaderImage").val() + "');background-repeat:" + $("#themeHeaderImageRepeat").val() + ";background-position:" + $("#themeHeaderImagePosition").val() + ";"; + css += "background-size:" + $("#themeHeaderImageContainer").val() + ";"; + if( $("#themeHeaderHeight").val() !== 'unset'){ + css += "line-height:" + $("#themeHeaderHeight").val() + ";height:" + $("#themeHeaderHeight").val() + "}"; } else { - // Désactiver l'option responsive - css += "background-image:none;"; + // valeur unset remplacée par la hauteur de l'image + tmpImg.src= "" + "site/file/source/" + $("#themeHeaderImage").val(); + css += "line-height:" + tmpImg.height + "px" + ";height:" + tmpImg.height + "px" + "}"; } - css += "line-height:" + $("#themeHeaderHeight").val() + ";height:" + $("#themeHeaderHeight").val() + "}"; - + } else { + // Pas d'image sélectionnée + css += "background-image:none;"; + css += "min-height: 20px;line-height:" + $("#themeHeaderHeight").val() + "; height:" + $("#themeHeaderHeight").val() + "}"; + } // Taille, couleur, épaisseur et capitalisation du titre de la bannière css += "header span{font-family:'" + headerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeHeaderFontWeight").val() + ";font-size:" + $("#themeHeaderFontSize").val() + ";text-transform:" + $("#themeHeaderTextTransform").val() + ";color:" + $("#themeHeaderTextColor").val() + "}"; @@ -118,8 +98,8 @@ $("input, select").on("change", function() { switch(positionHeader) { case 'hide': - $("header").hide(); $("nav").show().prependTo("#site"); + $("header").hide(); break; case 'site': $("header").show().prependTo("#site"); @@ -210,7 +190,7 @@ $("#themeHeaderImage").on("change", function() { } else { $("#themeHeaderImageOptions").slideUp(function() { - $("#themeHeaderTextHide").prop("checked", false).trigger("change"); + // $("#themeHeaderTextHide").prop("checked", false).trigger("change"); }); } }).trigger("change"); @@ -244,9 +224,11 @@ $("#themeHeaderPosition").on("change", function() { $("#themeHeaderPosition").on("change", function() { if($(this).val() === 'hide') { $("#themeHeaderSmallDisplay").slideUp(); + $("#themeHeaderHomePage").slideUp(); } else { $("#themeHeaderSmallDisplay").slideDown(); + $("#themeHeaderHomePage").slideDown(); } }).trigger("change"); diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php index 93c37ef..69e4e9e 100644 --- a/core/module/theme/view/header/header.php +++ b/core/module/theme/view/header/header.php @@ -60,17 +60,18 @@ echo template::formOpen('themeHeaderForm');
$text['core_theme_view']['header'][5], - 'selected' => $this->getData(['theme', 'header', 'height']), + 'selected' => $this->getData(['theme', 'header', 'heightSelect']), 'help' => $text['core_theme_view']['header'][6] ]); ?>
-
- $text['core_theme_view']['header'][7], - 'selected' => $this->getData(['theme', 'header', 'wide']) - ]); ?> +
+
+ $this->getData(['theme', 'header', 'homePageOnly']) + ]); ?> +
@@ -87,6 +88,16 @@ echo template::formOpen('themeHeaderForm');
+ +
+
+ $text['core_theme_view']['header'][7], + 'selected' => $this->getData(['theme', 'header', 'wide']) + ]); ?> +
+
+
@@ -237,5 +248,5 @@ echo template::formOpen('themeHeaderForm'); \ No newline at end of file diff --git a/module/agenda/agenda.php b/module/agenda/agenda.php index 98fb03f..b9e70f4 100644 --- a/module/agenda/agenda.php +++ b/module/agenda/agenda.php @@ -36,7 +36,7 @@ class agenda extends common { 'index' => self::GROUP_VISITOR ]; - const VERSION = '5.3'; + const VERSION = '5.4'; const REALNAME = 'Agenda'; const DELETE = true; const UPDATE = '4.1'; @@ -116,9 +116,9 @@ class agenda extends common { copy( './module/agenda/ressource/file/source/agenda/adresses/.htaccess', './site/file/source/agenda/adresses/.htaccess'); $this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.2']); } - // Mise à jour vers la version 5.3 - if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.3', '<') ) { - $this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.3']); + // Mise à jour vers la version 5.4 + if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.4', '<') ) { + $this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.4']); } } @@ -628,7 +628,6 @@ class agenda extends common { else{ self::$liste_adresses= array_combine(self::$liste_adresses,self::$liste_adresses); } - $this->limite_groupes(); // Tableau des catégories if( is_file(self::DATAMODULE.'categories/categories.json') && $this->getData(['module', $this->getUrl(0), 'categories', 'valCategories' ]) ){ $json = file_get_contents(self::DATAMODULE.'categories/categories.json'); @@ -756,7 +755,6 @@ class agenda extends common { self::$categorie[$key] = $tabcat[$key]['name']; } } - $this->limite_groupes(); if( $this->getUser('group') >= self::$evenement['groupe_mod']){ // Affichage de la page édition d'un évènement avec les valeurs actuelles @@ -1082,26 +1080,6 @@ class agenda extends common { } return $json; } - - /* Limitation des choix pour les groupes lecture et modification avant création ou édition - */ - private function limite_groupes() { - //Modification du tableau self::$groupe si case cochée en configuration - if ($this->getData(['module', $this->getUrl(0), 'config', 'droit_limite']) - && $this->getUser('group') >= self::$evenement['groupe_mod']){ - switch ($this->getUser('group')) { - case 0 : - array_splice(self::$groupe,1); - break; - case 1 : - array_splice(self::$groupe,2); - break; - case 2 : - array_splice(self::$groupe,3); - break; - } - } - } /* * Extraction des données de la chaîne url et détection de changement de vue diff --git a/module/agenda/view/creation/creation.php b/module/agenda/view/creation/creation.php index a58b001..2b998f2 100644 --- a/module/agenda/view/creation/creation.php +++ b/module/agenda/view/creation/creation.php @@ -12,6 +12,25 @@ echo ''; echo ''; +// $this->getUser('group') renvoie false pour un visiteur ! +$userGroup = $this->getUser('group'); +if( $userGroup === false) $userGroup = 0; + +//Modification du tableau $groupe si l'option "limitation du choix des groupes liés aux évènements" est cochée +if ( $this->getData(['module', $this->getUrl(0), 'config', 'droit_limite']) ){ + switch ($userGroup) { + case 0 : + array_splice($groupe,1); + break; + case 1 : + array_splice($groupe,2); + break; + case 2 : + array_splice($groupe,3); + break; + } +} + echo template::formOpen('creation_events'); ?>
diff --git a/module/agenda/view/edition/edition.php b/module/agenda/view/edition/edition.php index f547358..d2443c5 100644 --- a/module/agenda/view/edition/edition.php +++ b/module/agenda/view/edition/edition.php @@ -12,10 +12,9 @@ var lang_flatpickr = ""; echo ''; echo ''; echo ''; -?> - -getUser('group') >= $module::$evenement['groupe_mod'] ){ +// Adaptation de Tinymce en fonction des droits des utilisateurs +if( $this->getUser('group') >= $module::$evenement['groupe_mod'] ){ if( $this->getUser('group') >= 2){ $class_tinymce = 'editorWysiwyg'; } @@ -23,9 +22,27 @@ echo 'getData(['module', $this->getUrl(0), 'config', 'droit_limite']) ){ + switch ($userGroup) { + case 0 : + array_splice($groupe,1); + break; + case 1 : + array_splice($groupe,2); + break; + case 2 : + array_splice($groupe,3); + break; + } +} + +echo template::formOpen('edition_events'); ?>