diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 3a8fdd13..8893f42f 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -21,6 +21,7 @@ class Report(BookWyrmModel):
constraints = [
models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
]
+ ordering = ("-created_date",)
class ReportComment(BookWyrmModel):
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ca68d51d..ce0a0b3a 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -32,11 +32,13 @@
-
-
{% trans "Reported statuses" %}
+
+
{% trans "Reported statuses" %}
- {% for status in report.statuses.all %}
- - {{ status.id }}
+ {% for status in report.statuses.select_subclasses.all %}
+ -
+ {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+
{% endfor %}
diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
new file mode 100644
index 00000000..28613130
--- /dev/null
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -0,0 +1,37 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block modal-title %}
+{% blocktrans with username=user.username %}Report @{{ username }}{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+
{% endblock %}
+
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 25cb8a2f..9acc4f77 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -9,7 +9,7 @@
{% block card-content %}
- {% if report.notes %}{{ report.notes }}{% else %}{% trans "No notes provided" %}{% endif %}
+ {% if report.note %}{{ report.note }}{% else %}{% trans "No notes provided" %}{% endif %}
{% endblock %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 80ee2250..3f0300bd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -115,15 +115,7 @@
{{ related_status.published_date | post_date }}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 9d32d5fb..2fa0a3f3 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -1,8 +1,10 @@
{% load i18n %}
-
+{% load bookwyrm_tags %}
+{% with 0|uuid as report_uuid %}
+
+{% trans "Report" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal-title-report" disabled=is_current %}
+
+{% include 'moderation/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 8d6c21ed..f3732d1a 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -18,7 +18,10 @@
{% block card-footer %}