From 58aeb72afa6f28ead18888d47438e0704a424e23 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 17:23:48 +0200
Subject: [PATCH] Move card footer container inside the card-footer component

---
 bookwyrm/templates/components/card.html       |  6 +--
 .../templates/moderation/report_preview.html  | 38 ++++++++++---------
 bookwyrm/templates/snippets/goal_card.html    | 12 +++---
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/templates/components/card.html b/bookwyrm/templates/components/card.html
index f1104893a..7dc3e1b04 100644
--- a/bookwyrm/templates/components/card.html
+++ b/bookwyrm/templates/components/card.html
@@ -11,10 +11,8 @@
     </section>
     {% endif %}
 
-    <footer class="card-footer has-background-white-bis">
-        {% block card-footer %}
-        {% endblock %}
-    </footer>
+    {% block card-footer %}
+    {% endblock %}
 
     {% block card-bonus %}
     {% endblock %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 363783d50..936c04b8f 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -16,22 +16,24 @@
 {% endblock %}
 
 {% block card-footer %}
-<div class="card-footer-item">
-    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
-</div>
-<div class="card-footer-item">
-    {{ report.created_date | naturaltime }}
-</div>
-<div class="card-footer-item">
-    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
-        {% csrf_token %}
-        <button class="button" type="submit">
-            {% if report.resolved %}
-            {% trans "Re-open" %}
-            {% else %}
-            {% trans "Resolve" %}
-            {% endif %}
-        </button>
-    </form>
-</div>
+<footer class="card-footer has-background-white-bis">
+    <div class="card-footer-item">
+        <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+    </div>
+    <div class="card-footer-item">
+        {{ report.created_date | naturaltime }}
+    </div>
+    <div class="card-footer-item">
+        <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+            {% csrf_token %}
+            <button class="button" type="submit">
+                {% if report.resolved %}
+                {% trans "Re-open" %}
+                {% else %}
+                {% trans "Resolve" %}
+                {% endif %}
+            </button>
+        </form>
+    </div>
+</footer>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 329fea542..5014b81cf 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -17,9 +17,11 @@
 {% endblock %}
 
 {% block card-footer %}
-<form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
-    {% csrf_token %}
-    <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
-    <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
-</form>
+<footer class="card-footer has-background-white-bis">
+    <form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
+        {% csrf_token %}
+        <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
+        <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
+    </form>
+</footer>
 {% endblock %}