3 files changed, 11 insertions, 15 deletions
diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/stream-footer.phtml
index eed4f5dc2..ebce4d852 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/stream-footer.phtml
@@ -21,34 +21,30 @@
 <?php
 $hasAccess = FreshRSS_Auth::hasAccess();
 if ($hasAccess) { ?>
-<form id="mark-read-pagination" method="post">
+<form id="stream-footer" action="" method="post">
 <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 <?php } else { ?>
-<div id="mark-read-pagination">
+<div id="stream-footer">
 <?php }?>
-<ul class="pagination">
-	<li class="item pager-next">
+	<div class="stream-footer-inner">
 	<?php if (FreshRSS_Context::$next_id) { ?>
-		<a id="load_more" href="<?= Minz_Url::display($url_next) ?>">
-			<?= _t('gen.pagination.load_more') ?>
-		</a>
+		<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="mark-read-pagination"
+			form="stream-footer"
 			formaction="<?= Minz_Url::display($url_mark_read) ?>"
 			type="submit">
-			<?= _t('gen.pagination.nothing_to_load') ?><br />
+			<?= _t('gen.stream.nothing_to_load') ?><br />
 			<span class="bigTick">✓</span><br />
-			<?= _t('gen.pagination.mark_all_read') ?>
+			<?= _t('gen.stream.mark_all_read') ?>
 		</button>
 	<?php } else { ?>
 		<div id="bigMarkAsRead">
-			<?= _t('gen.pagination.nothing_to_load') ?><br />
+			<?= _t('gen.stream.nothing_to_load') ?><br />
 		</div>
 	<?php } ?>
-	</li>
-</ul>
+	</div>
 <?php if ($hasAccess) { ?>
 </form>
 <?php } else {?>
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