modif : 3 colonnes dans footer

core/core.php

@@ -308,7 +308,10 @@ class common {
 				'socialsAlign' => 'center',
 				'text' => '',
 				'textAlign' => 'center',
-				'textColor' => 'rgba(33, 34, 35, 1)'
+				'textColor' => 'rgba(33, 34, 35, 1)',
+				'copyrightPosition' => '3',
+				'textPosition' => '2',
+				'socialsPosition' => '1'
 			],
 			'header' => [
 				'backgroundColor' => 'rgba(255, 255, 255, 1)',
@@ -868,6 +871,16 @@ class common {
 			$this->SaveData();
 
 		}
+		// Version 8.3.14
+		if($this->getData(['core', 'dataVersion']) < 8314) {
+			$this->setData(['theme','footer','socialsPosition','1']);
+			$this->setData(['theme','footer','textPosition','2']);			
+			$this->setData(['theme','footer','copyrightPosition','3']);			
+			$this->setData(['core', 'dataVersion', 8314]);
+			$this->SaveData();
+
+		}
+		
 	}
 
 }

core/layout/common.css

@@ -398,7 +398,13 @@ footer {
 	text-align: center;
 	font-size: .8em;
 	padding: 10px 20px;
+vertical-align:middle;
 }
+
+footer .col4 {
+	vertical-align: middle
+}
+
 footer #footerSocials {
 	font-size: 1.6em;
 }

core/layout/main.php

@@ -137,9 +137,38 @@
 		<!-- Pied de page dans le site -->
 		<footer <?php if($this->getData(['theme', 'footer', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
 			<div class="container">
-				<?php $layout->showSocials(); ?>
+				<div class="row">
-				<?php $layout->showFooterText(); ?>
+					<div class="col4"> <!-- bloc gauche -->
-				<?php $layout->showCopyright(); ?>
+					<?php 
+						if($this->getData(['theme', 'footer', 'socialsPosition']) === '1') {
+							$layout->showSocials(); }
+						if($this->getData(['theme', 'footer', 'textPosition']) === '1') {
+							$layout->showFooterText(); }
+						if($this->getData(['theme', 'footer', 'copyrightPosition']) === '1') {
+							$layout->showCopyright(); }
+					?>
+					</div>
+					<div class="col4"> <!-- bloc central -->
+					<?php								
+						if($this->getData(['theme', 'footer', 'socialsPosition']) === '2') {
+							$layout->showSocials(); }
+						if($this->getData(['theme', 'footer', 'textPosition']) === '2') {
+							$layout->showFooterText(); }
+						if($this->getData(['theme', 'footer', 'copyrightPosition']) === '2') {
+							$layout->showCopyright(); }			
+					?>
+					</div>
+					<div class="col4"> <!-- bloc droite -->
+					<?php					
+						if($this->getData(['theme', 'footer', 'socialsPosition']) === '3') {
+							$layout->showSocials(); }
+						if($this->getData(['theme', 'footer', 'textPosition']) === '3') {
+							$layout->showFooterText(); }
+						if($this->getData(['theme', 'footer', 'copyrightPosition']) === '3') {
+							$layout->showCopyright(); }			
+					?>			
+					</div>			
+				</div>
 			</div>
 		</footer>
 	<?php endif; ?>
@@ -147,11 +176,40 @@
 <?php if($this->getData(['theme', 'footer', 'position']) === 'body'): ?>
 	<!-- Pied de page dans le fond du site -->
 	<footer>
-		<div class="container">
+		<!--<div class="container">-->
-			<?php $layout->showSocials(); ?>
+			<div class="row">
-			<?php $layout->showFooterText(); ?>
+				<div class="col4"> <!-- bloc gauche -->
-			<?php $layout->showCopyright(); ?>
+				<?php 
+				    if($this->getData(['theme', 'footer', 'socialsPosition']) === '1') {
+						$layout->showSocials(); }
+					if($this->getData(['theme', 'footer', 'textPosition']) === '1') {
+						$layout->showFooterText(); }
+					if($this->getData(['theme', 'footer', 'copyrightPosition']) === '1') {
+						$layout->showCopyright(); }
+				?>
 				</div>
+				<div class="col4"> <!-- bloc central -->
+				<?php								
+					if($this->getData(['theme', 'footer', 'socialsPosition']) === '2') {
+						$layout->showSocials(); }
+					if($this->getData(['theme', 'footer', 'textPosition']) === '2') {
+						$layout->showFooterText(); }
+					if($this->getData(['theme', 'footer', 'copyrightPosition']) === '2') {
+						$layout->showCopyright(); }			
+				?>
+				</div>
+				<div class="col4"> <!-- bloc droite -->
+				<?php					
+					if($this->getData(['theme', 'footer', 'socialsPosition']) === '3') {
+						$layout->showSocials(); }
+					if($this->getData(['theme', 'footer', 'textPosition']) === '3') {
+						$layout->showFooterText(); }
+					if($this->getData(['theme', 'footer', 'copyrightPosition']) === '3') {
+						$layout->showCopyright(); }			
+				?>			
+				</div>			
+			</div>
+		<!-- </div> -->
 	</footer>
 <?php endif; ?>
 <!-- Lien remonter en haut -->

core/module/theme/theme.php

@@ -62,6 +62,12 @@ class theme extends common {
 		'Ubuntu' => 'Ubuntu',
 		'Vollkorn' => 'Vollkorn'
 	];
+	public static $footerblocks = [
+		'0' => 'Masqué',
+		'1' => 'Bloc Gauche',
+		'2' => 'Bloc Central',
+		'3' => 'Bloc Droite'
+	];
 	public static $fontWeights = [
 		'normal' => 'Normal',
 		'bold' => 'Gras'
@@ -266,7 +272,10 @@ class theme extends common {
 				'socialsAlign' => $this->getInput('themeFooterSocialsAlign'),
 				'text' => $this->getInput('themeFooterText', null),
 				'textAlign' => $this->getInput('themeFooterTextAlign'),
-				'textColor' => $this->getInput('themeFooterTextColor')
+				'textColor' => $this->getInput('themeFooterTextColor'),
+				'copyrightPosition' => $this->getInput('themeFooterCopyrightPosition'),
+				'textPosition' => $this->getInput('themeFooterTextPosition'),
+				'socialsPosition' => $this->getInput('themeFooterSocialsPosition')
 			]]);
 			// Valeurs en sortie
 			$this->addOutput([

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

@@ -59,6 +59,33 @@
 			</div>
 		</div>
 	</div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Emplacement du contenu</h4>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::select('themeFooterSocialsPosition', $module::$footerblocks, [
+							'label' => 'Réseaux sociaux',
+							'selected' => $this->getData(['theme', 'footer', 'socialsPosition'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('themeFooterTextPosition', $module::$footerblocks, [
+							'label' => 'Texte personnalisé',
+							'selected' => $this->getData(['theme', 'footer', 'textPosition'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('themeFooterCopyrightPosition', $module::$footerblocks, [
+							'label' => 'Copyright',
+							'selected' => $this->getData(['theme', 'footer', 'copyrightPosition'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 	<div class="row">
 		<div class="col12">
 			<div class="block">
@@ -72,7 +99,7 @@
 					</div>
 					<div class="col4">
 						<?php echo template::select('themeFooterTextAlign', $module::$aligns, [
-							'label' => 'Texte',
+							'label' => 'Texte personnalisé',
 							'selected' => $this->getData(['theme', 'footer', 'textAlign'])
 						]); ?>
 					</div>
@@ -87,9 +114,9 @@
 		</div>
 	</div>
 	<div class="row">
-		<div class="col6">
+		<div class="col12">
 			<div class="block">
-				<h4>Contenu</h4>
+				<h4>Contenu personnalisé</h4>
 				<?php echo template::textarea('themeFooterText', [
 					'label' => 'Texte du pied de page',
 					'value' => $this->getData(['theme', 'footer', 'text'])

site/data/theme.css

@@ -1 +1 @@
-/*d1bbb044f9097442bfb4526883c52f2c*/@import url("https://fonts.googleapis.com/css?family=Open+Sans|Oswald|Oswald");body{background-color:rgba(236,239,241,1);font-family:"Open Sans",sans-serif}a{color:rgba(74,105,189,1)}a:hover{color:rgba(59,90,174,1)}body,.row > div{font-size:14px}body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:rgba(33, 34, 35, 1)}.container{max-width:1170px}#site{background-color:rgba(255, 255, 255, 1);border-radius:0;box-shadow:0 #212223}.speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,input[type='radio']:checked + label:before,.helpContent{background-color:rgba(74,105,189,1);color:white}.helpButton span{color:rgba(74,105,189,1)}input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:rgba(74,105,189,1)}.speechBubble:before{border-color:rgba(74,105,189,1) transparent transparent transparent}.button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before,input[type='radio']:checked:hover + label:before,input[type='radio']:not(:checked):active + label:before{background-color:rgba(59,90,174,1)}.helpButton span:hover{color:rgba(59,90,174,1)}.button:active,button[type='submit']:active,.pagination a:active{background-color:rgba(54,85,169,1)}h1,h2,h3,h4,h5,h6{color:rgba(74,105,189,1);font-family:"Oswald",sans-serif;font-weight:normal;text-transform:none}header{background-size:auto}header{background-color:rgba(255,255,255,1);height:150px;line-height:150px;text-align:center}@media (max-width: 767px) {header{height:75px;line-height:75px;}}header{background-image:url("../file/source/galerie/landscape/desert.jpg");background-position:center center;background-repeat:no-repeat}header span{color:rgba(33,34,35,1);font-family:"Oswald",sans-serif;font-weight:normal;font-size:2em;text-transform:none}nav,nav a{background-color:rgba(74,105,189,1)}nav a,#toggle span,nav a:hover{color:rgba(255, 255, 255, 1)}nav a:hover{background-color:rgba(59,90,174,1)}nav a.active{background-color:rgba(54,85,169,1)}#menu{text-align:left}#toggle span,#menu a{padding:15px 10px;font-weight:normal;font-size:1em;text-transform:none}footer{background-color:rgba(255,255,255,1);color:rgba(33, 34, 35, 1)}footer a{color:rgba(33, 34, 35, 1)}footer .container > div{margin:10px 0}#footerSocials{text-align:center}#footerText{text-align:center}#footerCopyright{text-align:center}
+/*e64cb9101a3bbf0b43666ac5b4979668*/@import url("https://fonts.googleapis.com/css?family=Open+Sans|Oswald|Oswald");body{background-color:rgba(236,239,241,1);font-family:"Open Sans",sans-serif}a{color:rgba(74,105,189,1)}a:hover{color:rgba(59,90,174,1)}body,.row > div{font-size:14px}body,.block h4,input[type='email'],input[type='text'],input[type='password'],.inputFile,select,textarea,.inputFile,.button.buttonGrey,.button.buttonGrey:hover{color:rgba(33, 34, 35, 1)}.container{max-width:1170px}#site{background-color:rgba(255, 255, 255, 1);border-radius:0;box-shadow:0 #212223}.speechBubble,.button,.button:hover,button[type='submit'],.pagination a,.pagination a:hover,input[type='checkbox']:checked + label:before,input[type='radio']:checked + label:before,.helpContent{background-color:rgba(74,105,189,1);color:white}.helpButton span{color:rgba(74,105,189,1)}input[type='text']:hover,input[type='password']:hover,.inputFile:hover,select:hover,textarea:hover{border-color:rgba(74,105,189,1)}.speechBubble:before{border-color:rgba(74,105,189,1) transparent transparent transparent}.button:hover,button[type='submit']:hover,.pagination a:hover,input[type='checkbox']:not(:active):checked:hover + label:before,input[type='checkbox']:active + label:before,input[type='radio']:checked:hover + label:before,input[type='radio']:not(:checked):active + label:before{background-color:rgba(59,90,174,1)}.helpButton span:hover{color:rgba(59,90,174,1)}.button:active,button[type='submit']:active,.pagination a:active{background-color:rgba(54,85,169,1)}h1,h2,h3,h4,h5,h6{color:rgba(74,105,189,1);font-family:"Oswald",sans-serif;font-weight:normal;text-transform:none}header{background-size:auto}header{background-color:rgba(255,255,255,1);height:150px;line-height:150px;text-align:center}@media (max-width: 767px) {header{height:75px;line-height:75px;}}header span{color:rgba(33,34,35,1);font-family:"Oswald",sans-serif;font-weight:normal;font-size:2em;text-transform:none}nav,nav a{background-color:rgba(74,105,189,1)}nav a,#toggle span,nav a:hover{color:rgba(255, 255, 255, 1)}nav a:hover{background-color:rgba(59,90,174,1)}nav a.active{background-color:rgba(54,85,169,1)}#menu{text-align:left}#toggle span,#menu a{padding:15px 10px;font-weight:normal;font-size:1em;text-transform:none}footer{background-color:rgba(255,255,255,1);color:rgba(33, 34, 35, 1)}footer a{color:rgba(33, 34, 35, 1)}footer .container > div{margin:5px 0}#footerSocials{text-align:center}#footerText{text-align:left}#footerCopyright{text-align:right}