ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

[9.2.0.dev] Petites corrections

This commit is contained in:
fredtempez 2019-07-04 12:38:23 +02:00
parent f0a7765d05
commit 0a130fdcc3
3 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core.php
View File

@ -40,10 +40,10 @@ class common {
'install', 'install',
'maintenance', 'maintenance',
'page', 'page',
'search',
'sitemap', 'sitemap',
'theme', 'theme',
'user', 'user'
'search'
]; ];
private $data = []; private $data = [];
private $hierarchy = [ private $hierarchy = [

92
core/layout/main.php
View File

@ -220,53 +220,53 @@
<?php else: ?> <?php else: ?>
<div class="container-large"> <div class="container-large">
<?php endif?> <?php endif?>
<!-- Mise en page --> <!-- Mise en page -->
<?php switch($this->getData(['theme', 'footer', 'template'])) { <?php switch($this->getData(['theme', 'footer', 'template'])) {
case '1' : case '1' :
$class['left'] = "displayNone"; $class['left'] = "displayNone";
$class['center'] = "col12"; $class['center'] = "col12";
$class['right'] = "displayNone"; $class['right'] = "displayNone";
break; break;
case '2' : case '2' :
$class['left'] = "col6"; $class['left'] = "col6";
$class['center'] = "displayNone"; $class['center'] = "displayNone";
$class['right'] = "col6"; $class['right'] = "col6";
break; break;
case '3' : case '3' :
$class['left'] = "col4"; $class['left'] = "col4";
$class['center'] = "col4"; $class['center'] = "col4";
$class['right'] = "col4"; $class['right'] = "col4";
break; break;
case '4' : case '4' :
$class['left'] = "col12"; $class['left'] = "col12";
$class['center'] = "col12"; $class['center'] = "col12";
$class['right'] = "col12"; $class['right'] = "col12";
break; break;
}?> }?>
<div class="row" id="footersite"> <div class="row" id="footersite">
<div class="<?php echo $class['left'];?>" id="footer<?php echo $position;?>Left"> <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"> <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"> <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(); }
?> ?>
</div> </div>
</div> </div>
</footer> </div>
</div> </footer>
<!-- Lien remonter en haut --> <!-- Lien remonter en haut -->
<div id="backToTop"><?php echo template::ico('up'); ?></div> <div id="backToTop"><?php echo template::ico('up'); ?></div>
<?php $layout->showScript();?> <?php $layout->showScript();?>
</body> </body>
</html> </html>

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

@ -40,7 +40,7 @@
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
<div class="row"> <div class="row">
<?php echo template::checkbox('themefooterDisplayCopyright', true, 'Mention "Motorisé par"', [ <?php echo template::checkbox('themefooterDisplayCopyright', true, '"Motorisé par..."', [
'checked' => $this->getData(['theme', 'footer','displayCopyright']) 'checked' => $this->getData(['theme', 'footer','displayCopyright'])
]); ?> ]); ?>
</div> </div>
@ -148,7 +148,7 @@
<?php echo template::select('themeFooterHeight', $module::$footerHeights, [ <?php echo template::select('themeFooterHeight', $module::$footerHeights, [
'label' => 'Marges verticales', '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.' 'help' => 'La hauteur du pied de page est dynmamique selon le contenu. Ces marges sont ajoutées<br />au-dessus et en-dessous.'
]); ?> ]); ?>
</div> </div>
</div> </div>