From f8887806a07eef84583464c4aa5c8ecdf49255cf Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Mon, 15 Mar 2021 16:46:59 +0100
Subject: [PATCH] =?UTF-8?q?Bouton=20=C3=A9dition=20l=C3=A9ger=20blog=20et?=
 =?UTF-8?q?=20download?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/blog/view/article/article.php | 33 +++++++++++--------------
 module/download/view/item/item.php   | 36 +++++++++++++---------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 2e07f34d..62263c9a 100755
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -10,7 +10,7 @@
 	</div>
 </div>
 <div class="row verticalAlignMiddle">
-	<div class="col11 blogDate">
+	<div class="col12 blogDate">
 		<!-- bloc signature et date -->
 		<?php echo $module::$articleSignature . ' - ';?>
 		<i class="far fa-calendar-alt"></i>
@@ -22,19 +22,7 @@
 						:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
 				echo $date . ' à ' . $heure; 
 		?>
-		<!-- Bloc RSS-->
-		<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
-			<div id="rssFeed">
-				<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
-					<img  src='module/news/ressource/feed-icon-16.gif' />
-					<?php 
-						echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
-					?>
-				</a>
-			</div>
-		<?php endif; ?>
-	</div>
-	<div class="col1">
+		<!-- Bloc edition -->
 		<?php if (
 			
 			$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
@@ -59,12 +47,19 @@
 			)
 		): ?>
 				<a href ="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'];?>">
-					<?php echo template::ico('pencil');?>
+					<?php echo template::ico('pencil');?> Editer
 				</a>
-				<?php echo template::button('blogEdit', [
-							'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
-							'value' => template::ico('pencil')
-				]); ?>	
+		<?php endif; ?>
+		<!-- Bloc RSS-->
+		<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
+			<div id="rssFeed">
+				<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
+					<img  src='module/news/ressource/feed-icon-16.gif' />
+					<?php 
+						echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
+					?>
+				</a>
+			</div>
 		<?php endif; ?>
 	</div>
 </div>
diff --git a/module/download/view/item/item.php b/module/download/view/item/item.php
index 2eeba01c..5831143b 100644
--- a/module/download/view/item/item.php
+++ b/module/download/view/item/item.php
@@ -6,7 +6,7 @@
 			</div>
 		</div>
 		<div class="row verticalAlignMiddle">
-			<div class="col11 downloadDate">
+			<div class="col12 downloadDate">
 				<?php echo $module::$itemSignature . ' - ';?>
 				<i class="far fa-calendar-alt"></i>
 				<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
@@ -17,20 +17,8 @@
 								:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'items', $this->getUrl(1), 'publishedOn'])));
 						echo $date . ' à ' . $heure; 
 				?>
-				<!-- Bloc RSS-->
-				<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
-					<div id="rssFeed">
-						<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
-							<img  src='module/news/ressource/feed-icon-16.gif' />
-							<?php 
-								echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
-							?>
-						</a>
-					</div>
-				<?php endif; ?>
+
 				<!-- Bouton d'édition -->
-			</div>
-			<div class="col1">
 				<?php if (
 					$this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD')
 					AND
@@ -53,11 +41,21 @@
 						)
 					)
 				): ?>
-					<?php echo template::button('downloadItemEdit', [
-								'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
-								'value' => template::ico('pencil')
-					]); ?>
-				<?php endif; ?>
+					<a href ="<?php echo helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'];?>">
+						<?php echo template::ico('pencil');?> Editer
+					</a>
+					<?php endif; ?>
+									<!-- Bloc RSS-->
+									<?php if ($this->getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?>
+						<div id="rssFeed">
+							<a type="application/rss+xml" href="<?php echo helper::baseUrl() . $this->getUrl(0) . '/rss'; ?> ">
+								<img  src='module/news/ressource/feed-icon-16.gif' />
+								<?php 
+									echo '<p>' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '</p>' ;
+								?>
+							</a>
+						</div>
+					<?php endif; ?>
 			</div>
 		</div>
 	</div>