From c9679ec4c5e551f636e38ab89b9c041c331a8cc6 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 12 Nov 2021 12:59:58 +0100
Subject: [PATCH] =?UTF-8?q?Aper=C3=A7u=20du=20menu=20=20+=20marges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/layout/common.css                  |  5 +++++
 core/layout/main.php                    | 28 ++++++++++++++++++++++---
 core/module/theme/view/menu/menu.js.php |  9 +++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/core/layout/common.css b/core/layout/common.css
index 03b3dd02..51ac7327 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -498,6 +498,11 @@ header .container {
 	height: 100%;
 }
 
+/* Marges au cotneu de la bannière personnalisée */
+header:not(.container) #featureContent {
+	margin: 0 10px;
+}
+
 /* Element du header
 
 #themeHeaderImage {
diff --git a/core/layout/main.php b/core/layout/main.php
index c1a81f32..cad2d20d 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -51,7 +51,15 @@
 				<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
 				<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'.helper::baseUrl(false).self::FILE_DIR.'source/'. $this->getData(['theme', 'menu', 'burgerLogo']) .'"></div>' : '' ;?>
 				<?php echo template::ico('menu',null,null,'2em'); ?></div>
-				<div id="menu" <?php echo $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"'; ?> >
+				<!-- fin du menu burger -->
+				<?php 
+					$menuClass = $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"';
+					$menuClass = ($this->getData(['theme', 'menu', 'position']) === 'body-first' || 
+								 $this->getData(['theme', 'menu', 'position']) === 'body-second' ) &&
+								 $this->getData(['theme', 'menu', 'container']) === 'none' // étendue sur la page
+								 ? 'class="container-large"'  : 'class="container"';				 
+				?>
+				<div id="menu" <?php echo $menuClass; ?> >
 				<?php $this->showMenu(); ?>
 				</div> <!--fin menu -->
 			</nav>
@@ -89,11 +97,21 @@
 		<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?>
 			
 			<nav>
+				<!-- Menu burger -->
 				<div id="toggle">
 				<?php echo $this->getData(['theme','menu','burgerContent']) === 'title'  ? '<div class="notranslate" id="burgerText">' . $this->getData(['locale', 'title']) . '</div>' : '' ;?>
 				<?php echo $this->getData(['theme','menu','burgerContent']) === 'logo'   ? '<div class="notranslate" id="burgerLogo"><img src="'.helper::baseUrl(false).self::FILE_DIR.'source/'. $this->getData(['theme', 'menu', 'burgerLogo']) .'"></div>' : '' ;?>
 				<?php echo template::ico('menu',null,null,'2em'); ?></div>
-				<div id="menu" class="container"><?php $this->showMenu(); ?></div>
+				<!-- fin du menu burger -->
+				<?php 
+					$menuClass = $this->getData(['theme', 'menu', 'position']) === 'top' ? 'class="container-large"'  : 'class="container"';
+					$menuClass = ($this->getData(['theme', 'menu', 'position']) === 'body-first' || 
+								 $this->getData(['theme', 'menu', 'position']) === 'body-second' ) &&
+								 $this->getData(['theme', 'menu', 'container']) === 'none' // étendue sur la page
+								 ? 'class="container-large"'  : 'class="container"';				 
+				?>
+				<div id="menu" <?php echo $menuClass; ?> >
+					<?php $this->showMenu(); ?></div>
 			</nav>
 		<?php endif; ?>
 
@@ -119,7 +137,11 @@
 					): ?>
 						<!-- Bannière dans le site -->
 						<?php echo  ( $this->getData(['theme','header','linkHomePage']) &&  $this->getData(['theme','header','feature']) === 'wallpaper' ) ? '<a href="' . helper::baseUrl(false) . '">' : ''; ?>
-						<header class="<?php echo $this->getData(['theme', 'header', 'position']) === 'hide' ? 'displayNone' : ($this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay' : ''); ?>">
+						<?php 
+								$headerClass =  $this->getData(['theme', 'header', 'position']) === 'hide' ? 'displayNone' : '';
+								$headerClass .= $this->getData(['theme', 'header', 'tinyHidden']) ? ' bannerDisplay ' : '';
+							?>
+							<header <?php echo empty($headerClass) ? '' : 'class="' . $headerClass . '"';?>>
 							<?php if ($this->getData(['theme','header','feature']) === 'wallpaper' ): ?>
 								<?php if(
 									$this->getData(['theme', 'header', 'textHide']) === false
diff --git a/core/module/theme/view/menu/menu.js.php b/core/module/theme/view/menu/menu.js.php
index bfa4d78b..25f08e62 100644
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
@@ -121,6 +121,14 @@ $("input, select").on("change", function() {
 			$("nav").show().prependTo("#site");
 			break;
 	}
+
+	//  Largeur étendue
+	if ($("#themeMenuContainer").val() === 'none') {
+		$("#menu").removeClass();
+	} else {
+		$("#menu").addClass("container");
+	}
+
 	// Ajout du css au DOM
 	$("#themePreview").remove();
 	$("<style>")
@@ -177,7 +185,6 @@ $("#themeMenuActiveColorAuto").on("change", function() {
 
 // Affiche / Cache la sélection du logo pour le menu burger
 $("#themeMenuBurgerContent").on("change", function() {
-	console.log( $(this).val());
 	if($(this).val() === 'logo') {
 		$("#themeMenuBurgerLogoId").slideDown();
 	}