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] 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>