From a808dadd53fc28f3c7799d3e1035c265b7e87866 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Fri, 3 May 2019 22:06:15 +0200
Subject: [PATCH] =?UTF-8?q?[9.1.00]=20Position=20du=20menu=20en=20barre=20?=
 =?UTF-8?q?lat=C3=A9rale.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php        |  33 +++++++++++++++++++++++++++++----
 core/layout/main.php |  28 ++--------------------------
 sitemap.xml.gz       | Bin 0 -> 354 bytes
 3 files changed, 31 insertions(+), 30 deletions(-)
 create mode 100644 sitemap.xml.gz

diff --git a/core/core.php b/core/core.php
index 07767582..8b8e78d8 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1817,18 +1817,43 @@ class layout extends common {
 
 	/**
 	 * Affiche le contenu de la barre gauche
-	 * @param page chargée
+	 * 
 	 */
 	public function showBarContentLeft() {
-		echo $this->core->output['contentLeft'];		
+		// Détermine si le menu est présent
+		if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) === 'none') {
+			// Pas de menu
+			echo $this->core->output['contentLeft'];
+		} else {
+			// $mark contient 0 le menu est positionné à la fin du contenu
+			$contentLeft = $this->core->output['contentLeft'];
+			$mark = strrpos($contentLeft,'[]')  !== false ? strrpos($contentLeft,'[]') : strlen($contentLeft);		
+			echo substr($contentLeft,0,$mark);			
+			echo '<div id="menuSideLeft>';
+			echo $this->showMenuSide($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) === 'parents' ? false : true);
+			echo '</div>';
+			echo substr($contentLeft,$mark+2,strlen($contentLeft));			
+		}						
 	}
 
 	/**
 	 * Affiche le contenu de la barre droite
-	 * @param page chargée
 	 */
 	public function showBarContentRight() {
-		echo $this->core->output['contentRight'];
+		// Détermine si le menu est présent
+		if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'displayMenu']) === 'none') {
+			// Pas de menu
+			echo $this->core->output['contentRight'];
+		} else {
+			// $mark contient 0 le menu est positionné à la fin du contenu
+			$contentRight = $this->core->output['contentRight'];
+			$mark = strrpos($contentRight,'[]')  !== false ? strrpos($contentRight,'[]') : strlen($contentRight);		
+			echo substr($contentRight,0,$mark);			
+			echo '<div id="menuSideRight>';
+			echo $this->showMenuSide($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'displayMenu']) === 'parents' ? false : true);
+			echo '</div>';
+			echo substr($contentRight,$mark+2,strlen($contentRight));			
+		}	
 	}
 
      /**
diff --git a/core/layout/main.php b/core/layout/main.php
index 8c2f0627..fc1d5fc4 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -169,19 +169,7 @@
 			<?php 
 				if ($blockleft !== "") :?> 
 				<div class="<?php echo $blockleft; ?>" id="contentLeft">		
-					<?php
-					// Détermine si le bloc a un menu à inclure
-					$layout->showBarContentLeft(); 
-					// Type de menu affiché
-					// 0 : aucun
-					// 1 : menu complet
-					// 2 : sous-menu de la page parente
-					if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) !== 'none') {
-						?> <div id="menuSideLeft"><?php						
-						$layout->showMenuSide($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barLeft']),'displayMenu']) === 'parents' ? false : true);
-						?></div><?php
-					}					
-					?>
+					<?php 	$layout->showBarContentLeft(); 	?>
 			 	</div> 
 				<?php endif; ?>
 			<div class="<?php echo $content; ?>
@@ -190,19 +178,7 @@
 			<?php 
 				if ($blockright !== "") :?> 
 				<div class="<?php echo $blockright; ?>" id="contentRight">
-					<?php
-					// Détermine si le bloc a un menu à inclure
-					$layout->showBarContentRight();
-					// Type de menu affiché
-					// 0 : aucun
-					// 1 : menu complet
-					// 2 : sous-menu de la page parente					
-					if ($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'displayMenu']) !== 'none') {
-						?> <div id="menuSideRight"><?php
-						$layout->showMenuSide($this->getData(['page',$this->getData(['page',$this->getUrl(0),'barRight']),'displayMenu']) === 'parents' ? false : true);
-						?></div><?php						
-					}
-					 ?>
+					<?php $layout->showBarContentRight(); ?>
 				</div>
 				<?php endif; ?>	
 		</div>
diff --git a/sitemap.xml.gz b/sitemap.xml.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e6f652bb82caaee733c77c8db63b1d87decf2d1d
GIT binary patch
literal 354
zcmV-o0iFIIiwFP!000003bd5HZo?oHh4(y#%UWH7omOou#~CVhN~WYz)s5g=2ML1(
z#E$y(#ZEGGsH#+g=?cy{pSb*#t5d6z9<7r`FG-d%lAso*mbzJzx7{l|lT|e<?*Nhp
zHCpbmhEbZcYys>M*nF4g1<Q(ur+XHP5C9MyN2?tAB*bf1oSa;egZEuQ=`alGFi(wb
zXwFzh-#6>6IAF^`YUjBYNY1Vw4kvw(bZ+vwN$==olCpFWJWdwpg|!jfPy4wcAo+9L
z5O%H8ldDNJ`!#axQdKG=s!Mn%xjGo<>Bk`D%VrBT_H@s!MNpylmMa9_qktCmu^jcm
z&z)~gUHy6_L3fdqbRyn>jm+Re98s#s6x5$w`^b=1It0|v@g{cH#>2nfhsdbT${u6y
zXRk~X8PSB7V<o!CnDOC<0=~jrWRx)4bMgOMP0wF+HTwnt0RR630P;F@p#=s20E)q@
ACjbBd

literal 0
HcmV?d00001