From 56431f99db51696d82842ce83070a3644e58e96b Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 8 Jan 2019 22:28:08 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20annulation=20multi=20colonn?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/layout/main.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/layout/main.php b/core/layout/main.php
index 48babb48..4507da51 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -116,12 +116,9 @@
 		</nav>
 	<?php endif; ?>
 	<!-- Corps -->
-	<?php if ($this->getUrl(0) === 'theme' OR
-		$this->getUrl(0) === 'config' OR
-		$this->getUrl(0) === 'install' OR
-		$this->getUrl(0) === 'maintenance' OR
-		$this->getUrl(0) === 'page' OR
-		$this->getUrl(0) === 'user'  ) { ?> <!-- Pas de multi colonne-->
+	<?php if ( is_null($this->getData(['page',$this->getUrl(0)])) OR
+			   is_null($this->getData(['module',$this->getUrl(0)])) OR
+			   $this->getUrl(1)  !== '' ) { ?> <!-- Multi colonne uniquement pour les pages -->
 			<section><?php $layout->showContent(); ?></section>
 		<?php } else {
 		$blocks = explode('-',$this->getData(['theme','site','blocks']));
@@ -150,7 +147,7 @@
 				<?php if ($blockleft !== "") :?> <div class="<?php echo $blockleft; ?>" id="contentleft"><?php echo $this->getData(['page','blockLeft','content']);?></div> <?php endif; ?>
 				<div class="<?php echo $content; ?>" id="contentsite"><?php $layout->showContent(); ?></div>
 				<?php if ($blockright !== "") :?> <div class="<?php echo $blockright; ?>" id="contentright"><?php echo $this->getData(['page','blockRight','content']);?></div> <?php endif; ?>		
-		</div>
+			</div>
 		</section>
 	<?php } ?>
 	<!-- footer -->