From ae0e67f0760e74b9e146996f0803e4f7e235f4b0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 30 Jan 2022 09:31:57 -0800
Subject: [PATCH] Fixes form element display inside details panel

---
 .../book/editions/format_filter.html          | 22 +++++++-------
 .../book/editions/language_filter.html        | 22 +++++++-------
 .../book/editions/search_filter.html          |  6 ++--
 .../snippets/filters_panel/filters_panel.html |  4 ++-
 bookwyrm/templatetags/shelf_tags.py           | 29 ++++++++++---------
 5 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/bookwyrm/templates/book/editions/format_filter.html b/bookwyrm/templates/book/editions/format_filter.html
index c722b24f..4e0f3c9b 100644
--- a/bookwyrm/templates/book/editions/format_filter.html
+++ b/bookwyrm/templates/book/editions/format_filter.html
@@ -2,15 +2,17 @@
 {% load i18n %}
 
 {% block filter %}
-<label class="label is-block" for="id_format">{% trans "Format:" %}</label>
-<div class="select">
-    <select id="id_format" name="format">
-        <option value="">{% trans "Any" %}</option>
-        {% for format in formats %}{% if format %}
-        <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
-            {{ format|title }}
-        </option>
-        {% endif %}{% endfor %}
-    </select>
+<div class="control">
+    <label class="label is-block" for="id_format">{% trans "Format:" %}</label>
+    <div class="select">
+        <select id="id_format" name="format">
+            <option value="">{% trans "Any" %}</option>
+            {% for format in formats %}{% if format %}
+            <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
+                {{ format|title }}
+            </option>
+            {% endif %}{% endfor %}
+        </select>
+    </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/book/editions/language_filter.html b/bookwyrm/templates/book/editions/language_filter.html
index d9051fd8..d14e3353 100644
--- a/bookwyrm/templates/book/editions/language_filter.html
+++ b/bookwyrm/templates/book/editions/language_filter.html
@@ -2,15 +2,17 @@
 {% load i18n %}
 
 {% block filter %}
-<label class="label is-block" for="id_language">{% trans "Language:" %}</label>
-<div class="select">
-    <select id="id_language" name="language">
-        <option value="">{% trans "Any" %}</option>
-        {% for language in languages %}
-        <option value="{{ language }}" {% if request.GET.language == language %}selected{% endif %}>
-            {{ language }}
-        </option>
-        {% endfor %}
-    </select>
+<div class="control">
+    <label class="label is-block" for="id_language">{% trans "Language:" %}</label>
+    <div class="select">
+        <select id="id_language" name="language">
+            <option value="">{% trans "Any" %}</option>
+            {% for language in languages %}
+            <option value="{{ language }}" {% if request.GET.language == language %}selected{% endif %}>
+                {{ language }}
+            </option>
+            {% endfor %}
+        </select>
+    </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/book/editions/search_filter.html b/bookwyrm/templates/book/editions/search_filter.html
index f2345a68..91c76422 100644
--- a/bookwyrm/templates/book/editions/search_filter.html
+++ b/bookwyrm/templates/book/editions/search_filter.html
@@ -2,7 +2,9 @@
 {% load i18n %}
 
 {% block filter %}
-<label class="label" for="id_search">{% trans "Search editions" %}</label>
-<input type="text" class="input" name="q" value="{{ request.GET.q|default:'' }}" id="id_search">
+<div class="control">
+    <label class="label" for="id_search">{% trans "Search editions" %}</label>
+    <input type="text" class="input" name="q" value="{{ request.GET.q|default:'' }}" id="id_search">
+</div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
index 84b27163..c3ddeeea 100644
--- a/bookwyrm/templates/snippets/filters_panel/filters_panel.html
+++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
@@ -38,9 +38,11 @@
                 {% block filter_fields %}
                 {% endblock %}
             </div>
-            <button type="submit" class="button is-primary is-small">
+            <div class="control">
+            <button type="submit" class="button is-primary">
             {% trans "Apply filters" %}
             </button>
+            </div>
         </form>
     </div>
 </details>
diff --git a/bookwyrm/templatetags/shelf_tags.py b/bookwyrm/templatetags/shelf_tags.py
index 6c4f59c3..7aef638f 100644
--- a/bookwyrm/templatetags/shelf_tags.py
+++ b/bookwyrm/templatetags/shelf_tags.py
@@ -36,19 +36,22 @@ def get_next_shelf(current_shelf):
 def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
     user = context["request"].user
-    return cache.get_or_set(
-        f"active_shelf-{user.id}-{book.id}",
-        lambda u, b: (
-            models.ShelfBook.objects.filter(
-                shelf__user=u,
-                book__parent_work__editions=b,
-            ).first()
-            or False
-        ),
-        user,
-        book,
-        timeout=15552000,
-    ) or {"book": book}
+    return (
+        cache.get_or_set(
+            f"active_shelf-{user.id}-{book.id}",
+            lambda u, b: (
+                models.ShelfBook.objects.filter(
+                    shelf__user=u,
+                    book__parent_work__editions=b,
+                ).first()
+                or False
+            ),
+            user,
+            book,
+            timeout=15552000,
+        )
+        or {"book": book}
+    )
 
 
 @register.simple_tag(takes_context=False)