From 032a150b11f6722c19724ab93305a3114bd3abf4 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Wed, 20 Dec 2023 13:43:32 +0100
Subject: [PATCH] Blog et news uniformisation

---
 module/blog/view/article/article.php | 4 +++-
 module/blog/view/index/index.php     | 5 ++---
 module/news/view/article/article.php | 6 +++---
 module/news/view/index/index.php     | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index ac17c446..b1d01ee5 100755
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -22,7 +22,7 @@
 		<?php echo template::ico('user'); ?>
 		<?php echo $module::$articleSignature; ?>
 		<?php echo template::ico('calendar-empty'); ?>
-		<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent) . ' - ' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent); ?>
+		<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent) . ' ' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent); ?>
 		<!-- Bloc edition -->
 		<?php if (
 			$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
@@ -45,12 +45,14 @@
 				)
 			)
 		): ?>
+			&nbsp;-&nbsp;
 			<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1); ?>">
 				<?php echo template::ico('pencil'); ?> Éditer
 			</a>
 		<?php endif; ?>
 		<!-- Bloc RSS-->
 		<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])): ?>
+			&nbsp;-&nbsp;
 			<div id="rssFeed">
 				<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>"
 					target="_blank">
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index 7b9aa1c8..8fd7f7f6 100755
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -28,7 +28,7 @@
 							<?php echo template::ico('user'); ?>
 							<?php echo $this->signature($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'userId'])); ?>
 							<?php echo template::ico('calendar-empty'); ?>
-							<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent) . ' - ' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent); ?>
+							<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent) . '&nbsp;' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent); ?>
 						</div>
 					</div>
 					<div class="row">
@@ -51,7 +51,6 @@
 						<div class="col6 blogEdit">
 							<!-- Bloc edition -->
 							<?php if (
-
 								$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
 								and
 								( // Propriétaire
@@ -143,7 +142,7 @@
 								<?php echo template::ico('user'); ?>
 								<?php echo $this->signature($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'userId'])); ?>
 								<?php echo template::ico('calendar-empty'); ?>
-								<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent) . ' - ' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn'], self::$siteContent), self::$siteContent); ?>
+								<?php echo helper::dateUTF8($module::$dateFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn']), self::$siteContent) . '&nbsp;' . helper::dateUTF8($module::$timeFormat, $this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'publishedOn'], self::$siteContent), self::$siteContent); ?>
 							</div>
 							<div class="blogContent">
 								<?php $lenght = $this->getData(['module', $this->getUrl(0), 'config', 'articlesLenght']) !== 0 ? $this->getData(['module', $this->getUrl(0), 'config', 'articlesLenght']) : 500 ?>
diff --git a/module/news/view/article/article.php b/module/news/view/article/article.php
index 92b29566..f751e546 100644
--- a/module/news/view/article/article.php
+++ b/module/news/view/article/article.php
@@ -16,7 +16,7 @@
 		<?php echo template::ico('user'); ?>
 		<?php echo $module::$articleSignature . ' - '; ?>
 		<?php echo template::ico('calendar-empty'); ?>
-		<?php echo helper::dateUTF8('%d %B %Y', $this->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); ?>
+		<?php echo helper::dateUTF8('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent) . '&nbsp' . helper::dateUTF8('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']), self::$siteContent); ?>
 		<!-- Bloc edition -->
 		<?php if (
 			$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
@@ -25,7 +25,7 @@
 				($this->getUser('group') === self::GROUP_ADMIN)
 			)
 		): ?>
-			&nbsp;
+			&nbsp;-&nbsp;
 			<a href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1); ?>">
 				<?php echo template::ico('pencil'); ?>
 				<?php echo helper::translate('Éditer'); ?>
@@ -33,8 +33,8 @@
 		<?php endif; ?>
 		<!-- Bloc RSS-->
 		<?php if ($this->getData(['module', $this->getUrl(0), 'config', 'feeds'])): ?>
+			&nbsp;-&nbsp;
 			<div id="rssFeed">
-				&nbsp;
 				<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?>"
 					target="_blank">
 					<img src='module/news/ressource/feed-icon-16.gif' />
diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php
index d6ed2949..571dc8bb 100644
--- a/module/news/view/index/index.php
+++ b/module/news/view/index/index.php
@@ -23,7 +23,7 @@
 							<?php echo template::ico('user'); ?>
 							<?php echo $news['userId'] . ' - '; ?>
 							<?php echo template::ico('calendar-empty'); ?>
-							<?php echo helper::dateUTF8($module::$dateFormat, $news['publishedOn'], self::$siteContent) . ' - ' . helper::dateUTF8($module::$timeFormat, $news['publishedOn'], self::$siteContent); ?>
+							<?php echo helper::dateUTF8($module::$dateFormat, $news['publishedOn'], self::$siteContent) . '&nbsp;' . helper::dateUTF8($module::$timeFormat, $news['publishedOn'], self::$siteContent); ?>
 							<!-- Bloc edition -->
 							<?php if (
 								$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
@@ -32,7 +32,7 @@
 									($this->getUser('group') === self::GROUP_ADMIN)
 								)
 							): ?>
-								&nbsp;
+								&nbsp;-&nbsp;
 								<a
 									href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsId; ?>">
 									<?php echo template::ico('pencil'); ?> Éditer