From 2641659d918ac4b59c8ae85e3d88e557bbbb3545 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 2 Feb 2020 12:02:44 +0100
Subject: [PATCH] =?UTF-8?q?[9.2.17]=20conformit=C3=A9=20p=20dans=20span=20?=
 =?UTF-8?q?(footer)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                  | 1 +
 core/core.php                               | 6 +++---
 core/layout/common.css                      | 2 +-
 core/module/theme/view/footer/footer.js.php | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b0e27767..c24f53a3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,7 @@
 ## version 9.2.17
 - Corrections :
     - Affiche le nom du la page plutôt que son id dans le fil d'ariane.
+    - Conformité balise p dans span.
     - Petites corrections.
 - Modifications : 
     - Image du fond (body), options responsive cover et contain.
diff --git a/core/core.php b/core/core.php
index 7462ac10..5970272c 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1206,13 +1206,13 @@ class core extends common {
 			} else {
 				$css .= 'footer{padding:0}';
 			}
-			$css .= 'footer span{color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
+			$css .= 'footer span, #footerText > p {color:' . $this->getData(['theme', 'footer', 'textColor']) . ';font-family:"' . str_replace('+', ' ', $this->getData(['theme', 'footer', 'font'])) . '",sans-serif;font-weight:' . $this->getData(['theme', 'footer', 'fontWeight']) . ';font-size:' . $this->getData(['theme', 'footer', 'fontSize']) . ';text-transform:' . $this->getData(['theme', 'footer', 'textTransform']) . '}';
 			$css .= 'footer{background-color:' . $colors['normal'] . ';color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer a{color:' . $this->getData(['theme', 'footer', 'textColor']) . '}';
 			$css .= 'footer #footersite > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
 			$css .= 'footer #footerbody > div {margin:' . $this->getData(['theme', 'footer', 'height']) . ' 0}';
 			$css .= '#footerSocials{text-align:' . $this->getData(['theme', 'footer', 'socialsAlign']) . '}';
-			$css .= '#footerText{text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
+			$css .= '#footerText > p {text-align:' . $this->getData(['theme', 'footer', 'textAlign']) . '}';
 			$css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}';
 			// Enregistre la personnalisation
 			file_put_contents(self::DATA_DIR.'theme.css', $css);
@@ -2070,7 +2070,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 id="footerFontText">' . nl2br($footerText) . '</span></div>';
+			echo '<div id="footerText">' . nl2br($footerText) . '</div>';
 		}
 	}
 
diff --git a/core/layout/common.css b/core/layout/common.css
index 57974d87..254fd481 100755
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -613,7 +613,7 @@ footer #footersite > div {
 footer #footerbody > div {
 	padding:0
 }
-#footerFontText > p {
+#footerFont > p {
 	margin-top: 0; 
 	margin-bottom: 0;
 }
diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php
index f39d0b61..759d23fb 100755
--- a/core/module/theme/view/footer/footer.js.php
+++ b/core/module/theme/view/footer/footer.js.php
@@ -30,10 +30,10 @@ $("input, select").on("change", function() {
 	css += "footer #footerbody > div{margin:" + $("#themeFooterHeight").val() + " 0}";		
 	// Alignement du contenu
 	css += "#footerSocials{text-align:" + $("#themeFooterSocialsAlign").val() + "}";
-	css += "#footerText{text-align:" + $("#themeFooterTextAlign").val() + "}";
+	css += "#footerText > p {text-align:" + $("#themeFooterTextAlign").val() + "}";
 	css += "#footerCopyright{text-align:" + $("#themeFooterCopyrightAlign").val() + "}";
 	// Taille, couleur, épaisseur et capitalisation du titre de la bannière
-	css += "footer span{color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}";
+	css += "footer span, #footerText > p {color:" + $("#themeFooterTextColor").val() + ";font-family:'" + footerFont.replace(/\+/g, " ") + "',sans-serif;font-weight:" + $("#themeFooterFontWeight").val() + ";font-size:" + $("#themeFooterFontSize").val() + ";text-transform:" + $("#themeFooterTextTransform").val() + "}";
 	// Marge
 	if($("#themeFooterMargin").is(":checked")) {
 		css += 'footer{padding: 0 20px;}';
@@ -65,8 +65,8 @@ $("input, select").on("change", function() {
 			break;
 	}
     // Réduire la marge du paragraphe de la zone de texte enrichie
-    $("#footerFontText > p").css("margin-top","0");
-    $("#footerFontText > p").css("margin-bottom","0");
+    $("#footerText > p").css("margin-top","0");
+    $("#footerText > p").css("margin-bottom","0");
 });