remijean/ZwiiCMS
2
1
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Pull Requests Activity

[9.3.06] petites corrections

Browse Source
This commit is contained in:
fredtempez 2019-09-17 18:22:43 +02:00
parent 23e122f0f2
commit 8becd89e18
3 changed files with 254 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -1,5 +1,10 @@
# Changelog # Changelog
## Version 9.2.06
- Correction :
- Validation html
- Syntaxe du fichier robots.txt
## Version 9.2.05 ## Version 9.2.05
- Correction : - Correction :
- Suppression totale de Swiper (dossier source et template Tinymce) - Suppression totale de Swiper (dossier source et template Tinymce)

13
core/core.php
View File

@ -33,7 +33,7 @@ class common {
const TEMP_DIR = 'site/tmp/'; const TEMP_DIR = 'site/tmp/';
// Numéro de version // Numéro de version
const ZWII_VERSION = '9.2.05'; const ZWII_VERSION = '9.2.06';
public static $actions = []; public static $actions = [];
public static $coreModuleIds = [ public static $coreModuleIds = [
@ -618,17 +618,16 @@ class common {
PHP_EOL . PHP_EOL .
'# ZWII CONFIG ---------' . PHP_EOL . '# ZWII CONFIG ---------' . PHP_EOL .
'User-agent: *' . PHP_EOL . 'User-agent: *' . PHP_EOL .
'Disallow: /core/' . PHP_EOL . // 'Disallow: /core/' . PHP_EOL .
'Disallow: /module/' .PHP_EOL . // 'Disallow: /module/' .PHP_EOL .
'Disallow: /site/data' .PHP_EOL . 'Disallow: /site/data/' .PHP_EOL .
'Disallow: /site/tmp' .PHP_EOL . 'Disallow: /site/tmp/' .PHP_EOL .
'Disallow: /site/backup' .PHP_EOL . 'Disallow: /site/backup/' .PHP_EOL .
'Allow: /site/file/' .PHP_EOL . 'Allow: /site/file/' .PHP_EOL .
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml' . PHP_EOL . 'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml' . PHP_EOL .
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml.gz' . PHP_EOL . 'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml.gz' . PHP_EOL .
'# ZWII CONFIG ---------' . PHP_EOL ; '# ZWII CONFIG ---------' . PHP_EOL ;
if (file_exists('robots.txt')) { if (file_exists('robots.txt')) {
return(file_put_contents( return(file_put_contents(
'robots.txt', 'robots.txt',

77
core/layout/main.php
View File

@ -1,7 +1,7 @@
<?php $layout = new layout($this); ?> <?php $layout = new layout($this); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html prefix="og: http://ogp.me/ns#" lang="fr"> <html prefix="og: http://ogp.me/ns#" lang="fr">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<?php $layout->showMetaTitle(); ?> <?php $layout->showMetaTitle(); ?>
@ -15,16 +15,14 @@
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/theme.css?<?php echo md5_file(self::DATA_DIR.'theme.css'); ?>">
<link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>"> <link rel="stylesheet" href="<?php echo helper::baseUrl(false); ?>site/data/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
<?php $layout->showStyle(); ?> <?php $layout->showStyle(); ?>
<?php <?php if (file_exists('site/data/head.inc.html')) {
if (file_exists('site/data/head.inc.html')) {
include('site/data/head.inc.html'); include('site/data/head.inc.html');
} }?>
?> </head>
</head> <body>
<body> <?php $layout->showBar(); ?>
<?php $layout->showBar(); ?> <?php $layout->showNotification(); ?>
<?php $layout->showNotification(); ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
<!-- Menu dans le fond du site avant la bannière --> <!-- Menu dans le fond du site avant la bannière -->
<nav <nav
<?php <?php
@ -45,10 +43,10 @@
?>"> ?>">
<?php $layout->showMenu(); ?> <?php $layout->showMenu(); ?>
</div> </div> <!--fin menu -->
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?> <?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?>
<!-- Bannière dans le fond du site --> <!-- Bannière dans le fond du site -->
<header> <header>
<?php <?php
@ -61,32 +59,28 @@
): ?> ): ?>
<div class="container"> <div class="container">
<span><?php echo $this->getData(['config', 'title']); ?></span> <span><?php echo $this->getData(['config', 'title']); ?></span>
</div> </div> <!--fin container -->
<?php endif; ?> <?php endif; ?>
<?php <?php
if ($this->getData(['theme','header','linkHome'])){echo "</a>";} if ($this->getData(['theme','header','linkHome'])){echo "</a>";}
?> ?>
</header> </header>
<?php endif; ?> <?php endif; ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?>
<!-- Menu dans le fond du site après la bannière --> <!-- Menu dans le fond du site après la bannière -->
<nav> <nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
<?php $layout->showMenu(); ?>
</div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<!-- Site --> <!-- Site -->
<div id="site" class="container"> <div id="site" class="container">
<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?>
<!-- Menu dans le site avant la bannière --> <!-- Menu dans le site avant la bannière -->
<nav> <nav>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
<?php $layout->showMenu(); ?>
</div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<?php if( <?php if(
@ -107,9 +101,7 @@
// Affiche toujours le titre de la bannière pour l'édition du thème // Affiche toujours le titre de la bannière pour l'édition du thème
OR ($this->getUrl(0) === 'theme' AND $this->getUrl(1) === 'header') OR ($this->getUrl(0) === 'theme' AND $this->getUrl(1) === 'header')
): ?> ): ?>
<div class="container"> <div class="container"><span><?php echo $this->getData(['config', 'title']); ?></span></div>
<span><?php echo $this->getData(['config', 'title']); ?></span>
</div>
<?php endif; ?> <?php endif; ?>
</header> </header>
<?php <?php
@ -127,9 +119,7 @@
<!-- Menu dans le site après la bannière --> <!-- Menu dans le site après la bannière -->
<nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>> <nav <?php if($this->getData(['theme', 'menu', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div> <div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
<div id="menu" class="container"> <div id="menu" class="container"><?php $layout->showMenu(); ?></div>
<?php $layout->showMenu(); ?>
</div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<!-- Corps de page --> <!-- Corps de page -->
@ -172,9 +162,7 @@
<div class="row siteContainer"> <div class="row siteContainer">
<?php <?php
if ($blockleft !== "") :?> if ($blockleft !== "") :?>
<div class="<?php echo $blockleft; ?>" id="contentLeft"> <div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div>
<?php $layout->showBarContentLeft(); ?>
</div>
<?php endif; ?> <?php endif; ?>
<div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent(); <div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent();
if (file_exists('site/data/body.inc.html')) { if (file_exists('site/data/body.inc.html')) {
@ -184,18 +172,14 @@
</div> </div>
<?php <?php
if ($blockright !== "") :?> if ($blockright !== "") :?>
<div class="<?php echo $blockright; ?>" id="contentRight"> <div class="<?php echo $blockright; ?>" id="contentRight"><?php $layout->showBarContentRight(); ?></div>
<?php $layout->showBarContentRight(); ?>
</div>
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php } <?php }
?> ?>
</section> </section>
<!-- footer --> <!-- footer -->
<?php <?php
// Déterminer la position // Déterminer la position
if( if(
$this->getData(['theme', 'footer', 'position']) === 'site' $this->getData(['theme', 'footer', 'position']) === 'site'
@ -206,18 +190,16 @@
) )
) { $position = 'site'; } else { ) { $position = 'site'; } else {
$position = 'body'; $position = 'body';
echo '</div>'; //echo '</div>';
} }
?> ?>
<!-- Pied de page --> <!-- Pied de page -->
<footer <?php if($this->getData(['theme', 'footer', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>> <footer <?php if($this->getData(['theme', 'footer', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
<?php <?php
if ($position === 'site'): ?> if ($position === 'site'): ?>
<div class="container"> <div class="container"><div class="row" id="footersite">
<div class="row" id="footersite">
<?php else: ?> <?php else: ?>
<div class="container-large"> <div class="container-large"><div class="row" id="footerbody">
<div class="row" id="footerbody">
<?php endif?> <?php endif?>
<!-- Mise en page --> <!-- Mise en page -->
<?php switch($this->getData(['theme', 'footer', 'template'])) { <?php switch($this->getData(['theme', 'footer', 'template'])) {
@ -263,8 +245,9 @@
</div> </div>
</div> </div>
</footer> </footer>
<!-- Lien remonter en haut --> </div>
<div id="backToTop"><?php echo template::ico('up'); ?></div> <!-- Lien remonter en haut -->
<?php $layout->showScript();?> <div id="backToTop"><?php echo template::ico('up'); ?></div>
<?php $layout->showScript();?>
</body> </body>
</html> </html>