Merge branch 'main' into production

bookwyrm/templates/compose.html

@@ -2,10 +2,10 @@
 {% load i18n %}
 {% load utilities %}
 
-{% block title %}{% trans "Compose status" %}{% endblock %}
+{% block title %}{% trans "Edit status" %}{% endblock %}
 {% block content %}
 <header class="block content">
-    <h1>{% trans "Compose status" %}</h1>
+    <h1>{% trans "Edit status" %}</h1>
 </header>
 
 {% with 0|uuid as uuid %}
@@ -22,6 +22,10 @@
     <div class="column">
         {% if draft.reply_parent %}
         {% include 'snippets/status/status.html' with status=draft.reply_parent no_interact=True %}
+        {% else %}
+        <div class="block">
+            {% include "snippets/status/header.html" with status=draft %}
+        </div>
         {% endif %}
 
         {% if not draft %}

bookwyrm/templates/snippets/create_status/comment.html

@@ -15,6 +15,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
 {% trans "Some thoughts on the book" as placeholder %}
 
 {% block post_content_additions %}
+    {% if not draft.reading_status %}
     {# Supplemental fields #}
     <div>
         {% active_shelf book as active_shelf %}
@@ -68,6 +69,7 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
         {% endwith %}
         {% endif %}
     </div>
+    {% endif %}
 {% endblock %}
 
 {% endwith %}

bookwyrm/templates/snippets/create_status/layout.html

@@ -33,6 +33,9 @@ reply_parent: the Status object this post will be in reply to, if applicable
     <input type="hidden" name="book" value="{{ book.id }}">
     <input type="hidden" name="user" value="{{ request.user.id }}">
     <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
+    {% if draft %}
+    <input type="hidden" name="reading_status" value="{{ draft.reading_status|default:'' }}">
+    {% endif %}
     {% endblock %}
 
     {% include "snippets/create_status/content_warning_field.html" %}