From bcbcdd5b3b070c35537b7aa4089c79cc724a8956 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 3 Feb 2021 12:36:20 -0800
Subject: [PATCH] Uses component for create shelf form

---
 .../templates/user/create_shelf_form.html     | 26 +++++++++++++++++++
 bookwyrm/templates/user/shelf.html            | 23 +++-------------
 bookwyrm/urls.py                              |  2 +-
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 bookwyrm/templates/user/create_shelf_form.html

diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/create_shelf_form.html
new file mode 100644
index 00000000..89f41fd8
--- /dev/null
+++ b/bookwyrm/templates/user/create_shelf_form.html
@@ -0,0 +1,26 @@
+{% extends 'components/inline_form.html' %}
+
+{% block header %}
+Create New Shelf
+{% endblock %}
+
+{% block form %}
+<form name="create-shelf" action="{% url 'shelf-create' %}" method="post">
+    {% csrf_token %}
+    <input type="hidden" name="user" value="{{ request.user.id }}">
+    <div class="field">
+        <label class="label" for="id_name_create">Name:</label>
+        <input type="text" name="name" maxlength="100" class="input" required="true" id="id_name_create">
+    </div>
+
+    <div class="field has-addons">
+        <div class="control">
+            {% include 'snippets/privacy_select.html' %}
+        </div>
+        <div class="control">
+            <button class="button is-primary" type="submit">Create shelf</button>
+        </div>
+    </div>
+</form>
+{% endblock %}
+
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index add5e5db..07b4f30b 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -29,30 +29,13 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Create shelf" icon="plus" class="is-clickable" controls_text="create-shelf-form" %}
+        {% include 'snippets/toggle/open_button.html' with text="Create shelf" icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
 
-<div class="hidden box mb-5" id="create-shelf-form">
-    <h2 class="title is-4">Create new shelf</h2>
-    <form name="create-shelf" action="/create-shelf/" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="user" value="{{ request.user.id }}">
-        <div class="field">
-            <label class="label" for="id_name_create">Name:</label>
-            <input type="text" name="name" maxlength="100" class="input" required="true" id="id_name_create">
-        </div>
-
-        <label class="label">
-            <p>Shelf privacy:</p>
-            {% include 'snippets/privacy_select.html' with no_label=True %}
-        </label>
-        <div class="field is-grouped">
-            <button class="button is-primary" type="submit">Create shelf</button>
-            {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="create-shelf-form" %}
-        </div>
-    </form>
+<div class="block">
+    {% include 'user/create_shelf_form.html' with controls_text='create-shelf-form' %}
 </div>
 
 <div class="block columns">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 68aaedd7..3830adb9 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -150,7 +150,7 @@ urlpatterns = [
             user_path, views.Shelf.as_view(), name='shelf'),
     re_path(r'^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$' % \
             local_user_path, views.Shelf.as_view()),
-    re_path(r'^create-shelf/?$', views.create_shelf),
+    re_path(r'^create-shelf/?$', views.create_shelf, name='shelf-create'),
     re_path(r'^delete-shelf/(?P<shelf_id>\d+)?$', views.delete_shelf),
     re_path(r'^shelve/?$', views.shelve),
     re_path(r'^unshelve/?$', views.unshelve),