From 24c1d5a168daf4a1d67b5baae0c25397f87bb3e5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 30 Jan 2022 09:15:20 -0800
Subject: [PATCH] Add prompt to respond to reporter

---
 .../templates/settings/reports/report.html    | 23 ++++++++++++++++---
 .../snippets/create_status/content_field.html | 21 +++++++++--------
 .../create_status/post_options_block.html     |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html
index 84fafb143..a795273bc 100644
--- a/bookwyrm/templates/settings/reports/report.html
+++ b/bookwyrm/templates/settings/reports/report.html
@@ -17,6 +17,19 @@
     {% include 'settings/reports/report_preview.html' with report=report %}
 </div>
 
+<div class="block">
+    <details class="details-panel box">
+        <summary>
+            <span class="title is-4">{% trans "Message reporter" %}</span>
+            <span class="details-close icon icon-x" aria-hidden></span>
+        </summary>
+        <div class="box">
+            {% trans "Update on your report:" as dm_template %}
+            {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=report.reporter prepared_content=dm_template no_script=True %}
+        </div>
+    </details>
+</div>
+
 {% if report.statuses.exists %}
 <div class="block">
     <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
@@ -68,9 +81,13 @@
     {% endfor %}
     <form class="block" name="report-comment" method="post" action="{% url 'settings-report' report.id %}">
         {% csrf_token %}
-        <label for="report_comment" class="label">Comment on report</label>
-        <textarea name="note" id="report_comment" class="textarea"></textarea>
-        <button class="button">{% trans "Comment" %}</button>
+        <div class="field">
+            <label for="report_comment" class="label">Comment on report</label>
+            <textarea name="note" id="report_comment" class="textarea"></textarea>
+        </div>
+        <div class="field">
+            <button class="button">{% trans "Comment" %}</button>
+        </div>
     </form>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index ea2849d92..cc4205b2c 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -8,13 +8,14 @@ reply_parent: if applicable, the Status object that this post is in reply to
 mention: a user who is @ mentioned by default in the post
 draft: an existing Status object that is providing default values for input fields
 {% endcomment %}
-<textarea
-    name="content"
-    class="textarea save-draft"
-    {% if not draft %}data-cache-draft="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"{% endif %}
-    id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}{{ uuid }}"
-    placeholder="{{ placeholder }}"
-    aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
-    {% if not optional and type != "quotation" and type != "review" %}required{% endif %}
->{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{% firstof draft.raw_content draft.content '' %}</textarea>
-
+<div class="control">
+    <textarea
+        name="content"
+        class="textarea save-draft"
+        {% if not draft %}data-cache-draft="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"{% endif %}
+        id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}{{ uuid }}"
+        placeholder="{{ placeholder }}"
+        aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
+        {% if not optional and type != "quotation" and type != "review" %}required{% endif %}
+        >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ prepared_content }}{% firstof draft.raw_content draft.content '' %}</textarea>
+</div>
diff --git a/bookwyrm/templates/snippets/create_status/post_options_block.html b/bookwyrm/templates/snippets/create_status/post_options_block.html
index 697614e19..171315320 100644
--- a/bookwyrm/templates/snippets/create_status/post_options_block.html
+++ b/bookwyrm/templates/snippets/create_status/post_options_block.html
@@ -15,7 +15,7 @@
         {% endif %}
         </div>
     </div>
-    <div class="column is-narrow">
+    <div class="column is-narrow control">
         <button class="button is-link" type="submit">
             <span class="icon icon-spinner" aria-hidden="true"></span>
             <span>{% trans "Post" %}</span>