From 19368fc6800496dcf09dad599dda5056e0165082 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 19 Jun 2019 03:28:52 +0200 Subject: [PATCH] [9.1.13] pb alignement horizontal --- core/layout/common.css | 12 +++++++----- core/layout/main.php | 8 ++++---- core/module/install/ressource/defaultdata.php | 5 +++-- core/module/theme/theme.php | 10 +++++----- core/module/theme/view/footer/footer.js.php | 4 ++-- core/module/theme/view/footer/footer.php | 14 ++++++-------- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/layout/common.css b/core/layout/common.css index dfe612e4..b63809e3 100755 --- a/core/layout/common.css +++ b/core/layout/common.css @@ -565,14 +565,16 @@ section:after { } /* Pied de page */ -footer { - padding: 1px 20px; -} body > footer { margin: 0 -10px; } -#footersiteLeft, #footersiteCenter, #footersiteRight { - vertical-align: middle; +footer { + padding: 1px 20px; + position: relative; +} + +footer > .container { + align-items: center; } diff --git a/core/layout/main.php b/core/layout/main.php index 39c5cc4f..fd861806 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -238,20 +238,20 @@ $class['right'] = "col4"; break; }?> -
-
+
+
getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); } ?>
-
+
getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); } ?>
-
+
getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); } diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 0237f341..87ad8ff2 100644 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -433,7 +433,7 @@ class install extends common { 'font' => 'Open+Sans', 'fontSize' => '.8em', 'fontWeight' => 'normal', - 'height' => '10px', + 'height' => '0', 'loginLink' => true, 'margin' => false, 'position' => 'site', @@ -449,7 +449,8 @@ class install extends common { 'displayVersion' => true, 'displayVersion' => true, 'displaySiteMap' => true, - 'displayCopyright' => true + 'displayCopyright' => true, + 'template' => 3 ], 'header' => [ 'backgroundColor' => 'rgba(255, 255, 255, 1)', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 6675cc65..14ece0d3 100755 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -78,11 +78,11 @@ class theme extends common { 'bold' => 'Gras' ]; public static $footerHeights = [ - '-5px' => 'Réduite', - '0px' => 'Très petite', - '5px' => 'Petite', - '10px' => 'Grande', - '15px' => 'Très grande' + '0' => 'Nulles', + '10px' => 'Très petites', + '15px' => 'Petites', + '20px' => 'Grandes', + '30px' => 'Très grandes' ]; public static $footerPositions = [ 'hide' => 'Caché', diff --git a/core/module/theme/view/footer/footer.js.php b/core/module/theme/view/footer/footer.js.php index d6f32aae..f1277fd0 100755 --- a/core/module/theme/view/footer/footer.js.php +++ b/core/module/theme/view/footer/footer.js.php @@ -25,9 +25,9 @@ $("input, select").on("change", function() { var css = "footer{background-color:" + colors.normal + ";color:" + textColor + "}"; css += "footer a{color:" + textColor + "}"; // Hauteur du pied de page - css += "footer .container > div{margin:" + $("#themeFooterHeight").val() + " 0}"; + css += "footer .container > #footersiteLeft, #footersiteCenter, #footersiteRight {padding:" + $("#themeFooterHeight").val() + " 0}"; //css += "footer .container > div{padding:0}"; - css += "footer .container-large > div{margin:" + $("#themeFooterHeight").val() + " 0}"; + css += "footer .container-large > #footersiteLeft, #footersiteCenter, #footersiteRight {padding:" + $("#themeFooterHeight").val() + " 0}"; //css += "footer .container-large > div{padding:0}"; // Alignement du contenu css += "#footerSocials{text-align:" + $("#themeFooterSocialsAlign").val() + "}"; diff --git a/core/module/theme/view/footer/footer.php b/core/module/theme/view/footer/footer.php index 7738d774..378ef34a 100755 --- a/core/module/theme/view/footer/footer.php +++ b/core/module/theme/view/footer/footer.php @@ -46,8 +46,9 @@
'Hauteur', - 'selected' => $this->getData(['theme', 'footer', 'height']) + 'label' => 'Marges verticales', + 'selected' => $this->getData(['theme', 'footer', 'height']), + 'help' => 'La hauteur du pied de page est dynmamique selon le contenu.Ces marges sont ajoutées au-dessus et en-dessous.' ]); ?>
@@ -111,8 +112,7 @@

Contenu personnalisé texte ou HTML :

'Emplacement', - 'selected' => $this->getData(['theme', 'footer', 'textPosition']), - 'class' => 'themeFooterPosition' + 'selected' => $this->getData(['theme', 'footer', 'textPosition']) ]); ?> 'Alignement', @@ -123,8 +123,7 @@

Réseaux sociaux :

'Emplacement', - 'selected' => $this->getData(['theme', 'footer', 'socialsPosition']), - 'class' => 'themeFooterPosition' + 'selected' => $this->getData(['theme', 'footer', 'socialsPosition']) ]); ?> 'Alignement', @@ -135,8 +134,7 @@

Info et copyright :

'Emplacement', - 'selected' => $this->getData(['theme', 'footer', 'copyrightPosition']), - 'class' => 'themeFooterPosition' + 'selected' => $this->getData(['theme', 'footer', 'copyrightPosition']) ]); ?> 'Alignement',