From 24f463b77e3cec96152a7be7875b0271173b8e91 Mon Sep 17 00:00:00 2001
From: Fred Tempez <ftempez@gmail.com>
Date: Mon, 16 Nov 2020 14:55:46 +0100
Subject: [PATCH] URL dans les pages

---
 module/blog/blog.php                 |  1 +
 module/blog/view/article/article.css |  9 +++++++++
 module/blog/view/article/article.php |  9 +++++++--
 module/blog/view/index/index.css     | 11 ++++++++++-
 module/blog/view/index/index.php     | 12 +++++-------
 module/news/view/index/index.css     | 11 ++++++++++-
 module/news/view/index/index.php     | 12 +++++-------
 module/news/view/rss/rss.php         |  2 +-
 8 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/module/blog/blog.php b/module/blog/blog.php
index 500bb722..7ea5da21 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -457,6 +457,7 @@ class blog extends common {
 				for($i = $pagination['first']; $i < $pagination['last']; $i++) {
 					self::$comments[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'comment', $commentIds[$i]]);
 				}
+				self::$rssUrl =  helper::baseUrl() . $this->getUrl(0) . '/rss';
 				// Valeurs en sortie
 				$this->addOutput([
 					'showBarEditButton' => true,
diff --git a/module/blog/view/article/article.css b/module/blog/view/article/article.css
index e75691a1..21c66342 100755
--- a/module/blog/view/article/article.css
+++ b/module/blog/view/article/article.css
@@ -53,3 +53,12 @@
   }
 
 
+#rssFeed {
+    text-align: right;
+    float: right;
+}
+#rssFeed p {
+    display: inline;
+    vertical-align: top;
+    margin-left: 5px;
+}
\ No newline at end of file
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index fda79bf6..43e5cf94 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -37,6 +37,13 @@
 		<?php echo $this->getData(['user', $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'userId']), 'firstname']); ?>
 		<?php echo $this->getData(['user', $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'userId']), 'lastname']); ?>
 	</p>
+	<?php echo template::formClose(); ?>
+	<!-- Bloc RSS-->
+	<div id="rssFeed">
+		<a type="application/rss+xml" href="<?php echo $module::$rssUrl ?> ">
+			<img  src='module/news/ressource/feed-icon-16.gif' /><p>Syndication RSS</p>
+		</a>
+	</div>
 	<?php if($this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'closeComment'])): ?>
 		<p>Cet article ne reçoit pas de commentaire.</p>
 	<?php else: ?>
@@ -106,9 +113,7 @@
 					</div>
 				</div>
 			</div>
-		<?php echo template::formClose(); ?>
 	<?php endif;?>
-
 	<div class="row">
 		<div class="col12">
 			<?php foreach($module::$comments as $commentId => $comment): ?>
diff --git a/module/blog/view/index/index.css b/module/blog/view/index/index.css
index e0a4e738..60a3f192 100755
--- a/module/blog/view/index/index.css
+++ b/module/blog/view/index/index.css
@@ -48,6 +48,15 @@
 	}
 }
 
-#rssIcon {
+/*
+* Flux RSS
+*/
+#rssFeed {
     text-align: right;
+    float: right;
+}
+#rssFeed p {
+    display: inline;
+    vertical-align: top;
+    margin-left: 5px;
 }
\ No newline at end of file
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index ff470d5e..5c8ab59e 100644
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -1,11 +1,4 @@
 <?php if($module::$articles): ?>
-	<div class="row">
-		<div class="col3 offset9 textAlignRight">
-			<a type="application/rss+xml" href="<?php echo $module::$rssUrl ?> ">
-				<img id="rssIcon" src='module/news/ressource/feed-icon-16.gif'>
-			</a>
-		</div>
-	</div>
 	<div class="row">
 		<div class="col12">
 			<?php foreach($module::$articles as $articleId => $article): ?>
@@ -55,6 +48,11 @@
 		</div>
 	</div>
 	<?php echo $module::$pages; ?>
+	<div id="rssFeed">
+		<a type="application/rss+xml" href="<?php echo $module::$rssUrl ?> ">
+			<img  src='module/news/ressource/feed-icon-16.gif' /><p>Syndication RSS</p>
+		</a>
+	</div>
 <?php else: ?>
 	<?php echo template::speech('Aucun article.'); ?>
 <?php endif; ?>
\ No newline at end of file
diff --git a/module/news/view/index/index.css b/module/news/view/index/index.css
index c9fec874..01feed38 100755
--- a/module/news/view/index/index.css
+++ b/module/news/view/index/index.css
@@ -12,6 +12,15 @@
  * @link http://zwiicms.fr/
  */
 
-#rssIcon {
+/*
+* Flux RSS
+*/
+#rssFeed {
     text-align: right;
+    float: right;
+}
+#rssFeed p {
+    display: inline;
+    vertical-align: top;
+    margin-left: 5px;
 }
\ No newline at end of file
diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php
index b296d9ea..f5404c14 100644
--- a/module/news/view/index/index.php
+++ b/module/news/view/index/index.php
@@ -1,11 +1,4 @@
 <?php if($module::$news): ?>
-	<div class="row">
-		<div class="col3 offset9 textAlignRight">
-			<a type="application/rss+xml" href="<?php echo $module::$rssUrl ?> ">
-				<img id="rssIcon" src='module/news/ressource/feed-icon-16.gif'>
-			</a>
-		</div>
-	</div>
 	<div class="row">
 		<div class="col12">
 			<?php foreach($module::$news as $newsId => $news): ?>
@@ -28,6 +21,11 @@
 		</div>
 	</div>
 	<?php echo $module::$pages; ?>
+	<div id="rssFeed">
+		<a type="application/rss+xml" href="<?php echo $module::$rssUrl ?> ">
+			<img  src='module/news/ressource/feed-icon-16.gif' /><p>Syndication RSS</p>
+		</a>
+	</div>
 <?php else: ?>
 	<?php echo template::speech('Aucune news.'); ?>
 <?php endif; ?>
diff --git a/module/news/view/rss/rss.php b/module/news/view/rss/rss.php
index 74056a56..0015bc35 100644
--- a/module/news/view/rss/rss.php
+++ b/module/news/view/rss/rss.php
@@ -1 +1 @@
-<!-- rien -->
+<!-- Volontairement vide -->