From 45914d3f7cf4dce32f1afc0682a6a73d8fa50c33 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Wed, 20 Mar 2019 18:25:17 +0100
Subject: [PATCH] =?UTF-8?q?[9.0.08]=20Th=C3=A8mes=20:=20libell=C3=A9s=20et?=
 =?UTF-8?q?=20aide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/module/theme/theme.php              | 44 ++++++++++++------------
 core/module/theme/view/body/body.php     |  1 +
 core/module/theme/view/footer/footer.php |  1 +
 core/module/theme/view/header/header.php |  6 ++--
 core/module/theme/view/menu/menu.php     | 37 ++++++++++----------
 core/module/theme/view/site/site.php     |  8 ++++-
 6 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index c1d59b43..eeb59a6c 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -90,19 +90,19 @@ class theme extends common {
 		'body' => 'En dessous du site'
 	];
 	public static $footerFontSizes = [
-		'.8em' => 'Très petite',
-		'.9em' => 'Petite',
-		'1em' => 'Normale',
-		'1.1em' => 'Moyenne',
-		'1.2em' => 'Grande',
-		'1.3em' => 'Très grande'
+		'.5em' => 'Microscopique (50%)',
+		'.6em' => 'Minuscule (60%)',
+		'.7em' => 'Infime (70%)',
+		'.8em' => 'Très petite (80%)',
+		'.9em' => 'Petite (90%)',
+		'1em' => 'Normale (100%)',
 	];	
 	public static $headerFontSizes = [
-		'1.6em' => 'Très petite',
-		'1.8em' => 'Petite',
-		'2em' => 'Moyenne',
-		'2.2em' => 'Grande',
-		'2.4vmax' => 'Très grande'
+		'1.6em' => 'Très petite (160%)',
+		'1.8em' => 'Petite (180%)',
+		'2em' => 'Moyenne (200%)',
+		'2.2em' => 'Grande (220%)',
+		'2.4vmax' => 'Très grande (240%)'
 	];
 	public static $headerHeights = [
 		'100px' => 'Très petite (100 pixels)',
@@ -128,12 +128,12 @@ class theme extends common {
 		'bottom right' => 'En bas à droite'
 	];
 	public static $menuFontSizes = [
-		'.8em' => 'Très petite',
-		'.9em' => 'Petite',
-		'1em' => 'Normale',
-		'1.1em' => 'Moyenne',
-		'1.2em' => 'Grande',
-		'1.3em' => 'Très grande'
+		'.8em' => 'Très petite (80%)',
+		'.9em' => 'Petite (90%)',
+		'1em' => 'Normale (100%)',
+		'1.1em' => 'Moyenne (110%)',
+		'1.2em' => 'Grande (120%)',
+		'1.3em' => 'Très grande (130%)'
 	];
 	public static $menuHeights = [
 		'5px 10px' => 'Très petite',
@@ -178,11 +178,11 @@ class theme extends common {
 		'1px 1px 50px' => 'Très importante'
 	];
 	public static $siteFontSizes = [
-		'12px' => '12',
-		'13px' => '13',
-		'14px' => '14',
-		'15px' => '15',
-		'16px' => '16'
+		'12px' => '12 pixels',
+		'13px' => '13 pixels',
+		'14px' => '14 pixels',
+		'15px' => '15 pixels',
+		'16px' => '16 pixels'
 	];
 	public static $sizes = [
 		'auto' => 'Automatique',
diff --git a/core/module/theme/view/body/body.php b/core/module/theme/view/body/body.php
index 375d99cc..5126965e 100755
--- a/core/module/theme/view/body/body.php
+++ b/core/module/theme/view/body/body.php
@@ -18,6 +18,7 @@
 				<h4>Couleur</h4>
 				<?php echo template::text('themeBodyBackgroundColor', [
 					'class' => 'colorPicker',
+					'help' => 'Le curseur horizontal règle le niveau de transparence',					
 					'label' => 'Fond',
 					'value' => $this->getData(['theme', 'body', 'backgroundColor'])
 				]); ?>
diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php
index 1128d190..a2779360 100755
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
@@ -79,6 +79,7 @@
 					<div class="col3">
 						<?php echo template::select('themeFooterFontSize', $module::$footerFontSizes, [
 							'label' => 'Taille',
+							'help' => 'Proportionnelle à celle définie dans le site',							
 							'selected' => $this->getData(['theme', 'footer', 'fontSize'])
 						]); ?>
 					</div>
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 18aa600d..2b393f9a 100755
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -20,6 +20,7 @@
 					<div class="col6">
 						<?php echo template::text('themeHeaderBackgroundColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',					
 							'label' => 'Fond',
 							'value' => $this->getData(['theme', 'header', 'backgroundColor'])
 						]); ?>
@@ -27,6 +28,7 @@
 					<div class="col6">
 						<?php echo template::text('themeHeaderTextColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Texte',
 							'value' => $this->getData(['theme', 'header', 'textColor'])
 						]); ?>
@@ -96,6 +98,7 @@
 					<div class="col3">
 						<?php echo template::select('themeHeaderFontSize', $module::$headerFontSizes, [
 							'label' => 'Taille',
+							'help' => 'Proportionnelle à celle définie dans le site',
 							'selected' => $this->getData(['theme', 'header', 'fontSize'])
 						]); ?>
 					</div>
@@ -104,8 +107,7 @@
 							'label' => 'Police',
 							'selected' => $this->getData(['theme', 'header', 'font'])
 						]); ?>
-					</div>
-					
+					</div>	
 				</div>
 			</div>
 		</div>
diff --git a/core/module/theme/view/menu/menu.php b/core/module/theme/view/menu/menu.php
index 46566b94..6bdea033 100755
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
@@ -20,6 +20,7 @@
 					<div class="col6">
 						<?php echo template::text('themeMenuBackgroundColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Fond',
 							'value' => $this->getData(['theme', 'menu', 'backgroundColor'])
 						]); ?>
@@ -27,6 +28,7 @@
 					<div class="col6">
 						<?php echo template::text('themeMenuTextColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Texte',
 							'value' => $this->getData(['theme', 'menu', 'textColor'])
 						]); ?>
@@ -35,37 +37,47 @@
 			</div>
 		</div>
 		<div class="col6">
+				<div class="block">
+				<h4>Contenu</h4>
+				<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
+					'checked' => $this->getData(['theme', 'menu', 'loginLink']),
+					'help' => 'Visible seulement sur cette page et lorsque vous n\'êtes pas connecté (non recommandé).'
+				]); ?>
+			</div>
+	</div>
+	<div class="row">
+		<div class="col12">		
 			<div class="block">
 				<h4>Mise en forme du texte</h4>
 				<div class="row">
-					<div class="col6">
+					<div class="col3">
 						<?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
 							'label' => 'Caractères',
 							'selected' => $this->getData(['theme', 'menu', 'textTransform'])
 						]); ?>
 					</div>
-					<div class="col6">
+					<div class="col3">
 						<?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
 							'label' => 'Style',
 							'selected' => $this->getData(['theme', 'menu', 'fontWeight'])
 						]); ?>
 					</div>
-				</div>
-				<div class='row'>
-					<div class="col6">
+					<div class="col3">
 							<?php echo template::select('themeMenuFont', $module::$fonts, [
 								'label' => 'Police',
 								'selected' => $this->getData(['theme', 'menu', 'font'])
 							]); ?>
 						</div>
-					<div class="col6">
+					<div class="col3">
 							<?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
 								'label' => 'Taille',
+								'help' => 'Proportionnelle à celle définie dans le site',								
 								'selected' => $this->getData(['theme', 'menu', 'fontSize'])
 							]); ?>
 						</div>
 					</div>
-			</div>
+				</div>
+			<div>
 		</div>
 	</div>
 	<div class="row">
@@ -114,15 +126,4 @@
 			</div>			
 		</div>
 	</div>
-	<div class="row">
-		<div class="col6">
-			<div class="block">
-				<h4>Contenu</h4>
-				<?php echo template::checkbox('themeMenuLoginLink', true, 'Lien de connexion', [
-					'checked' => $this->getData(['theme', 'menu', 'loginLink']),
-					'help' => 'Visible seulement sur cette page et lorsque vous n\'êtes pas connecté.'
-				]); ?>
-			</div>
-		</div>
-	</div>
 <?php echo template::formClose(); ?>
\ No newline at end of file
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index cf3fcf93..477694ab 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -20,6 +20,7 @@
 					<div class="col4">
 						<?php echo template::text('themeSiteBackgroundColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Fond',
 							'value' => $this->getData(['theme', 'site', 'backgroundColor'])
 						]); ?>
@@ -27,6 +28,7 @@
 					<div class="col4">
 						<?php echo template::text('themeTextTextColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Texte',
 							'value' => $this->getData(['theme', 'text', 'textColor'])
 						]); ?>
@@ -34,6 +36,7 @@
 					<div class="col4">
 						<?php echo template::text('themeTitleTextColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Titres',
 							'value' => $this->getData(['theme', 'title', 'textColor'])
 						]); ?>
@@ -43,6 +46,7 @@
 					<div class="col4 offset2">
 						<?php echo template::text('themeButtonBackgroundColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Boutons',
 							'value' => $this->getData(['theme', 'button', 'backgroundColor'])
 						]); ?>
@@ -50,6 +54,7 @@
 					<div class="col4">
 						<?php echo template::text('themeLinkTextColor', [
 							'class' => 'colorPicker',
+							'help' => 'Le curseur horizontal règle le niveau de transparence',							
 							'label' => 'Liens',
 							'value' => $this->getData(['theme', 'link', 'textColor'])
 						]); ?>
@@ -92,7 +97,8 @@
 				<div class="row">
 					<div class="col6">
 						<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
-							'label' => 'Taille',
+							'label' => 'Taille du site',
+							'help' => 'Correspond au libellé de taille \'Normale\' du menu, de la  bannière et du pied de page',
 							'selected' => $this->getData(['theme', 'text', 'fontSize'])
 						]); ?>
 					</div>