diff --git a/core/core.js.php b/core/core.js.php index 46a84452..abe89d1f 100644 --- a/core/core.js.php +++ b/core/core.js.php @@ -243,7 +243,7 @@ core.start = function() { ?> document.cookie = "=true;" + expires +";"+ samesite; }); - $(".cookieBox .cookieClose").on("click", function() { + $("#cookieConsent .cookieClose").on("click", function() { $(this).parents("#cookieConsent").fadeOut(); }); diff --git a/core/core.php b/core/core.php index 32e90b36..ad04608a 100644 --- a/core/core.php +++ b/core/core.php @@ -1193,20 +1193,19 @@ class common { $cookieName = 'ZWII_COOKIE_CONSENT'.str_replace('_index.php','',str_replace( '/','_',$_SERVER['PHP_SELF'])); if($this->getInput($cookieName) !== 'true' AND $this->getData(['config','cookieConsent']) === true){ ?>
diff --git a/core/layout/common.css b/core/layout/common.css index f973af89..7a22d659 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -999,7 +999,7 @@ footer #footerSocials .zwiico-github:hover { font-size: 1em; } -#cookieConsentConfirm, #cookieConsentRefuse { +#cookieConsentConfirm { cursor: pointer; margin-left: 10px; background: #666; @@ -1008,21 +1008,16 @@ footer #footerSocials .zwiico-github:hover { transition: background .3s ease-out; } -#cookieConsentConfirm:hover, #cookieConsentRefuse:hover { +#cookieConsentConfirm:hover { background: #777; } -.cookieBox { -position: relative; -width: 15px; -height: 15px; -border: 1px solid blue; -} -.cookieBox .cookieClose { -position: absolute; -right: 2px; -top: -2px; -cursor: pointer; +#cookieConsent .cookieClose { + position: absolute; + right: 5px; + top: 0px; + font-size: 1.5em; + cursor: pointer; } /* Bloc */ diff --git a/core/module/config/config.php b/core/module/config/config.php index f7c9dd30..b879de17 100644 --- a/core/module/config/config.php +++ b/core/module/config/config.php @@ -287,7 +287,7 @@ class config extends common { public function restore() { // Soumission du formulaire if($this->isPost() ) { - + $success = false; if ($this->getInput('configRestoreImportFile', null, true) ) { @@ -422,7 +422,7 @@ class config extends common { ){ $this->setData(['theme', 'footer', 'displayLegal', false]); } - + // Sauvegarder les locales $this->setData([ 'locale', @@ -503,6 +503,13 @@ class config extends common { 'it' => $this->getData(['config', 'i18n', 'it']), 'nl' => $this->getData(['config', 'i18n', 'nl']), 'pt' => $this->getData(['config', 'i18n', 'pt']) + ], + 'cookies' => [ + 'cookiesZwiiText' => $this->getInput('connectCookiesZwiiText', helper::FILTER_STRING_LONG), + 'cookiesGaText' => $this->getInput('connectCookiesGaText', helper::FILTER_STRING_LONG), + 'cookiesTitleText' => $this->getInput('connectCookiesTitleText', helper::FILTER_STRING_SHORT), + 'cookiesLinkMlText' => $this->getInput('connectCookiesLinkMlText', helper::FILTER_STRING_SHORT), + 'cookiesCheckboxGaText' => $this->getInput('connectCookiesCheckboxGaText', helper::FILTER_STRING_SHORT) ] ] ]); diff --git a/core/module/config/view/connect/connect.php b/core/module/config/view/connect/connect.php index 1c618999..89057347 100644 --- a/core/module/config/view/connect/connect.php +++ b/core/module/config/view/connect/connect.php @@ -2,9 +2,9 @@