diff --git a/core/core.js.php b/core/core.js.php index 56a548dd..c4815a35 100644 --- a/core/core.js.php +++ b/core/core.js.php @@ -240,30 +240,6 @@ core.start = function() { document.cookie = "ZWII_COOKIE_CONSENT=;" + domain + ";" + path + ";" + samesite + ";" + expires; }); - /** - * Suppression du cookie de consentement - - $('#cookieConsentRefused').on('click', function() { - - var samesite = "samesite=lax"; - var getUrl = window.location; - var domain = "domain=" + getUrl.host; - var path = "path=" + getUrl.pathname.split('/')[1]; - var samesite = "samesite=lax"; - var e = new Date(); - e.setFullYear(e.getFullYear() - 1); - var expires = "expires=" + e.toUTCString(); - document.cookie = "ZWII_COOKIE_CONSENT=false;" + domain + ";" + path + ";" + samesite + ";" + expires; - - // Désactiver le cookie GA - document.cookie = "ZWII_COOKIE_GA_CONSENT=false;" + domain + ";" + path + ";" + samesite + ";" + expires; - - - - // fermer la fenêtre - $("#cookieConsent").fadeOut(); - }); - */ /** * Fermeture de la popup des cookies diff --git a/core/core.php b/core/core.php index 2a114038..42503d82 100644 --- a/core/core.php +++ b/core/core.php @@ -1483,7 +1483,7 @@ class common { $items .= $this->getData(['theme','footer','displaySearch']) === false ? ' class="displayNone" >' : '>'; $label = empty($this->getData(['locale','searchPageLabel'])) ? 'Rechercher' : $this->getData(['locale','searchPageLabel']); if ($this->getData(['locale','searchPageId']) !== 'none') { - $items .= ' | ' . $label .''; + $items .= ' | ' : '>'; $label = empty($this->getData(['locale','legalPageLabel'])) ? 'Mentions Légales' : $this->getData(['locale','legalPageLabel']); if ($this->getData(['locale','legalPageId']) !== 'none') { - $items .= ' | ' . $label .''; + $items .= ' | ' . $label .''; } $items .= ''; // Affichage de la gestion des cookies $items .= 'getData(['config', 'cookieConsent']) === true && $this->getData(['theme', 'footer', 'displayCookie']) === true) ? '' : ' class="displayNone" >'; - $label = empty($this->getData(['locale', 'cookies', 'cookiesFooterText'])) ? 'Confidentialité' : $this->getData(['locale', 'cookies', 'cookiesFooterText']) ; - $items .= ' | '. $label .''; + $items .= ($this->getData(['config', 'cookieConsent']) === true && $this->getData(['theme', 'footer', 'displayCookie']) === true) ? '>' : ' class="displayNone" >'; + $label = empty($this->getData(['locale', 'cookies', 'cookiesFooterText'])) ? 'Cookies' : $this->getData(['locale', 'cookies', 'cookiesFooterText']) ; + $items .= ' | '. $label .''; $items .= ''; // Affichage du lien de connexion if( diff --git a/core/module/config/view/locale/locale.php b/core/module/config/view/locale/locale.php index 5056975a..155418c6 100644 --- a/core/module/config/view/locale/locale.php +++ b/core/module/config/view/locale/locale.php @@ -148,9 +148,9 @@
'Confidentialité des cookies', + 'label' => 'Cookies', 'value' => $this->getData(['locale', 'cookies', 'cookiesFooterText']), - 'placeHolder' => 'Confidentialité' + 'placeHolder' => 'Cookies' ]); ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 673e370f..c03eef9b 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -80,7 +80,7 @@ class init extends common { 'cookiesTitleText' => 'Gérer les cookies', 'cookiesLinkMlText' => 'Consulter les mentions légales', 'cookiesCheckboxGaText' => 'Autorisation des cookies Google Analytics', - 'cookiesFooterText' => 'Confidentialité', + 'cookiesFooterText' => 'Cookies', 'cookiesButtonText' => 'J\'ai compris' ] ], diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index c336bc21..2060c00f 100644 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -89,9 +89,9 @@ ]); ?>
- $this->getData(['config', 'cookieConsent']) === true ? $this->getData(['theme', 'footer', 'displayCookie']) : false, - 'help' => 'Affiche le message relatif au cookie, disponible si le message d\'acceptation des cookies est activé.', + 'help' => 'Message d\'information relatif aux cookies, disponible si l\'acceptation des cookies est activé.', 'disabled' => !$this->getData(['config', 'cookieConsent']) ]); ?>