From 3cb91098e6b9ceacbcb51f3f3588f00360524680 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:54:15 -0700
Subject: [PATCH 1/3] Valid html solution to disabling pagination links

---
 bookwyrm/static/css/format.css              | 11 +++++++++++
 bookwyrm/templates/snippets/pagination.html |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index e3ae1ce79..522c23f7d 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -25,6 +25,17 @@ html {
     min-width: 75% !important;
 }
 
+
+/* --- "disabled" for non-buttons --- */
+.is-disabled {
+    background-color: #dbdbdb;
+    border-color: #dbdbdb;
+    box-shadow: none;
+    color: #7a7a7a;
+    opacity: .5;
+    cursor: not-allowed;
+}
+
 /* --- SHELVING --- */
 
 /** @todo Replace icons with SVG symbols.
diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 252be29e3..a11bbbb4f 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,11 +1,11 @@
 {% load i18n %}
 <nav class="pagination" aria-label="pagination">
-    <a class="pagination-previous" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}" {% else %}disabled{% endif %}>
+    <a class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"{% endif %}>
         <span class="icon icon-arrow-left"></span>
         {% trans "Previous" %}
     </a>
 
-    <a class="pagination-next" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% else %} disabled{% endif %}>
+    <a class="pagination-next {% if not page.has_next %}is-disabled{% endif %}" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% endif %}>
         {% trans "Next" %}
         <span class="icon icon-arrow-right"></span>
     </a>

From 8d7527dee3eb817edd9e286f3af88a1059c93a9b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:59:14 -0700
Subject: [PATCH 2/3] CSS linter fixes

---
 bookwyrm/static/css/format.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 522c23f7d..1ca09d315 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -25,14 +25,13 @@ html {
     min-width: 75% !important;
 }
 
-
 /* --- "disabled" for non-buttons --- */
 .is-disabled {
     background-color: #dbdbdb;
     border-color: #dbdbdb;
     box-shadow: none;
     color: #7a7a7a;
-    opacity: .5;
+    opacity: 0.5;
     cursor: not-allowed;
 }
 

From b3535d9a902ee20c5c407b0c185421d78b091ad2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 08:42:01 -0700
Subject: [PATCH 3/3] Hides disabled pagination links for screenreaders

---
 bookwyrm/templates/snippets/pagination.html | 22 +++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index a11bbbb4f..3b33ca628 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,12 +1,26 @@
 {% load i18n %}
 <nav class="pagination" aria-label="pagination">
-    <a class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"{% endif %}>
-        <span class="icon icon-arrow-left"></span>
+    <a
+        class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
+        {% if page.has_previous %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
+        <span class="icon icon-arrow-left" aria-hidden="true"></span>
         {% trans "Previous" %}
     </a>
 
-    <a class="pagination-next {% if not page.has_next %}is-disabled{% endif %}" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% endif %}>
+    <a
+        class="pagination-next {% if not page.has_next %}is-disabled{% endif %}"
+        {% if page.has_next %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
         {% trans "Next" %}
-        <span class="icon icon-arrow-right"></span>
+        <span class="icon icon-arrow-right" aria-hidden="true"></span>
     </a>
 </nav>