From c7b414770cf841ce695f854aad977548a2a272b1 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 6 Mar 2023 15:23:25 +0100 Subject: [PATCH] Bug style css dans news --- core/core.php | 6 -- module/blog/view/index/index.php | 20 +++---- module/news/changes.md | 3 +- module/news/news.php | 6 +- module/news/view/index/index.css | 9 +-- module/news/view/index/index.php | 94 +++++++++++++++++--------------- 6 files changed, 64 insertions(+), 74 deletions(-) diff --git a/core/core.php b/core/core.php index fd4c1722..0bafef61 100644 --- a/core/core.php +++ b/core/core.php @@ -3161,12 +3161,6 @@ class core extends common 'style' => file_get_contents($stylePath) ]); } - if ($output['style']) { - $this->addOutput([ - //'style' => $this->output['style'] . file_get_contents($output['style']) - 'style' => file_get_contents($output['style']) - ]); - } // JS $scriptPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php'; diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php index 0ec34661..091e1d5a 100755 --- a/module/blog/view/index/index.php +++ b/module/blog/view/index/index.php @@ -1,4 +1,14 @@ + getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?> +
+ + + getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) ? '

' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '

' : ''; + ?> + +
+
$article) : ?> getData(['module', $this->getUrl(0), 'config', 'articlesLenght']) === 0) : ?> @@ -143,16 +153,6 @@
- getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?> -
- - - ' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '

'; - ?> - -
- \ No newline at end of file diff --git a/module/news/changes.md b/module/news/changes.md index f1fd01f7..0d38a1e7 100644 --- a/module/news/changes.md +++ b/module/news/changes.md @@ -1,6 +1,7 @@ # Version 4.4 - Intl date Formats -- Modification liées à la suppression de flatpickr +- Bug un conflit avec le style de la page +- Modifications liées à la suppression de flatpickr # Version 4.3 - Multilinguisme # Version 4.23 diff --git a/module/news/news.php b/module/news/news.php index fea6e372..45c30ed4 100644 --- a/module/news/news.php +++ b/module/news/news.php @@ -266,8 +266,7 @@ class news extends common // Générer la feuille de CSS $style = '.newsFrame {'; - $style .= 'border-right:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';'; - $style .= 'border-left:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';'; + $style .= 'border:' . $this->getInput('newsThemeBorderStyle', helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor') . ' ' . $this->getInput('newsThemeBorderWidth', helper::FILTER_STRING_SHORT) . ';'; $style .= 'background-color:' . $this->getInput('newsThemeBackgroundColor') . ';'; $style .= '}'; @@ -546,9 +545,6 @@ class news extends common 'showBarEditButton' => true, 'showPageContent' => true, 'view' => 'index', - 'style' => file_exists($this->getData(['module', $this->getUrl(0), 'theme', 'style'])) - ? $this->getData(['module', $this->getUrl(0), 'theme', 'style']) - : '' ]); } } diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css index f0bff231..6727c753 100755 --- a/module/news/view/index/index.css +++ b/module/news/view/index/index.css @@ -13,14 +13,9 @@ */ /* -* Module news +* Module news TRUC */ -/* -.newsTitle { - background-color: #ECEFF1; - padding:5px; -}*/ .newsContent { overflow: hidden; /* les dépassements seront masqués */ position: relative; @@ -51,5 +46,3 @@ display: inline; vertical-align: top; } - - diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php index 62e844fb..10ebf140 100644 --- a/module/news/view/index/index.php +++ b/module/news/view/index/index.php @@ -1,54 +1,60 @@ - -
-
- $news) : ?> -
-

- getUrl(0) . '/' . $newsId . '">' . $news['title'] . ''; ?> -

-
- - - - - - getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - and - ( // Propriétaire - ($this->getUser('group') === self::GROUP_ADMIN) - ) - ) : ?> - - Éditer - - -
-
-
- - getData(['module', $this->getUrl(0), 'config', 'height']) !== -1 - && strlen($this->getData(['module', $this->getUrl(0), 'posts', $newsId, 'content'])) >= $this->getData(['module', $this->getUrl(0), 'config', 'height']) - ) : ?> - getUrl(0) . '/' . $newsId . '">lire la suite'; ?> - -
- -
-
- - getData(['module', $this->getUrl(0), 'config', 'feeds'])) : ?> + + + getData(['module', $this->getUrl(0), 'config', 'feeds'])): ?>
' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '

'; + echo $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) ? '

' . $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel']) . '

' : ''; ?>
- +
+
+ + $news): ?> +
+
+

+ getUrl(0) . '/' . $newsId . '">' . $news['title'] . ''; ?> +

+
+ + + + + + getUser('password') === $this->getInput('ZWII_USER_PASSWORD') + and + ( // Propriétaire + ($this->getUser('group') === self::GROUP_ADMIN) + ) + ): ?> + + Éditer + + +
+
+ + getData(['module', $this->getUrl(0), 'config', 'height']) !== -1 + && strlen($this->getData(['module', $this->getUrl(0), 'posts', $newsId, 'content'])) >= $this->getData(['module', $this->getUrl(0), 'config', 'height']) + ): ?> + getUrl(0) . '/' . $newsId . '">lire la suite'; ?> + +
+
+
+ + +
+
+ + \ No newline at end of file