From 0e73bf3cfea7eed882b932522d2cccb5da67c8aa Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 3 Jan 2019 20:47:00 +0100
Subject: [PATCH] ajustement des messages

---
 core/layout/main.php                 |  4 ++--
 core/module/theme/theme.php          | 12 ++++++------
 core/module/theme/view/site/site.php | 13 ++++++++-----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/layout/main.php b/core/layout/main.php
index 74ed943e..0472ce7d 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -131,11 +131,11 @@
 				break;			
 			case 2 :  // 2 blocks 
 				if ($blocks[0] < $blocks[1]) { // détermine la position de la colonne
-					$blockright = 'col'. $blocks[0];
+					$blockleft = 'col'. $blocks[0];
 					$content    = 'col'. $blocks[1] ;
 				} else {
 					$content    = 'col' . $blocks[0];
-					$blockleft  = 'col' . $blocks[1];						
+					$blockright  = 'col' . $blocks[1];						
 				}
 			break;
 			case 3 :  // 3 blocks
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 139f34c5..987db8e9 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -204,12 +204,12 @@ class theme extends common {
 	];
 
 	public static $siteBlocks = [
-		'12' => 'Une colonne',
-		'4-8' => 'Deux colonnes : 1/3 - 2/3',		
-		'8-4' => 'Deux colonnes : 2/3 - 1/3',
-		'3-9' => 'Deux colonnes : 1/4 - 3/4',
-		'9-3' => 'Deux colonnes : 3/4 - 1/2',
-		'3-6-3' => 'Trois colonnes : 1/4 - 1/2 - 1/4'
+		'12' => 'Un seul bloc, uniquement le site',
+		'4-8' => 'Deux blocs : 1/3 - 2/3',		
+		'8-4' => 'Deux blocs : 2/3 - 1/3',
+		'3-9' => 'Deux blocs : 1/4 - 3/4',
+		'9-3' => 'Deux blocs : 3/4 - 1/2',
+		'3-6-3' => 'Trois blocs : 1/4 - 1/2 - 1/4'
 	];
 
 
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index 2dfaa2bd..a657af2f 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -133,24 +133,27 @@
 	</div>
 	<div class="row">
 		<div class="block">
-			<h4>Mise en page</h4>
+			<h4>Mise en page </h4>
 			<div class='row'>	
 				<div class="col3">
 					<?php echo template::select('themeSiteBlocks', $module::$siteBlocks, [
-										'label' => 'Colonnes',
-										'selected' => $this->getData(['theme', 'site', 'blocks'])
-							]); ?>
+							'label' => 'Répartition des blocs :',
+							'help' => 'Le bloc la plus large abrite le contenu du site',
+							'selected' => $this->getData(['theme', 'site', 'blocks'])
+					]); ?>
 				</div>
 			</div>
 			<div class='row'>
-			<div class="col6">						
+				<div class="col6">						
 					<?php echo template::textarea('themeBlockContentLeft', [
+							'label' => 'Contenu du bloc à gauche :',
 							'class' => 'editorWysiwyg',
 							'value' => $this->getData(['theme','block', 'contentLeft'])
 					]); ?>
 				</div>			
 				<div class="col6">
 					<?php echo template::textarea('themeBlockContentRight', [
+							'label' => 'Contenu du bloc à droite :',
 							'class' => 'editorWysiwyg',
 							'value' => $this->getData(['theme','block', 'contentRight'])
 						]); ?>