Merge branch 'master_dev' of https://github.com/fredtempez/ZwiiCMS into master_dev

core/core.php

@@ -2115,7 +2115,7 @@ class layout extends common {
      */
     public function showCopyright() {
         $items = '<div id="footerCopyright">';
-        $items .= '<span>Motorisé&nbsp;par&nbsp;<a href="http://zwiicms.com/" onclick="window.open(this.href);return false" data-tippy-content="Zwii CMS sans base de données, très léger et performant">Zwii</a>';
+        $items .= '<span id="footerFont">Motorisé&nbsp;par&nbsp;<a href="http://zwiicms.com/" onclick="window.open(this.href);return false" data-tippy-content="Zwii CMS sans base de données, très léger et performant">Zwii</a>';
         $items .= '&nbsp;|&nbsp;<a href="' . helper::baseUrl() . 'sitemap" data-tippy-content="Plan du site" >Plan&nbsp;du&nbsp;site</a></span>';
         if(
             (
@@ -2144,7 +2144,7 @@ class layout extends common {
 	 */
 	public function showFooterText() {
 		if($footerText = $this->getData(['theme', 'footer', 'text']) OR $this->getUrl(0) === 'theme') {
-			echo '<div id="footerText"><span>' . nl2br($footerText) . '</span></div>';
+			echo '<div id="footerText"><span id="footerFont">' . nl2br($footerText) . '</span></div>';
 		}
 	}
 

core/module/theme/theme.php

@@ -74,7 +74,7 @@ class theme extends common {
 		'right' => 'Bloc Droite'
 	];
 	public static $fontWeights = [
-		'normal' => 'Normal',
+		'normal' => 'Standard',
 		'bold' => 'Gras'
 	];
 	public static $footerHeights = [
@@ -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,19 +178,21 @@ 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',
 		'cover' => 'Largeur adaptée au fond'
 	];
 	public static $textTransforms = [
-		'none' => 'Normaux',
-		'uppercase' => 'Majuscules'
+		'none' => 'Standard',
+		'lowercase' => 'Minuscules',
+		'uppercase' => 'Majuscules',
+		'capitalize' => 'Majuscule à chaque mot'		
 	];
 	public static $widths = [
 		'750px' => 'Petite (750 pixels)',
@@ -200,8 +202,8 @@ class theme extends common {
 	];
 	public static $headerWide = [	
 		'auto auto' => 'Automatique',
-		'contain' => 'Responsive (contain)',		
-		'cover' => 'Responsive (cover)',
+		//'contain' => 'Responsive (contain)',		
+		'cover' => 'Responsive',
 		'100% 100%' => 'Image étirée',
 	];
 

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'])
 				]); ?>

core/module/theme/view/footer/footer.js.php

@@ -47,7 +47,7 @@ $("input, select").on("change", function() {
 		.attr("type", "text/css")
 		.attr("id", "themePreview")
 		.text(css)
-		.appendTo("head");
+		.appendTo("footer");
 	// Position du pied de page
 	switch($("#themeFooterPosition").val()) {
 		case 'hide':
@@ -95,7 +95,6 @@ $("#themeFooterForm").on("change",function() {
 				$("#footerSocials").show().appendTo("#footersiteCenter");
 				break;
 			case 'right':
-				console.log("right");
 				$("#footerSocials").show().appendTo("#footerbodyRight");
 				$("#footerSocials").show().appendTo("#footersiteRight");				
 				break;

core/module/theme/view/footer/footer.php

@@ -64,10 +64,17 @@
 			<div class="block">
 				<h4>Mise en forme du texte</h4>
 				<div class="row">
+				<div class="col3">
+						<?php echo template::select('themeFooterFont', $module::$fonts, [
+							'label' => 'Police',
+							'selected' => $this->getData(['theme', 'footer', 'font'])
+						]); ?>
+					</div>
 					<div class="col3">
-						<?php echo template::select('themeFooterTextTransform', $module::$textTransforms, [
-							'label' => 'Caractères',
-							'selected' => $this->getData(['theme', 'footer', 'textTransform'])
+						<?php echo template::select('themeFooterFontSize', $module::$footerFontSizes, [
+							'label' => 'Taille',
+							'help' => 'Proportionnelle à celle définie dans le site',							
+							'selected' => $this->getData(['theme', 'footer', 'fontSize'])
 						]); ?>
 					</div>
 					<div class="col3">
@@ -75,20 +82,13 @@
 							'label' => 'Style',
 							'selected' => $this->getData(['theme', 'footer', 'fontWeight'])
 						]); ?>
-					</div>
+					</div>																
 					<div class="col3">
-						<?php echo template::select('themeFooterFontSize', $module::$footerFontSizes, [
-							'label' => 'Taille',
-							'selected' => $this->getData(['theme', 'footer', 'fontSize'])
+						<?php echo template::select('themeFooterTextTransform', $module::$textTransforms, [
+							'label' => 'Casse',
+							'selected' => $this->getData(['theme', 'footer', 'textTransform'])
 						]); ?>
-					</div>
-					<div class="col3">
-						<?php echo template::select('themeFooterFont', $module::$fonts, [
-							'label' => 'Police',
-							'selected' => $this->getData(['theme', 'footer', 'font'])
-						]); ?>
-					</div>
-					
+					</div>			
 				</div>
 			</div>
 		</div>

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'])
 						]); ?>
@@ -81,10 +83,17 @@
 			<div class="block">
 				<h4>Mise en forme du texte</h4>
 				<div class="row">
+				<div class="col3">
+						<?php echo template::select('themeHeaderFont', $module::$fonts, [
+							'label' => 'Police',
+							'selected' => $this->getData(['theme', 'header', 'font'])
+						]); ?>
+					</div>
 					<div class="col3">
-						<?php echo template::select('themeHeaderTextTransform', $module::$textTransforms, [
-							'label' => 'Caractères',
-							'selected' => $this->getData(['theme', 'header', 'textTransform'])
+						<?php echo template::select('themeHeaderFontSize', $module::$headerFontSizes, [
+							'label' => 'Taille',
+							'help' => 'Proportionnelle à celle définie dans le site',
+							'selected' => $this->getData(['theme', 'header', 'fontSize'])
 						]); ?>
 					</div>
 					<div class="col3">
@@ -92,20 +101,13 @@
 							'label' => 'Style',
 							'selected' => $this->getData(['theme', 'header', 'fontWeight'])
 						]); ?>
-					</div>
+					</div>															
 					<div class="col3">
-						<?php echo template::select('themeHeaderFontSize', $module::$headerFontSizes, [
-							'label' => 'Taille',
-							'selected' => $this->getData(['theme', 'header', 'fontSize'])
+						<?php echo template::select('themeHeaderTextTransform', $module::$textTransforms, [
+							'label' => 'Casse',
+							'selected' => $this->getData(['theme', 'header', 'textTransform'])
 						]); ?>
 					</div>
-					<div class="col3">
-						<?php echo template::select('themeHeaderFont', $module::$fonts, [
-							'label' => 'Police',
-							'selected' => $this->getData(['theme', 'header', 'font'])
-						]); ?>
-					</div>
-					
 				</div>
 			</div>
 		</div>

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,46 @@
 			</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">
-						<?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
-							'label' => 'Caractères',
-							'selected' => $this->getData(['theme', 'menu', 'textTransform'])
-						]); ?>
+				<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 class="col3">
 						<?php echo template::select('themeMenuFontWeight', $module::$fontWeights, [
 							'label' => 'Style',
 							'selected' => $this->getData(['theme', 'menu', 'fontWeight'])
 						]); ?>
-					</div>
+					</div>						
+					<div class="col3">
+						<?php echo template::select('themeMenuTextTransform', $module::$textTransforms, [
+							'label' => 'Casse',
+							'selected' => $this->getData(['theme', 'menu', 'textTransform'])
+						]); ?>
+					</div>													
 				</div>
-				<div class='row'>
-					<div class="col6">
-							<?php echo template::select('themeMenuFont', $module::$fonts, [
-								'label' => 'Police',
-								'selected' => $this->getData(['theme', 'menu', 'font'])
-							]); ?>
-						</div>
-					<div class="col6">
-							<?php echo template::select('themeMenuFontSize', $module::$menuFontSizes, [
-								'label' => 'Taille',
-								'selected' => $this->getData(['theme', 'menu', 'fontSize'])
-							]); ?>
-						</div>
-					</div>
-			</div>
+			<div>
 		</div>
 	</div>
 	<div class="row">
@@ -114,15 +125,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(); ?>

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'])
 						]); ?>
@@ -58,6 +63,53 @@
 			</div>
 		</div>
 	</div>
+	<div class="row">
+		<div class="col6">
+			<div class="block">
+				<h4>Mise en forme du texte</h4>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::select('themeTextFont', $module::$fonts, [
+							'label' => 'Police',
+							'selected' => $this->getData(['theme', 'text', 'font'])
+						]); ?>
+					</div>				
+					<div class="col6">
+						<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
+							'label' => 'Taille',
+							'help' => 'Hauteur de référence pour la bannière, le menu et le pied de page',
+							'selected' => $this->getData(['theme', 'text', 'fontSize'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col6">
+			<div class="block">
+				<h4>Mise en forme des titres</h4>				
+				<div class="row">
+					<div class="col4">
+						<?php echo template::select('themeTitleFont', $module::$fonts, [
+							'label' => 'Police',
+							'selected' => $this->getData(['theme', 'title', 'font'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('themeTitleFontWeight', $module::$fontWeights, [
+							'label' => 'Style',
+							'selected' => $this->getData(['theme', 'title', 'fontWeight'])
+						]); ?>
+					</div>									
+					<div class="col4">
+						<?php echo template::select('themeTitleTextTransform', $module::$textTransforms, [
+							'label' => 'Casse',
+							'selected' => $this->getData(['theme', 'title', 'textTransform'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 	<div class="row">
 		<div class="col12">
 			<div class="block">
@@ -85,50 +137,4 @@
 			</div>
 		</div>
 	</div>
-	<div class="row">
-		<div class="col6">
-			<div class="block">
-				<h4>Mise en forme du texte</h4>
-				<div class="row">
-					<div class="col6">
-						<?php echo template::select('themeTextFontSize', $module::$siteFontSizes, [
-							'label' => 'Taille',
-							'selected' => $this->getData(['theme', 'text', 'fontSize'])
-						]); ?>
-					</div>
-					<div class="col6">
-						<?php echo template::select('themeTextFont', $module::$fonts, [
-							'label' => 'Police',
-							'selected' => $this->getData(['theme', 'text', 'font'])
-						]); ?>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="col6">
-			<div class="block">
-				<h4>Mise en forme des titres</h4>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::select('themeTitleTextTransform', $module::$textTransforms, [
-							'label' => 'Caractères',
-							'selected' => $this->getData(['theme', 'title', 'textTransform'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('themeTitleFontWeight', $module::$fontWeights, [
-							'label' => 'Style',
-							'selected' => $this->getData(['theme', 'title', 'fontWeight'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('themeTitleFont', $module::$fonts, [
-							'label' => 'Police',
-							'selected' => $this->getData(['theme', 'title', 'font'])
-						]); ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
 <?php echo template::formClose(); ?>

core/vendor/tinymce/link_list.json

@@ -1 +1 @@
-[{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise-en-page"}]},{"title":"Priv\u00e9e","value":"?privee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Site de Zwii","value":"?site-de-zwii"},{"title":"Contact","value":"?contact"}]
+[{"title":"blockLeft","value":"?blockLeft"},{"title":"blockRight","value":"?blockRight"},{"title":"Accueil","value":"?accueil","menu":[{"title":"Enfant","value":"?enfant"},{"title":"Mise en page","value":"?mise_en_page"}]},{"title":"Cach\u00e9e","value":"?cachee"},{"title":"Blog","value":"?blog"},{"title":"Galeries","value":"?galeries"},{"title":"Code","value":"?code"},{"title":"Contact","value":"?contact"}]