From 82fc3c6250d2dc203f0d6340bf32522e1752c44d Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Wed, 16 Nov 2022 16:13:52 +0100
Subject: [PATCH] Style et script dans les barres

---
 core/core.php        | 9 +++++++--
 core/layout/main.php | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/core.php b/core/core.php
index d3d75cc9..1539a692 100644
--- a/core/core.php
+++ b/core/core.php
@@ -2935,6 +2935,7 @@ class core extends common
 				'title' => $title,
 				'content' => 	$this->getPage($this->getUrl(0), self::$i18nContent) .
 					// Concatène avec les paramètres avancés.
+					'<style>' . $this->getData(['page', $this->getUrl(0), 'css']) . '</style>' .
 					'<script>' . $this->getData(['page', $this->getUrl(0), 'js']) . '</script>',
 				'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 				'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
@@ -2942,10 +2943,14 @@ class core extends common
 				'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
 				'disable' => $this->getData(['page', $this->getUrl(0), 'disable']),
 				'contentRight' => $this->getData(['page', $this->getUrl(0), 'barRight'])
-					? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), self::$i18nContent)
+					? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), self::$i18nContent) .
+					'<style>' . $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']) . '</style>' .
+					'<script>' . $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'js']) . '</script>'
 					: '',
 				'contentLeft'  => $this->getData(['page', $this->getUrl(0), 'barLeft'])
-					? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), self::$i18nContent)
+					? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), self::$i18nContent) .
+					'<style>' . $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']) . '</style>' .
+					'<script>' . $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'js']) . '</script>'
 					: ''
 			]);
 		}
diff --git a/core/layout/main.php b/core/layout/main.php
index 3c61af18..5a1317a4 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -20,10 +20,6 @@
 			<link rel="alternate" type="application/rss+xml" href="'<?php echo helper::baseUrl(). $this->getUrl(0) . '/rss';?>" title="fLUX rss">
 		<?php endif; ?>
 		<?php $this->showStyle(); ?>
-		<!-- Style de la page affichée -->
-		<?php if ( $this->getData(['page', $this->getUrl(0), 'css'])): ?>
-			<?php echo '<style>' . $this->getData(['page', $this->getUrl(0), 'css']) . '</style>'; ?>
-		<?php endif;?>
 		<!-- Script perso dans le header -->
 		<?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
 			include(self::DATA_DIR .'head.inc.html');