From 0a130fdcc32c1b3a404cb45ffd13ee994c93d6a9 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 4 Jul 2019 12:38:23 +0200
Subject: [PATCH]  [9.2.0.dev] Petites corrections

---
 core/core.php                            |  4 +-
 core/layout/main.php                     | 92 ++++++++++++------------
 core/module/theme/view/footer/footer.php |  4 +-
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/core/core.php b/core/core.php
index 5e545193..45752493 100644
--- a/core/core.php
+++ b/core/core.php
@@ -40,10 +40,10 @@ class common {
 		'install',
 		'maintenance',
 		'page',
+        'search',
 		'sitemap',
 		'theme',
-		'user',
-        'search'
+		'user'
 	];
 	private $data = [];
 	private $hierarchy = [
diff --git a/core/layout/main.php b/core/layout/main.php
index 365a2744..8784e3dc 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -220,53 +220,53 @@
 		<?php else: ?>
 			<div class="container-large">
 		<?php endif?>
-		<!-- Mise en page -->
-		<?php switch($this->getData(['theme', 'footer', 'template'])) {
-			case '1' :
-				$class['left'] 	 = "displayNone";
-				$class['center'] = "col12";
-				$class['right']  = "displayNone";		
-				break;
-			case '2' :
-				$class['left'] 	 = "col6";
-				$class['center'] = "displayNone";
-				$class['right']  = "col6";		
-				break;
-			case '3' :
-				$class['left'] 	 = "col4";
-				$class['center'] = "col4";
-				$class['right']  = "col4";					
-				break;
-			case '4' :
-				$class['left'] 	 = "col12";
-				$class['center'] = "col12";
-				$class['right']  = "col12";					
-				break;			
-		}?>
-		<div class="row" id="footersite">
-			<div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left">				
-				<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); }
-						if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') {	$layout->showSocials(); } 
-						if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); } 
-				?>	
-			</div>
-			<div class="<?php echo $class['center'];?>" id="footer<?php echo $position;?>Center">					
-				<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); } 
-						if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); } 
-						if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); } 
-				?>	
-			</div>				
-			<div class="<?php echo $class['right'];?>" id="footer<?php echo $position;?>Right"> 				
-				<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); } 
-						if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); } 
-						if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); } 
-				?>	
-			</div>			
-		</div>
-	</footer>
-</div>
+            <!-- Mise en page -->
+            <?php switch($this->getData(['theme', 'footer', 'template'])) {
+                case '1' :
+                    $class['left'] 	 = "displayNone";
+                    $class['center'] = "col12";
+                    $class['right']  = "displayNone";
+                    break;
+                case '2' :
+                    $class['left'] 	 = "col6";
+                    $class['center'] = "displayNone";
+                    $class['right']  = "col6";
+                    break;
+                case '3' :
+                    $class['left'] 	 = "col4";
+                    $class['center'] = "col4";
+                    $class['right']  = "col4";
+                    break;
+                case '4' :
+                    $class['left'] 	 = "col12";
+                    $class['center'] = "col12";
+                    $class['right']  = "col12";
+                    break;
+            }?>
+            <div class="row" id="footersite">
+                <div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left">
+                    <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); }
+                            if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') {	$layout->showSocials(); }
+                            if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); }
+                    ?>
+                </div>
+                <div class="<?php echo $class['center'];?>" id="footer<?php echo $position;?>Center">
+                    <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); }
+                            if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); }
+                            if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); }
+                    ?>
+                </div>
+                <div class="<?php echo $class['right'];?>" id="footer<?php echo $position;?>Right">
+                    <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); }
+                            if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); }
+                            if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); }
+                    ?>
+                </div>
+            </div>
+        </div>
+    </footer>
 <!-- Lien remonter en haut -->
 <div id="backToTop"><?php echo template::ico('up'); ?></div>
 <?php $layout->showScript();?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index f4a29265..87e55564 100755
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -40,7 +40,7 @@
             <div class="row">
                 <div class="col6">
                     <div class="row">
-                        <?php echo template::checkbox('themefooterDisplayCopyright', true, 'Mention "Motorisé par"', [
+                        <?php echo template::checkbox('themefooterDisplayCopyright', true, '"Motorisé par..."', [
                                 'checked' => $this->getData(['theme', 'footer','displayCopyright'])
                             ]); ?>
                     </div>
@@ -148,7 +148,7 @@
                     <?php echo template::select('themeFooterHeight', $module::$footerHeights, [
                             'label' => 'Marges verticales',
                             'selected' => $this->getData(['theme', 'footer', 'height']),
-                            'help' => 'La hauteur du pied de page est dynmamique selon le contenu.Ces marges sont ajoutées au-dessus et en-dessous.'
+                            'help' => 'La hauteur du pied de page est dynmamique selon le contenu. Ces marges sont ajoutées<br />au-dessus et en-dessous.'
                         ]); ?>
                 </div>
             </div>