From 70b90e20ee7faea49c2c9fa1a9f240b4c6e9a84f Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 19 Oct 2019 20:27:17 +0200
Subject: [PATCH] =?UTF-8?q?[10.0.38.dev]=20Titre=20du=20site=20dans=20la?=
 =?UTF-8?q?=20barre=20hamburger=20-=20option=20=C3=A0=20venir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php          | 2 +-
 core/layout/common.css | 5 +++++
 core/layout/main.php   | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/core.php b/core/core.php
index f63137e8..32f3ae62 100644
--- a/core/core.php
+++ b/core/core.php
@@ -31,7 +31,7 @@ class common {
 	const TEMP_DIR = 'site/tmp/';
 
 	// Numéro de version 
-	const ZWII_VERSION = '10.0.37.dev';
+	const ZWII_VERSION = '10.0.38.dev';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
diff --git a/core/layout/common.css b/core/layout/common.css
index f4641122..3452c34f 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -458,6 +458,11 @@ nav #toggle span {
 	display: block;
 }
 
+nav #burgerText {
+	float: left;
+	margin-left: 10px;
+}
+
 nav ul {
 	padding: 0;
 	margin: 0;
diff --git a/core/layout/main.php b/core/layout/main.php
index eff46966..b0fcea24 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -35,7 +35,7 @@
 						{echo 'id="navfixedconnected"';} 
 				}
 			?>>
-				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
+				<div id="toggle"><div id="burgerText"><h3><?php echo $this->getData(['config','title']);?></h3></div><?php echo template::ico('menu',null,null,'2em'); ?></div>
 				<div id="menu" class="<?php if($this->getData(['theme', 'menu', 'position']) === 'top'){echo 'container-large';}else{echo'container';}?>">
 					<div id="menuBar">
 						<?php $layout->showMenu(); ?>
@@ -70,7 +70,7 @@
 		<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?>
 			<!-- Menu dans le fond du site après la bannière -->
 			<nav>
-				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
+				<div id="toggle"><div id="burgerText"><h3><?php echo $this->getData(['config','title']);?></h3></div><?php echo template::ico('menu',null,null,'2em'); ?></div>
 				<div id="menu" class="container">
 					<div id="menuBar">
 						<?php $layout->showMenu(); ?>
@@ -86,7 +86,7 @@
 			<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?>
 				<!-- Menu dans le site avant la bannière -->
 				<nav>
-					<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
+					<div id="toggle"><div id="burgerText"><h3><?php echo $this->getData(['config','title']);?></h3></div><?php echo template::ico('menu',null,null,'2em'); ?></div>
 					<div id="menu" class="container">
 						<div id="menuBar">
 							<?php $layout->showMenu(); ?>
@@ -132,7 +132,7 @@
 			): ?>
 			<!-- Menu dans le site après la bannière -->
 			<nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
-				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
+				<div id="toggle"><div id="burgerText"><h3><?php echo $this->getData(['config','title']);?></h3></div><?php echo template::ico('menu',null,null,'2em'); ?></div>
 				<div id="menu" class="container">
 					<div id="menuBar">
 						<?php $layout->showMenu(); ?>