ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
6
6
Fork 2
Code Releases 147 Activity

Merge master 9206

This commit is contained in:
fredtempez 2019-09-18 18:39:11 +02:00
parent e496e5f322 8de6e2af0a
commit 007514bf33
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.php
View File

@ -707,11 +707,7 @@ 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: /site/' .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 . '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 .

7
core/layout/main.php
View File

@ -190,7 +190,7 @@
) )
) { $position = 'site'; } else { ) { $position = 'site'; } else {
$position = 'body'; $position = 'body';
//echo '</div>'; echo '</div>';
} }
?> ?>
<!-- Pied de page --> <!-- Pied de page -->
@ -245,7 +245,10 @@
</div> </div>
</div> </div>
</footer> </footer>
</div> <?php
if ($this->getData(['theme', 'footer', 'position']) === 'site') {
echo '</div>';
} ?>
<!-- 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();?>