From 937a7dd1af625bda62b72eaef22c7f3b797c5cbe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 17 Jan 2021 16:48:05 -0800
Subject: [PATCH] Uses clickable dropdowns and improves styling on menu buttons

screenreader legible
---
 .../snippets/components/dropdown.html         |  2 +-
 .../templates/snippets/shelf_selector.html    |  4 +--
 .../templates/snippets/shelve_button.html     | 33 +------------------
 .../snippets/shelve_button_dropdown.html      | 28 ++++++++++++++++
 .../templates/snippets/status_options.html    |  2 +-
 5 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/shelve_button_dropdown.html

diff --git a/bookwyrm/templates/snippets/components/dropdown.html b/bookwyrm/templates/snippets/components/dropdown.html
index 48a808d48..1e45fe51a 100644
--- a/bookwyrm/templates/snippets/components/dropdown.html
+++ b/bookwyrm/templates/snippets/components/dropdown.html
@@ -1,6 +1,6 @@
 {% load bookwyrm_tags %}
 {% with 0|uuid as uuid %}
-<div class="dropdown {% if right %}is-right{% endif %}" id="menu-{{ uuid }}">
+<div class="dropdown control{% if right %} is-right{% endif %}" id="menu-{{ uuid }}">
     <button type="button" class="button dropdown-trigger pulldown-menu {{ class }}" aria-expanded="false" class="pulldown-menu" aria-haspopup="true" aria-controls="menu-options-{{ uuid }}" data-controls="menu-{{ uuid }}">
         {% block dropdown-trigger %}{% endblock %}
     </button>
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 200f11397..f6d5607fb 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -12,7 +12,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
-        <button class="button is-small" type="submit">{{ shelf.name }}</button>
+        <button class="button is-fullwidth is-small" type="submit">{{ shelf.name }}</button>
     </form>
 </li>
 {% endif %}
@@ -23,7 +23,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
-        <button class="button is-small is-danger is-light" type="submit">Unshelve</button>
+        <button class="button is-fullwidth is-small is-danger is-light" type="submit">Unshelve</button>
     </form>
 </li>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button.html
index 5f22dd295..96382d966 100644
--- a/bookwyrm/templates/snippets/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button.html
@@ -26,38 +26,7 @@
         </form>
         {% endif %}
     </div>
-
-    <div class="dropdown control is-hoverable">
-        <div class="dropdown-trigger">
-            <label for="shelf-select-dropdown-{{ uuid }}-toggle" role="button" aria-expanded="false" class="pulldown-menu" tabindex="0" aria-haspopup="true" aria-controls="shelf-select-{{ uuid }}">
-                <div class="button is-small">
-                    <span class="icon icon-arrow-down"><span class="is-sr-only">More shelves</span></span>
-                </div>
-            </label>
-        </div>
-        <div class="dropdown-menu" id="shelf-select-{{ uuid }}" role="menu">
-            <ul class="dropdown-content">
-                {% for shelf in request.user.shelf_set.all %}
-                <li role="menuitem">
-                    {% if active_shelf.shelf.identifier != 'reading' and shelf.identifier == 'reading' %}
-                    <div class="dropdown-item pt-0 pb-0">
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Start reading" controls_text="start-reading" controls_uid=uuid %}
-                    </div>
-                    {% else %}
-                    <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
-                        {% csrf_token %}
-                        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-                        <button class="button is-small" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
-                            <span>{{ shelf.name }}</span>
-                            {% if shelf in book.shelf_set.all %}<span class="icon icon-check"></span>{% endif %}
-                        </button>
-                    </form>
-                    {% endif %}
-                </li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
+    {% include 'snippets/shelve_button_dropdown.html' with class="is-small" button_uuid=uuid%}
     {% endif %}
 </div>
 
diff --git a/bookwyrm/templates/snippets/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button_dropdown.html
new file mode 100644
index 000000000..212770f18
--- /dev/null
+++ b/bookwyrm/templates/snippets/shelve_button_dropdown.html
@@ -0,0 +1,28 @@
+{% extends 'snippets/components/dropdown.html' %}
+{% block dropdown-trigger %}
+<span class="icon icon-arrow-down">
+    <span class="is-sr-only">More shelves</span>
+</span>
+{% endblock %}
+
+{% block dropdown-list %}
+{% for shelf in request.user.shelf_set.all %}
+<li role="menuitem">
+    {% if active_shelf.shelf.identifier != 'reading' and shelf.identifier == 'reading' %}
+    <div class="dropdown-item pt-0 pb-0">
+        {% include 'snippets/toggle/toggle_button.html' with class="is-fullwidth is-small" text="Start reading" controls_text="start-reading" controls_uid=button_uuid %}
+    </div>
+    {% else %}
+    <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
+        {% csrf_token %}
+        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+        <button class="button is-fullwidth is-small" name="shelf" type="submit" value="{{ shelf.identifier }}" {% if shelf in book.shelf_set.all %} disabled {% endif %}>
+            <span>{{ shelf.name }}</span>
+            {% if shelf in book.shelf_set.all %}<span class="icon icon-check"></span>{% endif %}
+        </button>
+    </form>
+    {% endif %}
+</li>
+{% endfor %}
+{% endblock %}
+
diff --git a/bookwyrm/templates/snippets/status_options.html b/bookwyrm/templates/snippets/status_options.html
index 5a9036be3..6cd13dfdb 100644
--- a/bookwyrm/templates/snippets/status_options.html
+++ b/bookwyrm/templates/snippets/status_options.html
@@ -10,7 +10,7 @@
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
-        <button class="button is-danger is-light" type="submit">
+        <button class="button is-danger is-light is-fullwidth is-small" type="submit">
             Delete post
         </button>
     </form>