Revert "News v4.0"

This reverts commit 78c3d4e174.
2022-01-17 19:13:35 +01:00 · 2022-01-17 19:13:35 +01:00 · c35b89c8b8
commit c35b89c8b8
parent 432906085d
5 changed files with 136 additions and 189 deletions
--- a/module/news/changes.md
+++ b/module/news/changes.md
@ -1,4 +0,0 @@
-# Version 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
--- a/module/news/news.php
+++ b/module/news/news.php
@ -15,7 +15,7 @@

 class news extends common {

-	const VERSION = '4.0';
+	const VERSION = '3.7';
 	const REALNAME = 'News';
 	const DELETE = true;
 	const UPDATE = '0.0';
@ -23,8 +23,7 @@ class news extends common {

 	public static $actions = [
 		'add' => self::GROUP_MODERATOR,
-		'config' => self::GROUP_MODERATOR, // Edition des news
-		'layout' => self::GROUP_MODERATOR,  // paramétrage des news
+		'config' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'edit' => self::GROUP_MODERATOR,
 		'index' => self::GROUP_VISITOR,
@ -89,8 +88,7 @@ class news extends common {

 	// Signature de l'article
 	public static $articleSignature = '';
-	// Nombre d'articles dans la page de config:
-	public static $itemsperPage = 8;
+

 	/**
 	 * Flux RSS
@ -191,63 +189,10 @@ class news extends common {
 		// Mise à jour des données de module
 		$this->update();

-		// Ids des news par ordre de publication
-		$newsIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
-		// Pagination fixe
-		$pagination = helper::pagination($newsIds, $this->getUrl(),self::$itemsperPage );
-		// Liste des pages
-		self::$pages = $pagination['pages'];
-		// News en fonction de la pagination
-		for($i = $pagination['first']; $i < $pagination['last']; $i++) {
-			// Met en forme le tableau
-			$dateOn = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
-					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
-					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
-			$dateOn .= ' à ';
-			$dateOn .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
-					? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
-					: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
-			if ($this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])) {
-				$dateOff = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
-					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
-					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
-				$dateOff .=	' à ';
-				$dateOff .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
-					? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
-					: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
-			} else {
-				$dateOff = 'Permanent';
-			}
-			self::$news[] = [
-				$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'title']),
-				$dateOn,
-				$dateOff,
-				self::$states[$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'state'])],
-				template::button('newsConfigEdit' . $newsIds[$i], [
-					'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsIds[$i]. '/' . $_SESSION['csrf'],
-					'value' => template::ico('pencil')
-				]),
-				template::button('newsConfigDelete' . $newsIds[$i], [
-					'class' => 'newsConfigDelete buttonRed',
-					'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i] . '/' . $_SESSION['csrf'],
-					'value' => template::ico('cancel')
-				])
-			];
-		}
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => 'Configuration du module',
-			'view' => 'config',
-			'vendor' => [
-				'tinycolorpicker'
-			]
-		]);
-	}
-
-	public function layout() {
 		// Soumission du formulaire
 		if($this->isPost()) {

+
 			// Générer la feuille de CSS
 			$style =  '.newsFrame {';
 			$style .= 'border:' .  $this->getInput('newsThemeBorderStyle',helper::FILTER_STRING_SHORT) . ' ' . $this->getInput('newsThemeBorderColor')  . ' ' . $this->getInput('newsThemeBorderWidth',helper::FILTER_STRING_SHORT) . ';';
@ -272,26 +217,69 @@ class news extends common {
 			]]);

 			$this->setData(['module', $this->getUrl(0), 'config',[
-				'feeds' 	 => $this->getInput('newsLayoutShowFeeds',helper::FILTER_BOOLEAN),
-				'feedsLabel' => $this->getInput('newsLayoutFeedslabel',helper::FILTER_STRING_SHORT),
-				'itemsperPage' => $this->getInput('newsLayoutItemsperPage', helper::FILTER_INT,true),
-				'itemsperCol' => $this->getInput('newsLayoutItemsperCol', helper::FILTER_INT,true),
-				'height' => $this->getInput('newsLayoutHeight', helper::FILTER_INT,true),
+				'feeds' 	 => $this->getInput('newsConfigShowFeeds',helper::FILTER_BOOLEAN),
+				'feedsLabel' => $this->getInput('newsConfigFeedslabel',helper::FILTER_STRING_SHORT),
+				'itemsperPage' => $this->getInput('newsConfigItemsperPage', helper::FILTER_INT,true),
+				'itemsperCol' => $this->getInput('newsConfigItemsperCol', helper::FILTER_INT,true),
+				'height' => $this->getInput('newsConfigHeight', helper::FILTER_INT,true),
 				'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData'])
 			]]);


 			// Valeurs en sortie
 			$this->addOutput([
-				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/layout',
+				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
 				'notification' => 'Modifications enregistrées',
 				'state' => true
 			]);
 		} else {
+			// Ids des news par ordre de publication
+			$newsIds = array_keys(helper::arrayCollumn($this->getData(['module', $this->getUrl(0), 'posts']), 'publishedOn', 'SORT_DESC'));
+			// Pagination
+			$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0), 'config', 'itemsperPage']) );
+			// Liste des pages
+			self::$pages = $pagination['pages'];
+			// News en fonction de la pagination
+			for($i = $pagination['first']; $i < $pagination['last']; $i++) {
+				// Met en forme le tableau
+				$dateOn = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+				$dateOn .= ' à ';
+				$dateOn .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+						: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+				if ($this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])) {
+					$dateOff = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+					$dateOff .=	' à ';
+					$dateOff .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+						: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+				} else {
+					$dateOff = 'Permanent';
+				}
+				self::$news[] = [
+					$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'title']),
+					$dateOn,
+					$dateOff,
+					self::$states[$this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'state'])],
+					template::button('newsConfigEdit' . $newsIds[$i], [
+						'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsIds[$i]. '/' . $_SESSION['csrf'],
+						'value' => template::ico('pencil')
+					]),
+					template::button('newsConfigDelete' . $newsIds[$i], [
+						'class' => 'newsConfigDelete buttonRed',
+						'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i] . '/' . $_SESSION['csrf'],
+						'value' => template::ico('cancel')
+					])
+				];
+			}
 			// Valeurs en sortie
 			$this->addOutput([
-				'title' => 'Mise en page',
-				'view' => 'layout',
+				'title' => 'Configuration du module',
+				'view' => 'config',
 				'vendor' => [
 					'tinycolorpicker'
 				]
@ -447,7 +435,8 @@ class news extends common {
 					$newsIds[] = $newsId;
 				}
 			}
-			// Pagination selon le layout
+			// Pagination
+			//$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['config','itemsperPage']));
 			$pagination = helper::pagination($newsIds, $this->getUrl(),$this->getData(['module', $this->getUrl(0),'config', 'itemsperPage']));
 			// Nombre de colonnes
 			self::$nbrCol = $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol']);
--- a/module/news/view/config/config.php
+++ b/module/news/view/config/config.php
@ -16,14 +16,87 @@
 			]); ?>
 		</div>
 		<div class="col2">
-			<?php echo template::button('newsConfigLayout', [
-				'href' => helper::baseUrl() . $this->getUrl(0) . '/layout',
-				'ico' => 'puzzle',
-				'value' => 'Mise en page'
-			]); ?>
+				<?php echo template::submit('newsConfigSubmit'); ?>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Paramètres du module</h4>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::checkbox('newsConfigShowFeeds', true, 'Lien du flux RSS', [
+							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
+							'help' => 'Flux limité aux articles de la première page.'
+						]); ?>
+					</div>
+					<div class="col6">
+						<?php echo template::text('newsConfigFeedslabel', [
+							'label' => 'Etiquette RSS',
+							'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
+						]); ?>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col4">
+						<?php echo template::select('newsConfigItemsperCol', $module::$columns, [
+							'label' => 'Nombre de colonnes',
+							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('newsConfigItemsperPage', $module::$itemsList, [
+							'label' => 'Articles par page',
+							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
+						]); ?>
+					</div>
+					<div class="col4">
+						<?php echo template::select('newsConfigHeight', $module::$height, [
+							'label' => 'Abrégé de l\'article',
+							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'height'])
+						]); ?>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col12">
+			<div class="block">
+				<h4>Thème du module</h4>
+				<div class="row">
+					<div class="col3">
+						<?php echo template::select('newsThemeBorderStyle', $module::$borderStyle, [
+							'label' => 'Bordure',
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderStyle'])
+						]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::select('newsThemeBorderWidth', $module::$borderWidth, [
+							'label' => 'Epaisseur',
+							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderWidth'])
+						]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::text('newsThemeBorderColor', [
+							'class' => 'colorPicker',
+							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
+							'label' => 'Couleur de la bordure',
+							'value' => $this->getData(['module', $this->getUrl(0),'theme', 'borderColor'])
+						]); ?>
+					</div>
+					<div class="col3">
+						<?php echo template::text('newsThemeBackgroundColor', [
+							'class' => 'colorPicker',
+							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
+							'label' => 'Couleur du fond',
+							'value' => $this->getData(['module', $this->getUrl(0),'theme', 'backgroundColor'])
+						]); ?>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
-
 	<?php if($module::$news): ?>
 		<?php echo template::table([4, 2, 2, 2, 1, 1], $module::$news, ['Titre', 'Publication', 'Dépublication', 'État', '', '']); ?>
 		<?php echo $module::$pages; ?>
--- a/module/news/view/layout/layout.css
+++ b/module/news/view/layout/layout.css
@ -1,18 +0,0 @@
-/**
- * This file is part of Zwii.
- *
- * For full copyright and license information, please see the LICENSE
- * file that was distributed with this source code.
- *
- * @author Rémi Jean <remi.jean@outlook.com>
- * @copyright Copyright (C) 2008-2018, Rémi Jean
- * @author Frédéric Tempez <frederic.tempez@outlook.com>
- * @copyright Copyright (C) 2018-2022, Frédéric Tempez
- * @license GNU General Public License, version 3
- * @link http://zwiicms.fr/
- */
-
-
-/** NE PAS EFFACER
-* admin.css
-*/
--- a/module/news/view/layout/layout.php
+++ b/module/news/view/layout/layout.php
@ -1,93 +0,0 @@
-<?php echo template::formOpen('newsLayout'); ?>
-<div class="row">
-		<div class="col2">
-			<?php echo template::button('newsLayoutBack', [
-				'class' => 'buttonGrey',
-				'href' => helper::baseUrl() . $this->getUrl(0) . '/config',
-				'ico' => 'left',
-				'value' => 'Retour'
-			]); ?>
-		</div>
-		<div class="col2 offset8">
-				<?php echo template::submit('newsLayoutSubmit'); ?>
-		</div>
-	</div>
-    <div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Paramètres du module</h4>
-				<div class="row">
-					<div class="col6">
-						<?php echo template::checkbox('newsLayoutShowFeeds', true, 'Lien du flux RSS', [
-							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'feeds']),
-							'help' => 'Flux limité aux articles de la première page.'
-						]); ?>
-					</div>
-					<div class="col6">
-						<?php echo template::text('newsLayoutFeedslabel', [
-							'label' => 'Etiquette RSS',
-							'value' => $this->getData(['module', $this->getUrl(0), 'config', 'feedsLabel'])
-						]); ?>
-					</div>
-				</div>
-				<div class="row">
-					<div class="col4">
-						<?php echo template::select('newsLayoutItemsperCol', $module::$columns, [
-							'label' => 'Nombre de colonnes',
-							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperCol'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('newsLayoutItemsperPage', $module::$itemsList, [
-							'label' => 'Articles par page',
-							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'itemsperPage'])
-						]); ?>
-					</div>
-					<div class="col4">
-						<?php echo template::select('newsLayoutHeight', $module::$height, [
-							'label' => 'Abrégé de l\'article',
-							'selected' => $this->getData(['module', $this->getUrl(0),'config', 'height'])
-						]); ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col12">
-			<div class="block">
-				<h4>Thème du module</h4>
-				<div class="row">
-					<div class="col3">
-						<?php echo template::select('newsThemeBorderStyle', $module::$borderStyle, [
-							'label' => 'Bordure',
-							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderStyle'])
-						]); ?>
-					</div>
-					<div class="col3">
-						<?php echo template::select('newsThemeBorderWidth', $module::$borderWidth, [
-							'label' => 'Epaisseur',
-							'selected' => $this->getData(['module', $this->getUrl(0),'theme', 'borderWidth'])
-						]); ?>
-					</div>
-					<div class="col3">
-						<?php echo template::text('newsThemeBorderColor', [
-							'class' => 'colorPicker',
-							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
-							'label' => 'Couleur de la bordure',
-							'value' => $this->getData(['module', $this->getUrl(0),'theme', 'borderColor'])
-						]); ?>
-					</div>
-					<div class="col3">
-						<?php echo template::text('newsThemeBackgroundColor', [
-							'class' => 'colorPicker',
-							'help' => 'Couleur visible en l\'absence d\'une image.<br />Le curseur horizontal règle le niveau de transparence.',
-							'label' => 'Couleur du fond',
-							'value' => $this->getData(['module', $this->getUrl(0),'theme', 'backgroundColor'])
-						]); ?>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php echo template::formClose(); ?>