From e2476d1ad36a1c55685703574461385454ac6b05 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 08:38:06 -0800
Subject: [PATCH 01/17] Move content warning toggle out of post options block

---
 .../snippets/create_status/post_options_block.html     | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/post_options_block.html b/bookwyrm/templates/snippets/create_status/post_options_block.html
index 171315320..652f8adbd 100644
--- a/bookwyrm/templates/snippets/create_status/post_options_block.html
+++ b/bookwyrm/templates/snippets/create_status/post_options_block.html
@@ -1,8 +1,6 @@
 {% load i18n %}
-<div class="columns mt-1">
-    <div class="field has-addons column">
-        {% include "snippets/create_status/content_warning_toggle.html" %}
-        <div class="control">
+<div class="field has-addons is-justify-content-end">
+    <div class="control">
         {% if type == 'direct' %}
             <input type="hidden" name="privacy" value="direct">
             <button type="button" class="button" aria-label="Privacy" disabled>{% trans "Private" %}</button>
@@ -13,13 +11,11 @@
             {% include 'snippets/privacy_select.html' with current=reply_parent.privacy %}
             {% endif %}
         {% endif %}
-        </div>
     </div>
-    <div class="column is-narrow control">
+    <div class="control">
         <button class="button is-link" type="submit">
             <span class="icon icon-spinner" aria-hidden="true"></span>
             <span>{% trans "Post" %}</span>
         </button>
     </div>
 </div>
-

From a922b8fd04b6f7188e58153fc15f1a9ea8f72536 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:03:24 -0800
Subject: [PATCH 02/17] Uses details to show/hide content warning field

---
 .../create_status/content_warning_field.html  | 49 ++++++++++++-------
 .../create_status/content_warning_toggle.html | 17 -------
 .../snippets/create_status/layout.html        |  4 +-
 3 files changed, 32 insertions(+), 38 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/create_status/content_warning_toggle.html

diff --git a/bookwyrm/templates/snippets/create_status/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
index 14428f30d..2a2161f71 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -1,22 +1,33 @@
 {% load i18n %}
-<div
-    class="field{% if not reply_parent.content_warning and not draft.content_warning %} is-hidden{% endif %}"
-    id="spoilers_{{ uuid }}{{ local_uuid }}"
->
-    <label
-        class="label"
-        for="id_content_warning_{{ uuid }}{{ local_uuid }}"
-    >
-        {% trans "Content warning:" %}
-    </label>
-    <input
-        type="text"
-        name="content_warning"
-        maxlength="255"
-        class="input"
-        id="id_content_warning_{{ uuid }}{{ local_uuid }}"
-        placeholder="{% trans 'Spoilers ahead!' %}"
-        value="{% firstof draft.content_warning reply_parent.content_warning '' %}"
-        {% if not draft %}data-cache-draft="id_content_warning_{{ book.id }}_{{ type }}"{% endif %}
+<div class="field is-relative">
+    <details
+        {% if reply_parent.content_warning or draft.content_warning %}open{% endif %}
     >
+        <summary class="is-flex">
+            <span class="icon icon-warning is-size-5 mr-1" aria-hidden="true"></span>
+            <span>
+                {% trans "Include spoiler alert" %}
+            </span>
+            <span class="details-close icon icon-plus" aria-hidden="true"></span>
+        </summary>
+
+        <label
+            class="label"
+            for="id_content_warning_{{ uuid }}{{ local_uuid }}"
+        >
+            {% trans "Content warning:" %}
+        </label>
+        <div class="control">
+            <input
+                type="text"
+                name="content_warning"
+                maxlength="255"
+                class="input"
+                id="id_content_warning_{{ uuid }}{{ local_uuid }}"
+                placeholder="{% trans 'Spoilers ahead!' %}"
+                value="{% firstof draft.content_warning reply_parent.content_warning '' %}"
+                {% if not draft %}data-cache-draft="id_content_warning_{{ book.id }}_{{ type }}"{% endif %}
+            >
+        </div>
+    </details>
 </div>
diff --git a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html b/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
deleted file mode 100644
index a5c41cbcb..000000000
--- a/bookwyrm/templates/snippets/create_status/content_warning_toggle.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% load i18n %}
-
-<div class="control">
-    <input
-        type="checkbox"
-        class="is-hidden"
-        name="sensitive"
-        id="id_show_spoilers_{{ uuid }}{{ local_uuid }}"
-        {% if draft.content_warning or status.content_warning %}checked{% endif %}
-        aria-hidden="true"
-        {% if not draft %}data-cache-draft="id_sensitive_{{ book.id }}_{{ type }}{{ reply_parent.id }}"{% endif %}
-    >
-    {% trans "Include spoiler alert" as button_text %}
-    {% firstof draft.content_warning status.content_warning as pressed %}
-    {% firstof local_uuid '' as local_uuid %}
-    {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid|add:local_uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
-</div>
diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html
index 0585638d9..915e5114b 100644
--- a/bookwyrm/templates/snippets/create_status/layout.html
+++ b/bookwyrm/templates/snippets/create_status/layout.html
@@ -37,8 +37,6 @@ reply_parent: the Status object this post will be in reply to, if applicable
     {% endif %}
     {% endblock %}
 
-    {% include "snippets/create_status/content_warning_field.html" %}
-
     {# fields that go between the content warnings and the content field (ie, quote) #}
     {% block pre_content_additions %}{% endblock %}
 
@@ -55,6 +53,8 @@ reply_parent: the Status object this post will be in reply to, if applicable
     {# additional fields that go after the content block (ie, progress) #}
     {% block post_content_additions %}{% endblock %}
 
+    {% include "snippets/create_status/content_warning_field.html" %}
+
     {% block options_block %}
     {# cw, post privacy, and submit button #}
     {% include "snippets/create_status/post_options_block.html" %}

From bcd83ee802970ce092364c41c48dfcaa311b2da7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:16:44 -0800
Subject: [PATCH 03/17] Fixes list notes icon

---
 bookwyrm/templates/lists/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 1d5abd89e..2e01bfb17 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -117,7 +117,7 @@
                                 <summary>
                                     <span role="heading" aria-level="3">
                                         {% trans "Add notes" %}
-                                        <span class="details-close icon icon-plus" aria-hidden="true"></span>
+                                        <span class="details-close icon icon-x" aria-hidden="true"></span>
                                     </span>
                                 </summary>
                                 {% include "lists/edit_item_form.html" with book=item.book %}

From cc2b774fb579d248537dd9deaa0ae63833524c2c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:16:50 -0800
Subject: [PATCH 04/17] Updates wording on content warning field

---
 .../snippets/create_status/content_warning_field.html         | 4 ++--
 bookwyrm/views/status.py                                      | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
index 2a2161f71..2c34136ce 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -8,14 +8,14 @@
             <span>
                 {% trans "Include spoiler alert" %}
             </span>
-            <span class="details-close icon icon-plus" aria-hidden="true"></span>
+            <span class="details-close icon icon-x" aria-hidden="true"></span>
         </summary>
 
         <label
             class="label"
             for="id_content_warning_{{ uuid }}{{ local_uuid }}"
         >
-            {% trans "Content warning:" %}
+            {% trans "Spoilers/content warnings:" %}
         </label>
         <div class="control">
             <input
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 5dc8e8fa0..af15064fd 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -85,9 +85,7 @@ class CreateStatus(View):
         if hasattr(status, "quote"):
             status.raw_quote = status.quote
 
-        if not status.sensitive and status.content_warning:
-            # the cw text field remains populated when you click "remove"
-            status.content_warning = None
+        status.sensitive = status.content_warning not in [None, ""]
         status.save(broadcast=False)
 
         # inspect the text for user tags

From 1657f28c5ea0151e2a9e33f87b257b100c34a5e3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:30:39 -0800
Subject: [PATCH 05/17] Updates verification modal button positions

---
 .../templates/book/file_links/verification_modal.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/book/file_links/verification_modal.html b/bookwyrm/templates/book/file_links/verification_modal.html
index 81685da0f..01f17f965 100644
--- a/bookwyrm/templates/book/file_links/verification_modal.html
+++ b/bookwyrm/templates/book/file_links/verification_modal.html
@@ -17,13 +17,13 @@ Is that where you'd like to go?
 
 
 {% block modal-footer %}
-<a href="{{ link.url }}" target="_blank" rel="noopener noreferrer" class="button is-primary">{% trans "Continue" %}</a>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
-
 {% if request.user.is_authenticated %}
-<div class="has-text-right is-flex-grow-1">
+<div class="is-flex-grow-1">
     <a href="{% url 'report-link' link.added_by.id link.id %}">{% trans "Report spam" %}</a>
 </div>
+
+<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<a href="{{ link.url }}" target="_blank" rel="noopener noreferrer" class="button is-primary">{% trans "Continue" %}</a>
 {% endif %}
 
 {% endblock %}

From d7eb118a071de95ccd0475b59aa6abbbfa3fbf62 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:35:05 -0800
Subject: [PATCH 06/17] Updates readthrough modal

---
 bookwyrm/templates/readthrough/readthrough_modal.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/readthrough/readthrough_modal.html b/bookwyrm/templates/readthrough/readthrough_modal.html
index 73f445f61..0f03d9386 100644
--- a/bookwyrm/templates/readthrough/readthrough_modal.html
+++ b/bookwyrm/templates/readthrough/readthrough_modal.html
@@ -69,8 +69,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">{% trans "Save" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}

From 672eee9c9c382e4af1c6d0b82ea82b0091b36c6d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:41:32 -0800
Subject: [PATCH 07/17] Updates add file link modal

---
 bookwyrm/templates/book/file_links/add_link_modal.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/file_links/add_link_modal.html b/bookwyrm/templates/book/file_links/add_link_modal.html
index d5b3fcd0d..67b437bd7 100644
--- a/bookwyrm/templates/book/file_links/add_link_modal.html
+++ b/bookwyrm/templates/book/file_links/add_link_modal.html
@@ -55,8 +55,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">{% trans "Save" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
-
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+</div>
 {% endblock %}
+
 {% block modal-form-close %}</form>{% endblock %}

From cbcd5c7a5749b539f390925c0f84379baed001c0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:49:17 -0800
Subject: [PATCH 08/17] Adds elided page range to editions

---
 bookwyrm/views/books/editions.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py
index 81d073224..865f54805 100644
--- a/bookwyrm/views/books/editions.py
+++ b/bookwyrm/views/books/editions.py
@@ -58,8 +58,12 @@ class Editions(View):
             )
 
         paginated = Paginator(editions, PAGE_LENGTH)
+        page = paginated.get_page(request.GET.get("page"))
         data = {
-            "editions": paginated.get_page(request.GET.get("page")),
+            "editions": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "work": work,
             "languages": languages,
             "formats": set(

From 8b4c9483ea57bfb181e2364f6c8f752a6fbbe4a7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:49:27 -0800
Subject: [PATCH 09/17] Udates sync modals

---
 bookwyrm/templates/author/sync_modal.html | 6 ++++--
 bookwyrm/templates/book/sync_modal.html   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/author/sync_modal.html b/bookwyrm/templates/author/sync_modal.html
index a6e032cbf..44b85ef4e 100644
--- a/bookwyrm/templates/author/sync_modal.html
+++ b/bookwyrm/templates/author/sync_modal.html
@@ -19,8 +19,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/book/sync_modal.html b/bookwyrm/templates/book/sync_modal.html
index 6e5df0c0f..81ad8db92 100644
--- a/bookwyrm/templates/book/sync_modal.html
+++ b/bookwyrm/templates/book/sync_modal.html
@@ -19,8 +19,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}

From 20453a997744606f2ff1f0761bf20e3f60e8af8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 09:57:55 -0800
Subject: [PATCH 10/17] Delete readthrough and add cover modals

---
 bookwyrm/templates/book/cover_add_modal.html   |  6 ++++--
 .../readthrough/delete_readthrough_modal.html  | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/book/cover_add_modal.html b/bookwyrm/templates/book/cover_add_modal.html
index e8207ff44..8ca5bf2a8 100644
--- a/bookwyrm/templates/book/cover_add_modal.html
+++ b/bookwyrm/templates/book/cover_add_modal.html
@@ -28,8 +28,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">{% trans "Add" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button class="button is-primary" type="submit">{% trans "Add" %}</button>
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/readthrough/delete_readthrough_modal.html b/bookwyrm/templates/readthrough/delete_readthrough_modal.html
index 5b3a74cc5..88ebf53c2 100644
--- a/bookwyrm/templates/readthrough/delete_readthrough_modal.html
+++ b/bookwyrm/templates/readthrough/delete_readthrough_modal.html
@@ -14,12 +14,20 @@
 {% endblock %}
 
 {% block modal-footer %}
-<form name="delete-readthrough-{{ readthrough.id }}" action="/delete-readthrough" method="POST">
+<form
+    name="delete-readthrough-{{ readthrough.id }}"
+    action="/delete-readthrough"
+    method="POST"
+    class="is-flex-grow-1"
+>
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ readthrough.id }}">
-    <button class="button is-danger" type="submit">
-        {% trans "Delete" %}
-    </button>
-    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+
+    <div class="buttons is-right">
+        <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+        <button class="button is-danger" type="submit">
+            {% trans "Delete" %}
+        </button>
+    </div>
 </form>
 {% endblock %}

From d4be0ca58be99cc4187b87b928dd718998957252 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 10:02:18 -0800
Subject: [PATCH 11/17] Report modal

---
 bookwyrm/templates/snippets/report_modal.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html
index 64e0c298c..e80dd1f5e 100644
--- a/bookwyrm/templates/snippets/report_modal.html
+++ b/bookwyrm/templates/snippets/report_modal.html
@@ -48,10 +48,10 @@
 
 
 {% block modal-footer %}
-
-<button class="button is-success" type="submit">{% trans "Submit" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
-
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button class="button is-success" type="submit">{% trans "Submit" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}

From 9977b33a8d9262b94516d49479df0a79bc113d89 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 10:49:33 -0800
Subject: [PATCH 12/17] Group, list, and shelve form buttons

---
 bookwyrm/templates/groups/create_form.html     |  2 +-
 .../templates/groups/delete_group_modal.html   | 12 +++++++-----
 bookwyrm/templates/groups/form.html            | 17 ++++++++++-------
 bookwyrm/templates/lists/add_item_modal.html   | 18 ++++++++++--------
 .../templates/lists/delete_list_modal.html     | 16 +++++++++-------
 bookwyrm/templates/lists/form.html             |  2 +-
 .../link_domains/edit_domain_modal.html        |  6 ++++--
 .../templates/shelf/create_shelf_form.html     |  2 +-
 bookwyrm/templates/shelf/form.html             |  2 +-
 9 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/templates/groups/create_form.html b/bookwyrm/templates/groups/create_form.html
index dbb8ad88b..5aace9d1d 100644
--- a/bookwyrm/templates/groups/create_form.html
+++ b/bookwyrm/templates/groups/create_form.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block header %}
-{% trans "Create Group" %}
+{% trans "Create group" %}
 {% endblock %}
 
 {% block form %}
diff --git a/bookwyrm/templates/groups/delete_group_modal.html b/bookwyrm/templates/groups/delete_group_modal.html
index 592a861fd..f166eec21 100644
--- a/bookwyrm/templates/groups/delete_group_modal.html
+++ b/bookwyrm/templates/groups/delete_group_modal.html
@@ -8,13 +8,15 @@
 {% endblock %}
 
 {% block modal-footer %}
-<form name="delete-group-{{ group.id }}" action="{% url 'delete-group' group.id %}" method="POST">
+<form name="delete-group-{{ group.id }}" action="{% url 'delete-group' group.id %}" method="POST" class="is-flex-grow-1">
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ group.id }}">
-    <button class="button is-danger" type="submit">
-        {% trans "Delete" %}
-    </button>
-    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <div class="buttons is-right is-flex-grow-1">
+        <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+        <button class="button is-danger" type="submit">
+            {% trans "Delete" %}
+        </button>
+    </div>
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/groups/form.html b/bookwyrm/templates/groups/form.html
index 6767d1b10..a0d057582 100644
--- a/bookwyrm/templates/groups/form.html
+++ b/bookwyrm/templates/groups/form.html
@@ -16,18 +16,21 @@
 </div>
 <div class="is-flex">
     {% if group.id %}
-    <div class="is-flex-grow-1">
+    <div>
         <button type="button" data-modal-open="delete_group" class="button is-danger">
             {% trans "Delete group" %}
         </button>
     </div>
     {% endif %}
-    <div class="field has-addons">
-        <div class="control">
-            {% include 'snippets/privacy_select_no_followers.html' with current=group.privacy %}
-        </div>
-        <div class="control">
-            <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+
+    <div class="is-flex is-flex-grow-1 is-justify-content-flex-end">
+        <div class="field has-addons">
+            <div class="control">
+                {% include 'snippets/privacy_select_no_followers.html' with current=group.privacy %}
+            </div>
+            <div class="control">
+                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+            </div>
         </div>
     </div>
 </div>
diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html
index 5c210d462..2c586b308 100644
--- a/bookwyrm/templates/lists/add_item_modal.html
+++ b/bookwyrm/templates/lists/add_item_modal.html
@@ -32,14 +32,16 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button type="submit" class="button is-link">
-    {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
-        {% trans "Add" %}
-    {% else %}
-        {% trans "Suggest" %}
-    {% endif %}
-</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button type="submit" class="button is-link">
+        {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %}
+            {% trans "Add" %}
+        {% else %}
+            {% trans "Suggest" %}
+        {% endif %}
+    </button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/lists/delete_list_modal.html b/bookwyrm/templates/lists/delete_list_modal.html
index aad879529..88e04423c 100644
--- a/bookwyrm/templates/lists/delete_list_modal.html
+++ b/bookwyrm/templates/lists/delete_list_modal.html
@@ -8,15 +8,17 @@
 {% endblock %}
 
 {% block modal-footer %}
-<form name="delete-list-{{ list.id }}" action="{% url 'delete-list' list.id %}" method="POST">
+<form name="delete-list-{{ list.id }}" action="{% url 'delete-list' list.id %}" method="POST" class="is-flex-grow-1">
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ list.id }}">
-    <button class="button is-danger" type="submit">
-        {% trans "Delete" %}
-    </button>
-    <button type="button" class="button" data-modal-close>
-        {% trans "Cancel" %}
-    </button>
+    <div class="buttons is-right is-flex-grow-1">
+        <button type="button" class="button" data-modal-close>
+            {% trans "Cancel" %}
+        </button>
+        <button class="button is-danger" type="submit">
+            {% trans "Delete" %}
+        </button>
+    </div>
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index c8383d9c8..3558d8cc0 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -114,7 +114,7 @@
         </fieldset>
     </div>
 </div>
-<div class="is-flex">
+<div class="is-flex is-justify-content-end">
     {% if list.id %}
     <div class="is-flex-grow-1">
         <button type="button" data-modal-open="delete_list" class="button is-danger">
diff --git a/bookwyrm/templates/settings/link_domains/edit_domain_modal.html b/bookwyrm/templates/settings/link_domains/edit_domain_modal.html
index 135783e78..06ab360c3 100644
--- a/bookwyrm/templates/settings/link_domains/edit_domain_modal.html
+++ b/bookwyrm/templates/settings/link_domains/edit_domain_modal.html
@@ -18,8 +18,10 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button type="submit" class="button is-primary">{% trans "Set" %}</button>
-<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+<div class="buttons is-right is-flex-grow-1">
+    <button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
+    <button type="submit" class="button is-primary">{% trans "Set" %}</button>
+</div>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/shelf/create_shelf_form.html b/bookwyrm/templates/shelf/create_shelf_form.html
index c3d2b5faa..3bf171998 100644
--- a/bookwyrm/templates/shelf/create_shelf_form.html
+++ b/bookwyrm/templates/shelf/create_shelf_form.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block header %}
-{% trans "Create Shelf" %}
+{% trans "Create shelf" %}
 {% endblock %}
 
 {% block form %}
diff --git a/bookwyrm/templates/shelf/form.html b/bookwyrm/templates/shelf/form.html
index ff7f8b5ee..a25330109 100644
--- a/bookwyrm/templates/shelf/form.html
+++ b/bookwyrm/templates/shelf/form.html
@@ -17,7 +17,7 @@
     <label class="label" for="id_description_{{ uuid }}">{% trans "Description:" %}</label>
     <textarea name="description" cols="40" rows="5" maxlength="500" class="textarea" id="id_description_{{ uuid }}">{{ form.description.value|default:'' }}</textarea>
 </div>
-<div class="field has-addons">
+<div class="field has-addons is-justify-content-end">
     <div class="control">
         {% include 'snippets/privacy_select.html' with current=privacy %}
     </div>

From dbf925f17664b593efdb141e53f4321a6e01840c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 10 Mar 2022 10:52:39 -0800
Subject: [PATCH 13/17] Removes trailing whitespace

---
 bookwyrm/templates/snippets/register_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/register_form.html b/bookwyrm/templates/snippets/register_form.html
index dd8cff3a8..214e514c1 100644
--- a/bookwyrm/templates/snippets/register_form.html
+++ b/bookwyrm/templates/snippets/register_form.html
@@ -53,12 +53,12 @@
             id="id_password_register"
             aria-describedby="desc_password_register"
         >
-        
+
         {% include 'snippets/form_errors.html' with errors_list=register_form.password.errors id="desc_password_register" %}
     </div>
 </div>
 
-<div class="field is-grouped">
+<div class="field">
     <div class="control">
         <button class="button is-primary" type="submit">
             {% trans "Sign Up" %}

From 72d6a4ce52c3c6fc91cc461461f1a68e519eec9f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 11 Mar 2022 14:31:04 -0800
Subject: [PATCH 14/17] Log info, not exception, for expected errors

---
 bookwyrm/apps.py                          |  6 +++---
 bookwyrm/connectors/abstract_connector.py | 10 +++++-----
 bookwyrm/connectors/connector_manager.py  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/apps.py b/bookwyrm/apps.py
index d494877d6..786f86e1c 100644
--- a/bookwyrm/apps.py
+++ b/bookwyrm/apps.py
@@ -19,11 +19,11 @@ def download_file(url, destination):
             with open(destination, "b+w") as outfile:
                 outfile.write(stream.read())
     except (urllib.error.HTTPError, urllib.error.URLError):
-        logger.error("Failed to download file %s", url)
+        logger.info("Failed to download file %s", url)
     except OSError:
-        logger.error("Couldn't open font file %s for writing", destination)
+        logger.info("Couldn't open font file %s for writing", destination)
     except:  # pylint: disable=bare-except
-        logger.exception("Unknown error in file download")
+        logger.info("Unknown error in file download")
 
 
 class BookwyrmConfig(AppConfig):
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index d8b9c6300..56e273886 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -131,7 +131,7 @@ class AbstractConnector(AbstractMinimalConnector):
             try:
                 work_data = self.get_work_from_edition_data(data)
             except (KeyError, ConnectorException) as err:
-                logger.exception(err)
+                logger.info(err)
                 work_data = data
 
         if not work_data or not edition_data:
@@ -270,7 +270,7 @@ def get_data(url, params=None, timeout=10):
             timeout=timeout,
         )
     except RequestException as err:
-        logger.exception(err)
+        logger.info(err)
         raise ConnectorException(err)
 
     if not resp.ok:
@@ -278,7 +278,7 @@ def get_data(url, params=None, timeout=10):
     try:
         data = resp.json()
     except ValueError as err:
-        logger.exception(err)
+        logger.info(err)
         raise ConnectorException(err)
 
     return data
@@ -296,7 +296,7 @@ def get_image(url, timeout=10):
             timeout=timeout,
         )
     except RequestException as err:
-        logger.exception(err)
+        logger.info(err)
         return None, None
 
     if not resp.ok:
@@ -305,7 +305,7 @@ def get_image(url, timeout=10):
     image_content = ContentFile(resp.content)
     extension = imghdr.what(None, image_content.read())
     if not extension:
-        logger.exception("File requested was not an image: %s", url)
+        logger.info("File requested was not an image: %s", url)
         return None, None
 
     return image_content, extension
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 3bdd5cb41..14bb702cb 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -39,7 +39,7 @@ def search(query, min_confidence=0.1, return_first=False):
             try:
                 result_set = connector.isbn_search(isbn)
             except Exception as err:  # pylint: disable=broad-except
-                logger.exception(err)
+                logger.info(err)
                 # if this fails, we can still try regular search
 
         # if no isbn search results, we fallback to generic search
@@ -48,7 +48,7 @@ def search(query, min_confidence=0.1, return_first=False):
                 result_set = connector.search(query, min_confidence=min_confidence)
             except Exception as err:  # pylint: disable=broad-except
                 # we don't want *any* error to crash the whole search page
-                logger.exception(err)
+                logger.info(err)
                 continue
 
         if return_first and result_set:

From 822868bf8786a0becc68fdb1613684f3598d84cb Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Sat, 12 Mar 2022 04:17:11 -0800
Subject: [PATCH 15/17] fish autocompletions

---
 bw-dev              |  1 +
 complete_bwdev.fish | 97 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 complete_bwdev.fish

diff --git a/bw-dev b/bw-dev
index 41971bb81..1cc930264 100755
--- a/bw-dev
+++ b/bw-dev
@@ -225,6 +225,7 @@ case "$CMD" in
     *)
         set +x # No need to echo echo
         echo "Unrecognised command. Try:"
+        echo "    setup"
         echo "    up [container]"
         echo "    service_ports_web"
         echo "    initdb"
diff --git a/complete_bwdev.fish b/complete_bwdev.fish
new file mode 100644
index 000000000..9cd8f2600
--- /dev/null
+++ b/complete_bwdev.fish
@@ -0,0 +1,97 @@
+# bw-dev auto-completions for fish-shell.
+# copy this to ~./.config/fish/completions/ with the name `bw-dev.fish`
+# this will only work if renamed to `bw-dev.fish`.
+
+set -l commands up \
+service_ports_web \
+initdb \
+resetdb \
+makemigrations \
+migrate \
+bash \
+shell \
+dbshell \
+restart_celery \
+pytest \
+collectstatic \
+makemessages \
+compilemessages \
+update_locales \
+build \
+clean \
+black \
+prettier \
+stylelint \
+formatters \
+compilescss \
+collectstatic_watch \
+populate_streams \
+populate_lists_streams \
+populate_suggestions \
+generate_thumbnails \
+generate_preview_images \
+copy_media_to_s3 \
+set_cors_to_s3 \
+setup \
+admin_code \
+runweb
+
+function __bw_complete -a cmds cmd desc
+    complete -f -c bw-dev -n "not __fish_seen_subcommand_from $cmds" -a $cmd -d $desc
+end
+
+
+__bw_complete "$commands" "up"                      "bring one or all service(s) up"
+__bw_complete "$commands" "service_ports_web"       "run command on the web container with its portsenabled and mapped"
+__bw_complete "$commands" "initdb"                  "initialize database"
+__bw_complete "$commands" "resetdb"                 "!! WARNING !! reset database"
+__bw_complete "$commands" "makemigrations"          "create new migrations"
+__bw_complete "$commands" "migrate"                 "perform all migrations"
+__bw_complete "$commands" "bash"                    "open up bash within the web container"
+__bw_complete "$commands" "shell"                   "open the Python shell within the web container"
+__bw_complete "$commands" "dbshell"                 "open the database shell within the web container"
+__bw_complete "$commands" "restart_celery"          "restart the celery container"
+__bw_complete "$commands" "pytest"                  "run unit tests"
+__bw_complete "$commands" "collectstatic"           "copy changed static files into the installation"
+__bw_complete "$commands" "makemessages"            "extract all localizable messages from the code"
+__bw_complete "$commands" "compilemessages"         "compile .po localization files to .mo"
+__bw_complete "$commands" "update_locales"          "run makemessages and compilemessages for the en_US and additional locales"
+__bw_complete "$commands" "build"                   "build the containers"
+__bw_complete "$commands" "clean"                   "bring the cluster down and remove all containers"
+__bw_complete "$commands" "black"                   "run Python code formatting tool"
+__bw_complete "$commands" "prettier"                "run JavaScript code formatting tool"
+__bw_complete "$commands" "stylelint"               "run SCSS linting tool"
+__bw_complete "$commands" "formatters"              "run multiple formatter tools"
+__bw_complete "$commands" "compilescss"             "compile the SCSS layouts to CSS"
+__bw_complete "$commands" "populate_streams"        "populate the main streams"
+__bw_complete "$commands" "populate_lists_streams"  "populate streams for book lists"
+__bw_complete "$commands" "populate_suggestions"    "populate book suggestions"
+__bw_complete "$commands" "generate_thumbnails"     "generate book thumbnails"
+__bw_complete "$commands" "generate_preview_images" "generate book preview images"
+__bw_complete "$commands" "collectstatic_watch"     "watch filesystem and copy changed static files"
+__bw_complete "$commands" "copy_media_to_s3"        "run the `s3 cp` command to copy media to a bucket on S3"
+__bw_complete "$commands" "sync_media_to_s3"        "run the `s3 sync` command to sync media with a bucket on S3"
+__bw_complete "$commands" "set_cors_to_s3"          "push a CORS configuration defined in .json to s3"
+__bw_complete "$commands" "setup"                   "perform first-time setup"
+__bw_complete "$commands" "admin_code"              "get the admin code"
+__bw_complete "$commands" "runweb"                  "run a command on the web container"
+
+complete -f -c bw-dev -n "__fish_seen_subcommand_from up"\
+    -a "(docker-compose config --service)"
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from migrate"
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from pytest"\
+    -a "bookwyrm/tests/**.py"
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\
+	-a "--stream=" -d "pick a single stream to populate"
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\
+    -l stream -a "home local books"
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from generate_preview_images"\
+	-a "--all" -d "Generates images for ALL types: site, users and books. Can use a lot of computing power."
+
+complete -x -c bw-dev -n "__fish_seen_subcommand_from set_cors_to_s3"\
+	-a "**.json"

From 4530d4917a7513beea762b4a68b43013ac9b7815 Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Sat, 12 Mar 2022 04:24:22 -0800
Subject: [PATCH 16/17] make more compact with a function

---
 complete_bwdev.fish | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/complete_bwdev.fish b/complete_bwdev.fish
index 9cd8f2600..426ab0d49 100644
--- a/complete_bwdev.fish
+++ b/complete_bwdev.fish
@@ -40,7 +40,6 @@ function __bw_complete -a cmds cmd desc
     complete -f -c bw-dev -n "not __fish_seen_subcommand_from $cmds" -a $cmd -d $desc
 end
 
-
 __bw_complete "$commands" "up"                      "bring one or all service(s) up"
 __bw_complete "$commands" "service_ports_web"       "run command on the web container with its portsenabled and mapped"
 __bw_complete "$commands" "initdb"                  "initialize database"
@@ -76,22 +75,16 @@ __bw_complete "$commands" "setup"                   "perform first-time setup"
 __bw_complete "$commands" "admin_code"              "get the admin code"
 __bw_complete "$commands" "runweb"                  "run a command on the web container"
 
-complete -f -c bw-dev -n "__fish_seen_subcommand_from up"\
-    -a "(docker-compose config --service)"
 
-complete -x -c bw-dev -n "__fish_seen_subcommand_from migrate"
+function __bw_complete_subcommand -a cmd
+	complete -f -c bw-dev -n "__fish_seen_subcommand_from $cmd" $argv[2..-1]
+end
 
-complete -x -c bw-dev -n "__fish_seen_subcommand_from pytest"\
-    -a "bookwyrm/tests/**.py"
-
-complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\
-	-a "--stream=" -d "pick a single stream to populate"
-
-complete -x -c bw-dev -n "__fish_seen_subcommand_from populate_streams"\
-    -l stream -a "home local books"
-
-complete -x -c bw-dev -n "__fish_seen_subcommand_from generate_preview_images"\
-	-a "--all" -d "Generates images for ALL types: site, users and books. Can use a lot of computing power."
-
-complete -x -c bw-dev -n "__fish_seen_subcommand_from set_cors_to_s3"\
-	-a "**.json"
+__bw_complete_subcommand "up" -a "(docker-compose config --service)"
+__bw_complete_subcommand "migrate"
+__bw_complete_subcommand "pytest" -a "bookwyrm/tests/**.py"
+__bw_complete_subcommand "populate_streams" -a "--stream=" -d "pick a single stream to populate"
+__bw_complete_subcommand "populate_streams" -l stream -a "home local books"
+__bw_complete_subcommand "generate_preview_images" -a "--all"\
+	-d "Generates images for ALL types: site, users and books. Can use a lot of computing power."
+__bw_complete_subcommand "set_cors_to_s3" -a "**.json"

From 3358c233ea9b3c2816eded5bfd306e3ad3df2936 Mon Sep 17 00:00:00 2001
From: Vivianne Langdon <puttabutta@gmail.com>
Date: Sat, 12 Mar 2022 04:38:42 -0800
Subject: [PATCH 17/17] remove no-up autocomplete

---
 complete_bwdev.fish | 1 -
 1 file changed, 1 deletion(-)

diff --git a/complete_bwdev.fish b/complete_bwdev.fish
index 426ab0d49..c1f28dd51 100644
--- a/complete_bwdev.fish
+++ b/complete_bwdev.fish
@@ -81,7 +81,6 @@ function __bw_complete_subcommand -a cmd
 end
 
 __bw_complete_subcommand "up" -a "(docker-compose config --service)"
-__bw_complete_subcommand "migrate"
 __bw_complete_subcommand "pytest" -a "bookwyrm/tests/**.py"
 __bw_complete_subcommand "populate_streams" -a "--stream=" -d "pick a single stream to populate"
 __bw_complete_subcommand "populate_streams" -l stream -a "home local books"