From 0fc006096612174821db901840dabd20190074e2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 17 May 2022 23:31:24 +0200
Subject: Fix slider when no article (#4375)

* Fix slider when no article
#fix https://github.com/FreshRSS/FreshRSS/issues/4373
https://github.com/FreshRSS/FreshRSS/pull/4291

* Use aside

* Forgotten

Co-authored-by: maTh <math-home@web.de>
---
 app/views/configure/queries.phtml  | 14 +++++++-------
 app/views/extension/index.phtml    | 15 ++++++++-------
 app/views/index/normal.phtml       | 15 +++++++++------
 app/views/stats/idle.phtml         | 14 +++++++-------
 app/views/subscription/index.phtml | 17 +++++++++--------
 5 files changed, 40 insertions(+), 35 deletions(-)

(limited to 'app/views')

diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 5cd7656c2..227acc777 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -59,16 +59,16 @@
 		</div>
 		<?php } ?>
 	</form>
+</main>
 
-	<?php $class = $this->displaySlider ? ' active' : ''; ?>
-	<a href="#" id="close-slider" class="<?= $class ?>">
-		<?= _i('close') ?>
-	</a>
-	<div id="slider" class="scrollbar-thin<?= $class ?>">
+<?php $class = $this->displaySlider ? ' active' : ''; ?>
+<a href="#" id="close-slider" class="<?= $class ?>">
+	<?= _i('close') ?>
+</a>
+<aside id="slider" class="scrollbar-thin<?= $class ?>">
 	<?php
 		if ($this->query != null) {
 			$this->renderHelper('configure/query');
 		}
 	?>
-	</div>
-</main>
+</aside>
diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml
index dea2a9977..4c9a58494 100644
--- a/app/views/extension/index.phtml
+++ b/app/views/extension/index.phtml
@@ -77,15 +77,16 @@
 			</table>
 		</div>
 	<?php } ?>
-	<?php $class = isset($this->extension) ? ' active' : ''; ?>
-	<a href="#" id="close-slider" class="<?= $class ?>">
-		<?= _i('close') ?>
-	</a>
-	<div id="slider" class="scrollbar-thin<?= $class ?>">
+</main>
+
+<?php $class = isset($this->extension) ? ' active' : ''; ?>
+<a href="#" id="close-slider" class="<?= $class ?>">
+	<?= _i('close') ?>
+</a>
+<aside id="slider" class="scrollbar-thin<?= $class ?>">
 	<?php
 		if (isset($this->extension)) {
 			$this->renderHelper('extension/configure');
 		}
 	?>
-	</div>
-</main>
+</aside>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 555582c5f..562a1ef00 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -116,12 +116,8 @@ $today = @strtotime('today');
 	if ($nbEntries > 0):
 		call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry);
 		$this->renderHelper('stream-footer');
-?><?php $class = $this->displaySlider ? ' active' : ''; ?>
-<a href="#" id="close-slider" class="<?= $class ?>">
-	<?= _i('close') ?>
-</a>
-<div id="slider" class="scrollbar-thin<?= $class ?>">
-</div></main><?php
+?>
+</main><?php
 	else:
 		ob_end_clean();	//Discard the articles headers, as we have no articles
 ?>
@@ -138,4 +134,11 @@ $today = @strtotime('today');
 </main>
 <?php endif; ?>
 
+<?php $class = $this->displaySlider ? ' active' : ''; ?>
+<a href="#" id="close-slider" class="<?= $class ?>">
+	<?= _i('close') ?>
+</a>
+<aside id="slider" class="scrollbar-thin<?= $class ?>">
+</aside>
+
 <?php if ($nbEntries > 0 && FreshRSS_Context::$user_conf->show_nav_buttons) $this->partial('nav_entries'); ?>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index c62b5b388..3dc3ab700 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -48,16 +48,16 @@
 		<span class="alert-head"><?= _t('admin.stats.no_idle') ?></span>
 	</p>
 	<?php } ?>
+</main>
 
-	<?php $class = $this->displaySlider ? ' active' : ''; ?>
-	<a href="#" id="close-slider" class="<?= $class ?>">
-		<?= _i('close') ?>
-	</a>
-	<div id="slider" class="scrollbar-thin<?= $class ?>">
+<?php $class = $this->displaySlider ? ' active' : ''; ?>
+<a href="#" id="close-slider" class="<?= $class ?>">
+	<?= _i('close') ?>
+</a>
+<aside id="slider" class="scrollbar-thin<?= $class ?>">
 	<?php
 		if (isset($this->feed)) {
 			$this->renderHelper('feed/update');
 		}
 	?>
-	</div>
-</main>
+</aside>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index e85cd8392..ae842f990 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -25,7 +25,7 @@
 			<a class="btn" href="<?= _url('subscription', 'index', 'error', '1') ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a>
 		</div>
 	<?php } ?>
-	
+
 	<div class="drop-section">
 		<?php
 			$signalError = false;
@@ -73,11 +73,13 @@
 			</div>
 		</div>
 	</div>
-	<?php $class = $this->displaySlider ? ' active' : ''; ?>
-	<a href="#" id="close-slider" class="<?= $class ?>">
-		<?= _i('close') ?>
-	</a>
-	<div id="slider" class="scrollbar-thin<?= $class ?>">
+</main>
+
+<?php $class = $this->displaySlider ? ' active' : ''; ?>
+<a href="#" id="close-slider" class="<?= $class ?>">
+	<?= _i('close') ?>
+</a>
+<aside id="slider" class="scrollbar-thin<?= $class ?>">
 	<?php
 		if (isset($this->feed)) {
 			$this->renderHelper('feed/update');
@@ -85,5 +87,4 @@
 			$this->renderHelper('category/update');
 		}
 	?>
-	</div>
-</main>
+</aside>
-- 
cgit v1.2.3