lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

[9.1.13] pb alignement horizontal

Browse Source
This commit is contained in:
fredtempez 2019-06-19 03:28:52 +02:00
parent b1aa2df3d7
commit 19368fc680
6 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/layout/common.css
View File

@ -565,14 +565,16 @@ section:after {
} }
/* Pied de page */ /* Pied de page */
footer {
padding: 1px 20px;
}
body > footer { body > footer {
margin: 0 -10px; margin: 0 -10px;
} }
#footersiteLeft, #footersiteCenter, #footersiteRight { footer {
vertical-align: middle; padding: 1px 20px;
position: relative;
}
footer > .container {
align-items: center;
} }

8
core/layout/main.php
View File

@ -238,20 +238,20 @@
$class['right'] = "col4"; $class['right'] = "col4";
break; break;
}?> }?>
<div class="row" id="footer<?php echo $position; ?>"> <div class="row" id="footersite">
<div class="<?php echo $class['left'];?>" id="footer<?php echo $position; ?>Left"> <!-- bloc gauche --> <div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'left') { $layout->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'left') { $layout->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'left') {$layout->showCopyright(); }
?> ?>
</div> </div>
<div class="<?php echo $class['center'];?>" id="footer<?php echo $position; ?>Center"> <!-- bloc central --> <div class="<?php echo $class['center'];?>" id="footer<?php echo $position;?>Center">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'center') { $layout->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'center') { $layout->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'center') { $layout->showCopyright(); }
?> ?>
</div> </div>
<div class="<?php echo $class['right'];?>" id="footer<?php echo $position; ?>Right"> <!-- bloc droite --> <div class="<?php echo $class['right'];?>" id="footer<?php echo $position;?>Right">
<?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); } <?php if($this->getData(['theme', 'footer', 'textPosition']) === 'right') { $layout->showFooterText(); }
if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); } if($this->getData(['theme', 'footer', 'socialsPosition']) === 'right') { $layout->showSocials(); }
if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); } if($this->getData(['theme', 'footer', 'copyrightPosition']) === 'right') { $layout->showCopyright(); }

5
core/module/install/ressource/defaultdata.php
View File

@ -433,7 +433,7 @@ class install extends common {
'font' => 'Open+Sans', 'font' => 'Open+Sans',
'fontSize' => '.8em', 'fontSize' => '.8em',
'fontWeight' => 'normal', 'fontWeight' => 'normal',
'height' => '10px', 'height' => '0',
'loginLink' => true, 'loginLink' => true,
'margin' => false, 'margin' => false,
'position' => 'site', 'position' => 'site',
@ -449,7 +449,8 @@ class install extends common {
'displayVersion' => true, 'displayVersion' => true,
'displayVersion' => true, 'displayVersion' => true,
'displaySiteMap' => true, 'displaySiteMap' => true,
'displayCopyright' => true 'displayCopyright' => true,
'template' => 3
], ],
'header' => [ 'header' => [
'backgroundColor' => 'rgba(255, 255, 255, 1)', 'backgroundColor' => 'rgba(255, 255, 255, 1)',

10
core/module/theme/theme.php
View File

@ -78,11 +78,11 @@ class theme extends common {
'bold' => 'Gras' 'bold' => 'Gras'
]; ];
public static $footerHeights = [ public static $footerHeights = [
'-5px' => 'Réduite', '0' => 'Nulles',
'0px' => 'Très petite', '10px' => 'Très petites',
'5px' => 'Petite', '15px' => 'Petites',
'10px' => 'Grande', '20px' => 'Grandes',
'15px' => 'Très grande' '30px' => 'Très grandes'
]; ];
public static $footerPositions = [ public static $footerPositions = [
'hide' => 'Caché', 'hide' => 'Caché',

4
core/module/theme/view/footer/footer.js.php
View File

@ -25,9 +25,9 @@ $("input, select").on("change", function() {
var css = "footer{background-color:" + colors.normal + ";color:" + textColor + "}"; var css = "footer{background-color:" + colors.normal + ";color:" + textColor + "}";
css += "footer a{color:" + textColor + "}"; css += "footer a{color:" + textColor + "}";
// Hauteur du pied de page // 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 > 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}"; //css += "footer .container-large > div{padding:0}";
// Alignement du contenu // Alignement du contenu
css += "#footerSocials{text-align:" + $("#themeFooterSocialsAlign").val() + "}"; css += "#footerSocials{text-align:" + $("#themeFooterSocialsAlign").val() + "}";

14
core/module/theme/view/footer/footer.php
View File

@ -46,8 +46,9 @@
</div> </div>
<div class="col6"> <div class="col6">
<?php echo template::select('themeFooterHeight', $module::$footerHeights, [ <?php echo template::select('themeFooterHeight', $module::$footerHeights, [
'label' => 'Hauteur', 'label' => 'Marges verticales',
'selected' => $this->getData(['theme', 'footer', 'height']) '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.'
]); ?> ]); ?>
</div> </div>
</div> </div>
@ -111,8 +112,7 @@
<p><strong>Contenu personnalisé texte ou HTML :</strong></p> <p><strong>Contenu personnalisé texte ou HTML :</strong></p>
<?php echo template::select('themeFooterTextPosition', $module::$footerblocks, [ <?php echo template::select('themeFooterTextPosition', $module::$footerblocks, [
'label' => 'Emplacement', 'label' => 'Emplacement',
'selected' => $this->getData(['theme', 'footer', 'textPosition']), 'selected' => $this->getData(['theme', 'footer', 'textPosition'])
'class' => 'themeFooterPosition'
]); ?> ]); ?>
<?php echo template::select('themeFooterTextAlign', $module::$aligns, [ <?php echo template::select('themeFooterTextAlign', $module::$aligns, [
'label' => 'Alignement', 'label' => 'Alignement',
@ -123,8 +123,7 @@
<p><strong>Réseaux sociaux :</strong></p> <p><strong>Réseaux sociaux :</strong></p>
<?php echo template::select('themeFooterSocialsPosition', $module::$footerblocks, [ <?php echo template::select('themeFooterSocialsPosition', $module::$footerblocks, [
'label' => 'Emplacement', 'label' => 'Emplacement',
'selected' => $this->getData(['theme', 'footer', 'socialsPosition']), 'selected' => $this->getData(['theme', 'footer', 'socialsPosition'])
'class' => 'themeFooterPosition'
]); ?> ]); ?>
<?php echo template::select('themeFooterSocialsAlign', $module::$aligns, [ <?php echo template::select('themeFooterSocialsAlign', $module::$aligns, [
'label' => 'Alignement', 'label' => 'Alignement',
@ -135,8 +134,7 @@
<p><strong>Info et copyright :</strong></p> <p><strong>Info et copyright :</strong></p>
<?php echo template::select('themeFooterCopyrightPosition', $module::$footerblocks, [ <?php echo template::select('themeFooterCopyrightPosition', $module::$footerblocks, [
'label' => 'Emplacement', 'label' => 'Emplacement',
'selected' => $this->getData(['theme', 'footer', 'copyrightPosition']), 'selected' => $this->getData(['theme', 'footer', 'copyrightPosition'])
'class' => 'themeFooterPosition'
]); ?> ]); ?>
<?php echo template::select('themeFooterCopyrightAlign', $module::$aligns, [ <?php echo template::select('themeFooterCopyrightAlign', $module::$aligns, [
'label' => 'Alignement', 'label' => 'Alignement',