Id uniqueness fixes

bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html

@@ -35,3 +35,7 @@ Finish "<em>{{ book_title }}</em>"
     </div>
 </div>
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="finish_modal" %}
+{% endblock %}

bookwyrm/templates/snippets/reading_modals/layout.html

@@ -23,8 +23,7 @@
 <div id="reading_content_{{ local_uuid }}_{{ uuid }}">
     <hr aria-hidden="true">
     <fieldset id="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}">
-        {% comparison_bool controls_text "progress_update" True as optional %}
-        {% include "snippets/reading_modals/form.html" with optional=optional %}
+        {% block form %}{% endblock %}
     </fieldset>
 </div>
 {% endwith %}

bookwyrm/templates/snippets/reading_modals/progress_update_modal.html

@@ -15,3 +15,7 @@
 <label for="id_progress_{{ readthrough.id }}" class="label">{% trans "Progress:" %}</label>
 {% include "snippets/progress_field.html" with progress_required=True %}
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=False type="update_modal" %}
+{% endblock %}

bookwyrm/templates/snippets/reading_modals/start_reading_modal.html

@@ -22,3 +22,7 @@ Start "<em>{{ book_title }}</em>"
     <input type="date" name="start_date" class="input" id="start_id_start_date_{{ uuid }}" value="{% now "Y-m-d" %}">
 </div>
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="start_modal" %}
+{% endblock %}

bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html

@@ -13,3 +13,7 @@ Want to Read "<em>{{ book_title }}</em>"
 <input type="hidden" name="reading_status" value="to-read">
 {% csrf_token %}
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="want_modal" %}
+{% endblock %}