Merge master 9206

This commit is contained in:
fredtempez 2019-09-18 18:39:11 +02:00
commit 007514bf33
2 changed files with 6 additions and 7 deletions

View File

@ -707,11 +707,7 @@ 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: /site/' .PHP_EOL .
'Allow: /site/file/' .PHP_EOL .
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml' . PHP_EOL .
'Sitemap: ' . helper::baseUrl(false) . 'sitemap.xml.gz' . PHP_EOL .

View File

@ -190,7 +190,7 @@
)
) { $position = 'site'; } else {
$position = 'body';
//echo '</div>';
echo '</div>';
}
?>
<!-- Pied de page -->
@ -245,7 +245,10 @@
</div>
</div>
</footer>
</div>
<?php
if ($this->getData(['theme', 'footer', 'position']) === 'site') {
echo '</div>';
} ?>
<!-- Lien remonter en haut -->
<div id="backToTop"><?php echo template::ico('up'); ?></div>
<?php $layout->showScript();?>