From 7ce41dad33ea9f5f0703a96b00aefcf5bfecca0b Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Tue, 15 Mar 2022 16:04:25 +0100
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9sentation=20des=20commentaires?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/blog/view/article/article.php | 23 ++++++++++-------
 module/blog/view/index/index.php     | 37 ++++++++++++++--------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index ab2d6d9c..a8b4d34e 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -66,15 +66,20 @@
 <?php if($this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'commentClose'])): ?>
 	<p>Cet article ne reçoit pas de commentaire.</p>
 <?php else: ?>
-	<h4 id="comment">
-		<?php
-			if ($module::$nbCommentsApproved > 0) {
-				echo $module::$nbCommentsApproved . ' commentaire' . ($module::$nbCommentsApproved > 1 ? 's' : '');
-			} else {
-				echo  'Pas encore de commentaire';
-			}
-		?>
-	</h5>
+	<div class="row">
+		<div class="col12" id="comment">
+			<h3>
+				<?php
+					echo template::ico('comment', 'right');
+					if ($module::$nbCommentsApproved > 0) {
+						echo $module::$nbCommentsApproved . ' commentaire' . ($module::$nbCommentsApproved > 1 ? 's' : '');
+					} else {
+						echo  'Pas encore de commentaire';
+					}
+				?>
+			</h3>
+		</div>
+	</div>
 	<?php echo template::formOpen('blogArticleForm'); ?>
 		<?php echo template::text('blogArticleCommentShow', [
 			'placeholder' => 'Rédiger un commentaire...',
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index 15a0e392..7f3f691f 100644
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -22,7 +22,7 @@
 				</div>
 			</div>
 			<div class="row verticalAlignMiddle">
-				<div class="col12 blogDate">
+				<div class="col6 blogDate">
 					<!-- bloc signature et date -->
 					<?php echo $module->signature($this->getData(['module', $this->getUrl(0),  'posts', $articleId, 'userId']));?>
 					<?php echo ' - ';?>
@@ -64,23 +64,24 @@
 							</a>
 					<?php endif; ?>
 				</div>
-			</div>
-			<div class="row">
-				<?php if($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'commentClose'])): ?>
-					<p>Cet article ne reçoit pas de commentaire.</p>
-				<?php else: ?>
-					<h3 id="comment">
-						<?php
-							if ($module::$comments[$articleId] > 0) {
-								echo '<a href="'. helper::baseUrl() . $this->getUrl(0) . '/' . $articleId .'">';
-								echo $module::$comments[$articleId] . ' commentaire' . ($module::$comments[$articleId] > 1 ? 's' : '');
-								echo '</a>';
-							} else {
-								echo  'Pas encore de commentaire';
-							}
-						?>
-					</h3>
-				<?php endif; ?>
+				<div class="col6 textAlignRight" id="comment">
+					<?php if($this->getData(['module', $this->getUrl(0), 'posts', $articleId, 'commentClose'])): ?>
+						<p>Cet article ne reçoit pas de commentaire.</p>
+					<?php else: ?>
+						<p>	
+							<?php echo template::ico('comment', 'right'); ?>
+							<?php
+								if ($module::$comments[$articleId] > 0) {
+									echo '<a href="'. helper::baseUrl() . $this->getUrl(0) . '/' . $articleId .'">';
+									echo $module::$comments[$articleId] . ' commentaire' . ($module::$comments[$articleId] > 1 ? 's' : '');
+									echo '</a>';
+								} else {
+									echo  'Pas encore de commentaire';
+								}
+							?>
+						</p>
+					<?php endif; ?>
+				</div>
 			</div>
 		<?php else: ?>
 			<div class="row rowArticle">