lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

11.1.00 réécriture aperçu header / menu

Browse Source
This commit is contained in:
Fred Tempez 2021-10-10 14:41:13 +02:00
parent ba107ac872
commit 00bd01edae
2 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/module/theme/theme.php
View File

@ -451,10 +451,10 @@ class theme extends common {
{ {
$this->setData(['theme', 'menu', 'position',str_replace ('site-','body-',$this->getData(['theme','menu','position']))]); $this->setData(['theme', 'menu', 'position',str_replace ('site-','body-',$this->getData(['theme','menu','position']))]);
} }
// Menu accroché à la bannière qui devient cachée
if ( $this->getData(['theme','header','position']) == 'hide' && if ( $this->getData(['theme','header','position']) == 'hide' &&
( $this->getData(['theme','menu','position']) == 'body-first' || in_array( $this->getData(['theme','menu','position']) , ['body-first', 'site-first', 'body-first' , 'site-second'])
$this->getData(['theme','menu','position']) == 'site-first') ) ) {
{
$this->setData(['theme', 'menu', 'position','site']); $this->setData(['theme', 'menu', 'position','site']);
} }
// Valeurs en sortie // Valeurs en sortie

71
core/module/theme/view/header/header.js.php
View File

@ -104,35 +104,68 @@ $("input, select").on("change", function() {
css += 'header{margin:0}'; css += 'header{margin:0}';
} }
// Position de la bannière // Position de la bannière
switch($("#themeHeaderPosition").val()) { var positionNav = <?php echo json_encode($this->getData(['theme', 'menu', 'position'])); ?>;
var positionHeader = $("#themeHeaderPosition").val();
switch(positionHeader) {
case 'hide': case 'hide':
$("header").hide(); $("header").hide();
$("nav").show().prependTo("#site");
break; break;
case 'site': case 'site':
if(<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'site-first'); ?>) { $("header").show().prependTo("#site");
$("header").show().insertAfter("nav"); // Position du menu
} switch (positionNav) {
else { case "body-first":
$("header").show().prependTo("#site"); $("nav").show().insertAfter("header");
// Supprime le margin en trop du menu break;
if(<?php echo json_encode($this->getData(['theme', 'menu', 'margin'])); ?>) { case "site-first":
css += 'nav{margin:0 20px}'; $("nav").show().prependTo("#site");
} // Supprime le margin en trop du menu
if(<?php echo json_encode($this->getData(['theme', 'menu', 'margin'])); ?>) {
css += 'nav{margin:0 20px}';
}
break;
case "body-second":
case "site-second":
$("nav").show().insertAfter("header");
// Supprime le margin en trop du menu
if(<?php echo json_encode($this->getData(['theme', 'menu', 'margin'])); ?>) {
css += 'nav{margin:0 20px}';
}
break;
} }
break; break;
case 'body': case 'body':
if(<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'body-first'); ?>) { // Position du menu
$("header").show().insertAfter("nav"); switch (positionNav) {
case "top":
$("header").show().insertAfter("nav");
break;
case "site-first":
case "body-first":
$("header").show().insertAfter("#bar");
$("nav").show().insertAfter("#bar");
break;
case "site-second":
case "body-second":
$("header").show().insertAfter("#bar");
$("nav").show().insertAfter("header");
break;
} }
else {
$("header").show().insertAfter("#bar");
}
if(<?php echo json_encode($this->getData(['theme', 'menu', 'position']) === 'top'); ?>) {
$("header").show().insertAfter("nav");
}
break;
} }
// La bannière est cachée, déplacer le menu dans le site
if (positionHeader === "hide" &&
(positionNav === "body-first" ||
positionnav === "site-first" ||
positionnav === "body-second" ||
positionnav === "site-second"
)) {
$("nav").show().prependTo("#site");
}
// Ajout du css au DOM // Ajout du css au DOM
$("#themePreview").remove(); $("#themePreview").remove();
$("<style>") $("<style>")