From dfee46792f91cc357f697f35e7429c0c196f6a16 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Sun, 6 Feb 2022 17:29:56 +0100
Subject: Improved: "Pagination" + load more button (#4125)

* Frontend changes done

* Load more should work now also without JS

* Update template.rtl.css

* improved the themes' CSS

* Update template.rtl.css

* fix CI

* CSS prop. order fixed

* Rename pagination.phtml to stream-footer.phtml

* use the new template name

* rename key of i18n

* fixed CI, that does not like the white space

* rename pagination variable

* Update indexController.php
---
 app/views/helpers/pagination.phtml    | 56 -----------------------------------
 app/views/helpers/stream-footer.phtml | 52 ++++++++++++++++++++++++++++++++
 app/views/index/normal.phtml          |  2 +-
 app/views/index/reader.phtml          |  2 +-
 4 files changed, 54 insertions(+), 58 deletions(-)
 delete mode 100755 app/views/helpers/pagination.phtml
 create mode 100755 app/views/helpers/stream-footer.phtml

(limited to 'app/views')

diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
deleted file mode 100755
index eed4f5dc2..000000000
--- a/app/views/helpers/pagination.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-	/** @var FreshRSS_View $this */
-	$url_next = Minz_Request::currentRequest();
-	$url_next['params']['next'] = FreshRSS_Context::$next_id;
-	$url_next['params']['state'] = FreshRSS_Context::$state;
-	$url_next['params']['ajax'] = 1;
-
-	$url_mark_read = array(
-		'c' => 'entry',
-		'a' => 'read',
-		'params' => array(
-			'get' => FreshRSS_Context::currentGet(),
-			'nextGet' => FreshRSS_Context::$next_get,
-			'idMax' => FreshRSS_Context::$id_max,
-			'search' => htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES),
-			'state' => FreshRSS_Context::$state,
-		)
-	);
-?>
-
-<?php
-$hasAccess = FreshRSS_Auth::hasAccess();
-if ($hasAccess) { ?>
-<form id="mark-read-pagination" method="post">
-<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
-<?php } else { ?>
-<div id="mark-read-pagination">
-<?php }?>
-<ul class="pagination">
-	<li class="item pager-next">
-	<?php if (FreshRSS_Context::$next_id) { ?>
-		<a id="load_more" href="<?= Minz_Url::display($url_next) ?>">
-			<?= _t('gen.pagination.load_more') ?>
-		</a>
-	<?php } elseif ($hasAccess) { ?>
-		<button id="bigMarkAsRead"
-			class="as-link <?= FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : '' ?>"
-			form="mark-read-pagination"
-			formaction="<?= Minz_Url::display($url_mark_read) ?>"
-			type="submit">
-			<?= _t('gen.pagination.nothing_to_load') ?><br />
-			<span class="bigTick">✓</span><br />
-			<?= _t('gen.pagination.mark_all_read') ?>
-		</button>
-	<?php } else { ?>
-		<div id="bigMarkAsRead">
-			<?= _t('gen.pagination.nothing_to_load') ?><br />
-		</div>
-	<?php } ?>
-	</li>
-</ul>
-<?php if ($hasAccess) { ?>
-</form>
-<?php } else {?>
-</div>
-<?php }?>
diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtml
new file mode 100755
index 000000000..ebce4d852
--- /dev/null
+++ b/app/views/helpers/stream-footer.phtml
@@ -0,0 +1,52 @@
+<?php
+	/** @var FreshRSS_View $this */
+	$url_next = Minz_Request::currentRequest();
+	$url_next['params']['next'] = FreshRSS_Context::$next_id;
+	$url_next['params']['state'] = FreshRSS_Context::$state;
+	$url_next['params']['ajax'] = 1;
+
+	$url_mark_read = array(
+		'c' => 'entry',
+		'a' => 'read',
+		'params' => array(
+			'get' => FreshRSS_Context::currentGet(),
+			'nextGet' => FreshRSS_Context::$next_get,
+			'idMax' => FreshRSS_Context::$id_max,
+			'search' => htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES),
+			'state' => FreshRSS_Context::$state,
+		)
+	);
+?>
+
+<?php
+$hasAccess = FreshRSS_Auth::hasAccess();
+if ($hasAccess) { ?>
+<form id="stream-footer" action="" method="post">
+<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+<?php } else { ?>
+<div id="stream-footer">
+<?php }?>
+	<div class="stream-footer-inner">
+	<?php if (FreshRSS_Context::$next_id) { ?>
+		<button id="load_more" type="submit" class="btn" formaction="<?= Minz_Url::display($url_next) ?>"><?= _t('gen.stream.load_more') ?></button>
+	<?php } elseif ($hasAccess) { ?>
+		<button id="bigMarkAsRead"
+			class="as-link <?= FreshRSS_Context::$user_conf->reading_confirm ? 'confirm" disabled="disabled' : '' ?>"
+			form="stream-footer"
+			formaction="<?= Minz_Url::display($url_mark_read) ?>"
+			type="submit">
+			<?= _t('gen.stream.nothing_to_load') ?><br />
+			<span class="bigTick">✓</span><br />
+			<?= _t('gen.stream.mark_all_read') ?>
+		</button>
+	<?php } else { ?>
+		<div id="bigMarkAsRead">
+			<?= _t('gen.stream.nothing_to_load') ?><br />
+		</div>
+	<?php } ?>
+	</div>
+<?php if ($hasAccess) { ?>
+</form>
+<?php } else {?>
+</div>
+<?php }?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 3909083e9..5dde2a171 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -110,7 +110,7 @@ $today = @strtotime('today');
 
 	if ($nbEntries > 0):
 		call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry);
-		$this->renderHelper('pagination');
+		$this->renderHelper('stream-footer');
 ?></main><?php
 	else:
 		ob_end_clean();	//Discard the articles headers, as we have no articles
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index 315d7d7aa..e4fb74708 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -74,7 +74,7 @@ $content_width = FreshRSS_Context::$user_conf->content_width;
 
 	if ($nbEntries > 0):
 		call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry);
-		$this->renderHelper('pagination');
+		$this->renderHelper('stream-footer');
 ?></main><?php
 	else:
 		ob_end_clean();	//Discard the articles headers, as we have no articles
-- 
cgit v1.2.3