forked from ZwiiCMS-Team/ZwiiCMS
[9.3.06] petites corrections
This commit is contained in:
fredtempez
parent
23e122f0f2
commit
8becd89e18
@ -1,5 +1,10 @@
|
||||
# Changelog
|
||||
|
||||
## Version 9.2.06
|
||||
- Correction :
|
||||
- Validation html
|
||||
- Syntaxe du fichier robots.txt
|
||||
|
||||
## Version 9.2.05
|
||||
- Correction :
|
||||
- Suppression totale de Swiper (dossier source et template Tinymce)
|
||||
|
||||
@ -33,7 +33,7 @@ class common {
|
||||
const TEMP_DIR = 'site/tmp/';
|
||||
|
||||
// Numéro de version
|
||||
const ZWII_VERSION = '9.2.05';
|
||||
const ZWII_VERSION = '9.2.06';
|
||||
|
||||
public static $actions = [];
|
||||
public static $coreModuleIds = [
|
||||
@ -618,17 +618,16 @@ class common {
|
||||
PHP_EOL .
|
||||
'# ZWII CONFIG ---------' . PHP_EOL .
|
||||
'User-agent: *' . PHP_EOL .
|
||||
'Disallow: /core/' . PHP_EOL .
|
||||
'Disallow: /module/' .PHP_EOL .
|
||||
'Disallow: /site/data' .PHP_EOL .
|
||||
'Disallow: /site/tmp' .PHP_EOL .
|
||||
'Disallow: /site/backup' .PHP_EOL .
|
||||
// 'Disallow: /core/' . PHP_EOL .
|
||||
// 'Disallow: /module/' .PHP_EOL .
|
||||
'Disallow: /site/data/' .PHP_EOL .
|
||||
'Disallow: /site/tmp/' .PHP_EOL .
|
||||
'Disallow: /site/backup/' .PHP_EOL .
|
||||
'Allow: /site/file/' .PHP_EOL .
|
||||
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml' . PHP_EOL .
|
||||
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml.gz' . PHP_EOL .
|
||||
'# ZWII CONFIG ---------' . PHP_EOL ;
|
||||
|
||||
|
||||
if (file_exists('robots.txt')) {
|
||||
return(file_put_contents(
|
||||
'robots.txt',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php $layout = new layout($this); ?>
|
||||
<!DOCTYPE html>
|
||||
<html prefix="og: http://ogp.me/ns#" lang="fr">
|
||||
<head>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<?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/custom.css?<?php echo md5_file(self::DATA_DIR.'custom.css'); ?>">
|
||||
<?php $layout->showStyle(); ?>
|
||||
<?php
|
||||
if (file_exists('site/data/head.inc.html')) {
|
||||
<?php if (file_exists('site/data/head.inc.html')) {
|
||||
include('site/data/head.inc.html');
|
||||
}
|
||||
?>
|
||||
</head>
|
||||
<body>
|
||||
<?php $layout->showBar(); ?>
|
||||
<?php $layout->showNotification(); ?>
|
||||
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
|
||||
}?>
|
||||
</head>
|
||||
<body>
|
||||
<?php $layout->showBar(); ?>
|
||||
<?php $layout->showNotification(); ?>
|
||||
<?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 -->
|
||||
<nav
|
||||
<?php
|
||||
@ -45,10 +43,10 @@
|
||||
?>">
|
||||
|
||||
<?php $layout->showMenu(); ?>
|
||||
</div>
|
||||
</div> <!--fin menu -->
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
<?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?>
|
||||
<?php endif; ?>
|
||||
<?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?>
|
||||
<!-- Bannière dans le fond du site -->
|
||||
<header>
|
||||
<?php
|
||||
@ -61,32 +59,28 @@
|
||||
): ?>
|
||||
<div class="container">
|
||||
<span><?php echo $this->getData(['config', 'title']); ?></span>
|
||||
</div>
|
||||
</div> <!--fin container -->
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
if ($this->getData(['theme','header','linkHome'])){echo "</a>";}
|
||||
?>
|
||||
</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 -->
|
||||
<nav>
|
||||
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
|
||||
<div id="menu" class="container">
|
||||
<?php $layout->showMenu(); ?>
|
||||
</div>
|
||||
<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
<!-- Site -->
|
||||
<div id="site" class="container">
|
||||
<?php endif; ?>
|
||||
<!-- Site -->
|
||||
<div id="site" class="container">
|
||||
<?php if($this->getData(['theme', 'menu', 'position']) === 'site-first'): ?>
|
||||
<!-- Menu dans le site avant la bannière -->
|
||||
<nav>
|
||||
<div id="toggle"><?php echo template::ico('menu',null,null,'2em'); ?></div>
|
||||
<div id="menu" class="container">
|
||||
<?php $layout->showMenu(); ?>
|
||||
</div>
|
||||
<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
<?php if(
|
||||
@ -107,9 +101,7 @@
|
||||
// Affiche toujours le titre de la bannière pour l'édition du thème
|
||||
OR ($this->getUrl(0) === 'theme' AND $this->getUrl(1) === 'header')
|
||||
): ?>
|
||||
<div class="container">
|
||||
<span><?php echo $this->getData(['config', 'title']); ?></span>
|
||||
</div>
|
||||
<div class="container"><span><?php echo $this->getData(['config', 'title']); ?></span></div>
|
||||
<?php endif; ?>
|
||||
</header>
|
||||
<?php
|
||||
@ -127,9 +119,7 @@
|
||||
<!-- Menu dans le site après la bannière -->
|
||||
<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="menu" class="container">
|
||||
<?php $layout->showMenu(); ?>
|
||||
</div>
|
||||
<div id="menu" class="container"><?php $layout->showMenu(); ?></div>
|
||||
</nav>
|
||||
<?php endif; ?>
|
||||
<!-- Corps de page -->
|
||||
@ -172,9 +162,7 @@
|
||||
<div class="row siteContainer">
|
||||
<?php
|
||||
if ($blockleft !== "") :?>
|
||||
<div class="<?php echo $blockleft; ?>" id="contentLeft">
|
||||
<?php $layout->showBarContentLeft(); ?>
|
||||
</div>
|
||||
<div class="<?php echo $blockleft; ?>" id="contentLeft"><?php $layout->showBarContentLeft(); ?></div>
|
||||
<?php endif; ?>
|
||||
<div class="<?php echo $content; ?>" id="contentSite"><?php $layout->showContent();
|
||||
if (file_exists('site/data/body.inc.html')) {
|
||||
@ -184,18 +172,14 @@
|
||||
</div>
|
||||
<?php
|
||||
if ($blockright !== "") :?>
|
||||
<div class="<?php echo $blockright; ?>" id="contentRight">
|
||||
<?php $layout->showBarContentRight(); ?>
|
||||
</div>
|
||||
<div class="<?php echo $blockright; ?>" id="contentRight"><?php $layout->showBarContentRight(); ?></div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php }
|
||||
?>
|
||||
</section>
|
||||
<!-- footer -->
|
||||
|
||||
<?php
|
||||
|
||||
// Déterminer la position
|
||||
if(
|
||||
$this->getData(['theme', 'footer', 'position']) === 'site'
|
||||
@ -206,18 +190,16 @@
|
||||
)
|
||||
) { $position = 'site'; } else {
|
||||
$position = 'body';
|
||||
echo '</div>';
|
||||
//echo '</div>';
|
||||
}
|
||||
?>
|
||||
<!-- Pied de page -->
|
||||
<footer <?php if($this->getData(['theme', 'footer', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
|
||||
<?php
|
||||
if ($position === 'site'): ?>
|
||||
<div class="container">
|
||||
<div class="row" id="footersite">
|
||||
<div class="container"><div class="row" id="footersite">
|
||||
<?php else: ?>
|
||||
<div class="container-large">
|
||||
<div class="row" id="footerbody">
|
||||
<div class="container-large"><div class="row" id="footerbody">
|
||||
<?php endif?>
|
||||
<!-- Mise en page -->
|
||||
<?php switch($this->getData(['theme', 'footer', 'template'])) {
|
||||
@ -263,8 +245,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
<!-- Lien remonter en haut -->
|
||||
<div id="backToTop"><?php echo template::ico('up'); ?></div>
|
||||
<?php $layout->showScript();?>
|
||||
</div>
|
||||
<!-- Lien remonter en haut -->
|
||||
<div id="backToTop"><?php echo template::ico('up'); ?></div>
|
||||
<?php $layout->showScript();?>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user