From 7a02b8524d13e4d40c8d077ad8f43fe52f43f744 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 10 Dec 2019 17:36:13 +0100
Subject: [PATCH] =?UTF-8?q?[9.2.15]=20correction=20update=20=20+=20titre?=
 =?UTF-8?q?=20dans=20menu=20r=C3=A9duit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 |  6 +++++
 core/layout/common.css                        |  7 ++++++
 core/layout/main.php                          | 24 +++++++++++++++----
 core/module/install/ressource/defaultdata.php |  4 +++-
 core/module/theme/theme.php                   |  3 ++-
 core/module/theme/view/menu/menu.php          | 18 ++++++++++----
 6 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/core/core.php b/core/core.php
index f9c0496c..392b5283 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1031,6 +1031,12 @@ class common {
 			$this->setData(['core', 'dataVersion', 9212]);
 			$this->saveData();
 		}
+		// Version 9.2.15
+		if($this->getData(['core', 'dataVersion']) < 9215) {
+			// Données de la barre de langue dans le menu
+			$this->setData(['theme','menu','burgerTitle',true]);
+			$this->setData(['core', 'dataVersion', 9215]);
+		}
 	}
 }
 
diff --git a/core/layout/common.css b/core/layout/common.css
index 75767d97..57974d87 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -434,10 +434,17 @@ nav #toggle {
 	display: none;
 	font-weight: bold;
 }
+
 nav #toggle span {
 	display: block;
 }
 
+nav #burgerText {
+	float: left;
+	font-size: 1.4em;
+	margin: 15px 0 0 10px;
+}
+
 nav ul {
 	padding: 0;
 	margin: 0;
diff --git a/core/layout/main.php b/core/layout/main.php
index f1239d70..79f0e187 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -37,7 +37,11 @@
 				}
 			?>
 			>
-				<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
+				<div id="toggle">
+				<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
+					<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
+				<?php endif; ?>
+				<?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';}
 				?>">
@@ -72,7 +76,11 @@
 		<?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">
+				<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
+					<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
+				<?php endif; ?>
+				<?php echo template::ico('menu',null,null,'2em'); ?></div>
 				<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
 			</nav>
 		<?php endif; ?>
@@ -81,7 +89,11 @@
 			<?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">
+					<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
+						<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
+					<?php endif; ?>
+					<?php echo template::ico('menu',null,null,'2em'); ?></div>
 					<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
 				</nav>
 			<?php endif; ?>
@@ -124,7 +136,11 @@
 			): ?>
 			<!-- 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">
+				<?php if ($this->getData(['theme','menu','burgerTitle']) === true ): ?>
+						<div id="burgerText"><?php echo $this->getData(['config','title']);?></div>
+					<?php endif; ?>
+				<?php echo template::ico('menu',null,null,'2em'); ?></div>
 				<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
 			</nav>
 			<?php endif; ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index c86f4305..0a3a8572 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -473,6 +473,7 @@ class install extends common {
 				'fontWeight' => 'normal',
 				'height' => '15px 10px',
 				'loginLink' => true,
+				'burgerTitle' => true,
 				'margin' => false,
 				'position' => 'site-second',
 				'textAlign' => 'left',
@@ -480,7 +481,8 @@ class install extends common {
 				'textTransform' => 'none',
 				'fixed' => false,
 				'activeColor' => 'rgba(255, 255, 255, 1)',
-				'activeColorAuto' => true
+				'activeColorAuto' => true,
+
 			],
 			'site' => [
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index fdb3504c..2bffb9a1 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -453,7 +453,8 @@ class theme extends common {
 				'fixed' => $this->getInput('themeMenuFixed', helper::FILTER_BOOLEAN),
 				'activeColorAuto' => $this->getInput('themeMenuActiveColorAuto', helper::FILTER_BOOLEAN),
 				'activeColor' => $this->getInput('themeMenuActiveColor'),
-				'radius' => $this->getInput('themeMenuRadius')
+				'radius' => $this->getInput('themeMenuRadius'),
+				'burgerTitle' => $this->getInput('themeMenuBurgerTitle', helper::FILTER_BOOLEAN)
 			]]);
 			// Valeurs en sortie
 			$this->addOutput([
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 7072c660..bb55a627 100755
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -57,10 +57,20 @@
 <div class="row">
     <div class="col12">
         <div class="block">
-            <h4>Contenu</h4>
-            <?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
-					'checked' => $this->getData(['theme', 'menu', 'loginLink'])
-				]); ?>
+        <h4>Contenus</h4>
+            <div class="row">
+                <div class="col6">
+                        <?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
+                                'checked' => $this->getData(['theme', 'menu', 'loginLink'])
+                            ]); ?>
+                </div>
+                <div class="col6">
+                        <?php echo template::checkbox('themeMenuBurgerTitle', true, 'Titre du site dans le menu réduit', [
+                                'checked' => $this->getData(['theme', 'menu', 'burgerTitle']),
+                                'help' => 'Le menu burger remplace le menu complet lorsque la largeur de l\'écran  n\'est pas suffisante.'
+                            ]); ?>
+                </div>
+            </div>                
         </div>
     </div>
 </div>