From 99fc2b7a3660707c8830fcdc54d4c255a2dcee8e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 25 Feb 2023 15:56:03 -0800 Subject: [PATCH 1/2] Only use chronological pagination sometimes The timeline uses chronological buttons, but other paginated pages do not (by default). This also reversed the chronology. --- bookwyrm/templates/feed/layout.html | 2 +- bookwyrm/templates/snippets/pagination.html | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html index 16a868c2a..b70ed99ea 100644 --- a/bookwyrm/templates/feed/layout.html +++ b/bookwyrm/templates/feed/layout.html @@ -23,7 +23,7 @@ {% block panel %}{% endblock %} {% if activities %} - {% include 'snippets/pagination.html' with page=activities path=path anchor="#feed" %} + {% include 'snippets/pagination.html' with page=activities path=path anchor="#feed" mode="chronological" %} {% endif %} diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html index 85f966f50..5ab724c06 100644 --- a/bookwyrm/templates/snippets/pagination.html +++ b/bookwyrm/templates/snippets/pagination.html @@ -9,7 +9,11 @@ {% endif %}> - {% trans "Older" %} + {% if mode == "chronological" %} + {% trans "Newer" %} + {% else %} + {% trans "Previous" %} + {% endif %} From d1110630db91c0349a4d90d6e9155f102aa1998c Mon Sep 17 00:00:00 2001 From: Christof Dorner Date: Sun, 26 Feb 2023 11:24:00 +0100 Subject: [PATCH 2/2] Use chronological pagination on user profile activity lists --- bookwyrm/templates/user/reviews_comments.html | 2 +- bookwyrm/templates/user/user.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/user/reviews_comments.html b/bookwyrm/templates/user/reviews_comments.html index f5c5c9265..d85f8f512 100644 --- a/bookwyrm/templates/user/reviews_comments.html +++ b/bookwyrm/templates/user/reviews_comments.html @@ -25,6 +25,6 @@ {% endif %} - {% include 'snippets/pagination.html' with page=activities path=path %} + {% include 'snippets/pagination.html' with page=activities path=path mode="chronological" %} {% endblock %} diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index 42b0ffbb5..0d015760c 100755 --- a/bookwyrm/templates/user/user.html +++ b/bookwyrm/templates/user/user.html @@ -87,7 +87,7 @@ {% trans "Back" %} - + {% endblock %}