From caf00c0d412734cfadbfb053b8237f8c82446783 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Tue, 19 Dec 2023 19:10:49 +0100 Subject: [PATCH] News 5.3 voir CMS --- module/news/changes.md | 6 +-- module/news/news.php | 13 ++++-- module/news/ressource/defaultdata.php | 10 +++-- module/news/ressource/feed-icon-16.gif | Bin module/news/vendor/FeedWriter/README.md | 0 module/news/view/add/add.css | 0 module/news/view/article/article.php | 50 ++++++++++++++---------- module/news/view/config/config.css | 0 module/news/view/index/index.css | 0 module/news/view/index/index.php | 1 - module/news/view/option/option.php | 7 +++- 11 files changed, 54 insertions(+), 33 deletions(-) mode change 100644 => 100755 module/news/ressource/feed-icon-16.gif mode change 100644 => 100755 module/news/vendor/FeedWriter/README.md mode change 100644 => 100755 module/news/view/add/add.css mode change 100644 => 100755 module/news/view/config/config.css mode change 100644 => 100755 module/news/view/index/index.css diff --git a/module/news/changes.md b/module/news/changes.md index 3bbbea7..84a9cac 100644 --- a/module/news/changes.md +++ b/module/news/changes.md @@ -1,3 +1,5 @@ +# Version 5.3 +- Option d'un lien de retour dans la signature # Version 5.2 - Termes des commandes de profils # Version 5.1 @@ -23,6 +25,4 @@ - Config : le nombre d'objet est fixe, constante dans news.php - Ecran layout réservé à la configuration et au thème - Bug avec l'initialisation, fichier css déclaré mais absent -- Appel de la feuille style si présente - -A faire partie CSS à amléiorer au niveau des options +- Appel de la feuille style si présente \ No newline at end of file diff --git a/module/news/news.php b/module/news/news.php index daa700c..7446989 100644 --- a/module/news/news.php +++ b/module/news/news.php @@ -16,7 +16,7 @@ class news extends common { - const VERSION = '5.2'; + const VERSION = '5.3'; const REALNAME = 'News'; const DATADIRECTORY = self::DATA_DIR . 'news/'; @@ -308,7 +308,8 @@ class news extends common 'height' => $this->getInput('newsOptionHeight', helper::FILTER_INT, true), 'dateFormat' => $this->getInput('newsOptionDateFormat'), 'timeFormat' => $this->getInput('newsOptionTimeFormat'), - 'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']) + 'buttonBack' => $this->getInput('newsOptionButtonBack'), + 'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']), ] ]); @@ -593,13 +594,19 @@ class news extends common // Mettre à jour la version $this->setData(['module', $this->getUrl(0), 'config', 'versionData', '3.4']); } - // Mise à jour 3.4 + // Mise à jour 4.4 if (version_compare($versionData, '4.4', '<')) { $this->setData(['module', $this->getUrl(0), 'config', 'dateFormat', '%d %B %Y']); $this->setData(['module', $this->getUrl(0), 'config', 'timeFormat', '%H:%M']); // Mettre à jour la version $this->setData(['module', $this->getUrl(0), 'config', 'versionData', '4.4']); } + // Mise à jour 5.3 + if (version_compare($versionData, '5.3', '<')) { + $this->setData(['module', $this->getUrl(0), 'config', 'buttonBack', true]); + // Mettre à jour la version + $this->setData(['module', $this->getUrl(0), 'config', 'versionData', '5.3']); + } } diff --git a/module/news/ressource/defaultdata.php b/module/news/ressource/defaultdata.php index ed04823..8635c9f 100644 --- a/module/news/ressource/defaultdata.php +++ b/module/news/ressource/defaultdata.php @@ -1,14 +1,15 @@ false, - 'feedsLabel' => '', + 'feeds' => true, + 'feedsLabel' => 'RSS', 'itemsperPage' => 8, 'itemsperCol' => 12, 'height' => -1, - 'versionData' => '3.5', + 'versionData' => '5.3', 'dateFormat' => '%d %B %Y', 'timeFormat' =>'%H:%M', + 'buttonBack' => true ]; public static $defaultTheme = [ @@ -16,7 +17,8 @@ class init extends news { 'borderStyle' => 'none', 'borderColor' => 'rgba(33, 34, 35, 1)', 'backgroundColor' => 'rgba(255, 255, 255, 1)', - 'borderWidth' => '0' + 'borderWidth' => '0', + 'itemsBlur' => '0%' ]; } \ No newline at end of file diff --git a/module/news/ressource/feed-icon-16.gif b/module/news/ressource/feed-icon-16.gif old mode 100644 new mode 100755 diff --git a/module/news/vendor/FeedWriter/README.md b/module/news/vendor/FeedWriter/README.md old mode 100644 new mode 100755 diff --git a/module/news/view/add/add.css b/module/news/view/add/add.css old mode 100644 new mode 100755 diff --git a/module/news/view/article/article.php b/module/news/view/article/article.php index 99159a1..855ac25 100644 --- a/module/news/view/article/article.php +++ b/module/news/view/article/article.php @@ -1,34 +1,42 @@
-
- getData(['module', $this->getUrl(0),'posts', $this->getUrl(1), 'content']); ?> -
+
+ getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'content']); ?> +
-
+ getData(['module', $this->getUrl(0), 'config', 'buttonBack'])): ?> +
+ + + +
+ +
- + getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent) . ' - ' . helper::dateUTF8('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent); ?> - getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - AND - ( // Propriétaire - ( $this->getUser('group') === self::GROUP_ADMIN ) - ) - ): ?> - - Éditer - - + getUser('password') === $this->getInput('ZWII_USER_PASSWORD') + and + ( // Propriétaire + ($this->getUser('group') === self::GROUP_ADMIN) + ) + ): ?> + + Éditer + + - getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> + getData(['module', $this->getUrl(0), 'config', 'feeds'])): ?> diff --git a/module/news/view/config/config.css b/module/news/view/config/config.css old mode 100644 new mode 100755 diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css old mode 100644 new mode 100755 diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php index b05ccc1..69b6770 100644 --- a/module/news/view/index/index.php +++ b/module/news/view/index/index.php @@ -46,7 +46,6 @@ && strlen($this->getData(['module', $this->getUrl(0), 'posts', $newsId, 'content'])) >= $this->getData(['module', $this->getUrl(0), 'config', 'height']) ): ?> getUrl(0) . '/' . $newsId . '">lire la suite'; ?> -
diff --git a/module/news/view/option/option.php b/module/news/view/option/option.php index 59246e1..33e22fc 100644 --- a/module/news/view/option/option.php +++ b/module/news/view/option/option.php @@ -48,12 +48,17 @@
-
+
$this->getData(['module', $this->getUrl(0), 'config', 'feeds']), 'help' => 'Flux limité aux articles de la première page.' ]); ?>
+
+ $this->getData(['module', $this->getUrl(0), 'config', 'buttonBack']) + ]); ?> +
'Etiquette RSS',