From d24acb3bc24af650aee591d139b2f9c06e201975 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 17 Mar 2022 12:55:04 +0100
Subject: [PATCH] =?UTF-8?q?news=20perso=20css=20et=20balise=20s=C3=A9manti?=
 =?UTF-8?q?que=20article?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/news/news.php             |  9 ++--
 module/news/view/index/index.php | 70 ++++++++++++++++----------------
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/module/news/news.php b/module/news/news.php
index d4492ac3..c1a72177 100644
--- a/module/news/news.php
+++ b/module/news/news.php
@@ -80,11 +80,7 @@ class news extends common {
 
 	public static $borderStyle =[
 		'none'	=> 'Aucune',
-		'solid' => 'Tiret',
-		'inset'	=> '3D enfoncé',
-		'outset'=> '3D surélevé',
-		'ridge'	=> 'Relief 1',
-		'groove'=> 'Relief 2'
+		'solid' => 'Tiret'
 	];
 
 	// Signature de l'article
@@ -252,7 +248,8 @@ class news extends common {
 
 			// 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) . ';';
+			$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 .= 'background-color:' . $this->getInput('newsThemeBackgroundColor') . ';';
 			$style .= '}';
 
diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php
index 096b255f..c893dc96 100644
--- a/module/news/view/index/index.php
+++ b/module/news/view/index/index.php
@@ -1,40 +1,42 @@
 <?php if($module::$news): ?>
-	<div class="row">
-		<?php foreach($module::$news as $newsId => $news): ?>
-			<div class="newsFrame col<?php echo $module::$nbrCol ;?>" >
-				<h2 class="newsTitle" id="<?php echo $newsId;?>">
-					<?php echo '<a href="'. helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '">' . $news['title'] . '</a>'; ?>
-				</h2>
-				<div class="newsContent">
-					<?php echo $news['content']; ?>
-					<?php if ( $this->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'])):?>
-					<?php echo ' ... <a href="'. helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '"><span class="newsSuite">lire la suite</span></a>'; ?>
-					<?php endif; ?>
-				</div>
-				<div class="newsSignature">
-					<?php echo template::ico('calendar-empty'); ?>
-					<?php echo mb_detect_encoding(strftime('%d %B %Y', $news['publishedOn']), 'UTF-8', true)
-								? strftime('%d %B %Y', $news['publishedOn'])
-								: utf8_encode(strftime('%d %B %Y', $news['publishedOn'])); ?>
-							- <?php echo $news['userId']; ?>
-							<!-- Bloc edition -->
-							<?php if (
+	<article>
+		<div class="row">
+			<?php foreach($module::$news as $newsId => $news): ?>
+				<div class="newsFrame col<?php echo $module::$nbrCol ;?>" >
+					<h2 class="newsTitle" id="<?php echo $newsId;?>">
+						<?php echo '<a href="'. helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '">' . $news['title'] . '</a>'; ?>
+					</h2>
+					<div class="newsContent">
+						<?php echo $news['content']; ?>
+						<?php if ( $this->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'])):?>
+						<?php echo ' ... <a href="'. helper::baseUrl(true) . $this->getUrl(0) . '/' . $newsId . '"><span class="newsSuite">lire la suite</span></a>'; ?>
+						<?php endif; ?>
+					</div>
+					<div class="newsSignature">
+						<?php echo template::ico('calendar-empty'); ?>
+						<?php echo mb_detect_encoding(strftime('%d %B %Y', $news['publishedOn']), 'UTF-8', true)
+									? strftime('%d %B %Y', $news['publishedOn'])
+									: utf8_encode(strftime('%d %B %Y', $news['publishedOn'])); ?>
+								- <?php echo $news['userId']; ?>
+								<!-- Bloc edition -->
+								<?php if (
 
-								$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
-								AND
-								(  // Propriétaire
-									(	$this->getUser('group') === self::GROUP_ADMIN )
-								)
-							): ?>
-									<a href ="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsId . '/' . $_SESSION['csrf'];?>">
-										<?php echo template::ico('pencil');?> Editer
-									</a>
-							<?php endif; ?>
-				</div>
+									$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
+									AND
+									(  // Propriétaire
+										(	$this->getUser('group') === self::GROUP_ADMIN )
+									)
+								): ?>
+										<a href ="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsId . '/' . $_SESSION['csrf'];?>">
+											<?php echo template::ico('pencil');?> Editer
+										</a>
+								<?php endif; ?>
+					</div>
+			</div>
+			<?php endforeach; ?>
 		</div>
-		<?php endforeach; ?>
-	</div>
+	</article>
 	<?php echo $module::$pages; ?>
 	<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
 		<div id="rssFeed">