dbl: reports: Improve header now that comments have moved below

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/dbl/reports/show.html b/src/templates/dbl/reports/show.html
index 260f1b32167068728b32b1eb210a1cd82dff3a50..1b3d049ae50be1284f19c929ac01fc3dfb9d8a3f 100644 (file)
--- a/src/templates/dbl/reports/show.html
+++ b/src/templates/dbl/reports/show.html
@@ -16,49 +16,29 @@
                        <div class="container">
                                <div class="columns is-centered">
                                        <div class="column is-half">
+                                               {% set args = {
+                                                       "name" : report.name,
+                                                       "list" : list,
+                                               } %}
+
                                                <h4 class="title is-4">
-                                                       {{ _("Report") }}
+                                                       {% if report.block %}
+                                                               {{ _("Block %(name)s on %(list)s") % args }}
+                                                       {% else %}
+                                                               {{ _("Allow %(name)s on %(list)s") % args }}
+                                                       {% end %}
                                                </h4>
 
                                                <h6 class="subtitle is-6">
-                                                       {{ _("Submitted %s") % \
-                                                               locale.format_date(report.reported_at, shorter=True) }}
+                                                       {{ _("Submitted %(when)s by %(who)s") % {
+                                                               "when" : locale.format_date(report.reported_at, shorter=True),
+                                                               "who"  : reporter,
+                                                       } }}
                                                </h6>
 
-                                               <nav class="panel">
-                                                       <div class="panel-block is-block p-4">
-                                                               {% set args = {
-                                                                       "name" : report.name,
-                                                                       "list" : list,
-                                                               } %}
-
-                                                               {% if report.block %}
-                                                                       <h5 class="title is-5">
-                                                                               {{ _("%(name)s should be BLOCKED on %(list)s") % args }}
-                                                                       </h5>
-                                                               {% else %}
-                                                                       <h5 class="title is-5">
-                                                                               {{ _("%(name)s should be ALLOWED on %(list)s") % args }}
-                                                                       </h5>
-                                                               {% end %}
-
-                                                               <div class="columns is-vcentered">
-                                                                       <div class="column is-2 is-flex is-justify-content-center">
-                                                                               <a href="/users/{{ report.reported_by }}">
-                                                                                       {% if reporter %}
-                                                                                               <figure class="image is-64x64">
-                                                                                                       <img class="is-rounded" src="{{ reporter.avatar_url(size=128) }}">
-                                                                                               </figure>
-                                                                                       {% else %}
-                                                                                               <i class="fas fa-user" aria-hidden="true"></i>
-                                                                                       {% end %}
-                                                                               </a>
-                                                                       </div>
-                                                               </div>
-                                                       </div>
-
-                                                       {# Status #}
-                                                       {% if status %}
+                                               {# Status #}
+                                               {% if status %}
+                                                       <nav class="panel">
                                                                {% for l, s in sorted(status.items()) %}
                                                                        <a class="panel-block" href="/dbl/lists/{{ l.slug }}/domains/{{ s.domain }}">
                                                                                <span class="panel-icon">
@@ -82,8 +62,8 @@
                                                                                {% end %}
                                                                        </a>
                                                                {% end %}
-                                                       {% end %}
-                                               </nav>
+                                                       </nav>
+                                               {% end %}
 
                                                {# Comments #}
                                                {% if comments %}