ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 146 Activity

Merge branch '11200-propre' into 11200

This commit is contained in:
fredtempez 2021-11-26 14:51:38 +01:00
parent 4f4b4b292e fef670a209
commit fd5b7ba7ad
2 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/module/config/view/connect/connect.php
View File

@ -132,7 +132,6 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<div id="cookieContainer">
<div class="row"> <div class="row">
<div class="col12"> <div class="col12">
<?php echo template::textarea('connectCookiesZwiiText', [ <?php echo template::textarea('connectCookiesZwiiText', [
@ -180,4 +179,3 @@
</div> </div>
</div> </div>
</div> </div>
</div>

7
core/module/config/view/index/index.js.php
View File

@ -41,12 +41,13 @@ $( document).ready(function() {
/** /**
* Cookie * Cookie
*/ */
/*
if ($("input[name=configCookieConsent]").is(':checked')) { if ($("input[name=configCookieConsent]").is(':checked')) {
$("#cookieContainer").slideDown(); $("#cookieContainer").slideDown();
} else { } else {
$("#cookieContainer").slideUp(); $("#cookieContainer").slideUp();
} }
*/
// Gestion des événements // Gestion des événements
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -189,7 +190,7 @@ $( document).ready(function() {
/** /**
* Options des cookies * Options des cookies
*/ */
/*
$("input[name=configCookieConsent]").on("change", function() { $("input[name=configCookieConsent]").on("change", function() {
if ($("input[name=configCookieConsent]").is(':checked')) { if ($("input[name=configCookieConsent]").is(':checked')) {
$("#cookieContainer").slideDown(); $("#cookieContainer").slideDown();
@ -197,7 +198,7 @@ $( document).ready(function() {
$("#cookieContainer").slideUp(); $("#cookieContainer").slideUp();
} }
}); });
*/
var configLayout = getCookie("configLayout"); var configLayout = getCookie("configLayout");
if (configLayout == null) { if (configLayout == null) {