From fbb6368caf7c0d2bc034e8b9a08e738e81a48f0a Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Tue, 30 Nov 2021 20:21:41 +1100
Subject: [PATCH] undo footer component

---
 bookwyrm/templates/components/footer.html | 49 -----------------------
 bookwyrm/templates/layout.html            | 46 ++++++++++++++++++++-
 2 files changed, 45 insertions(+), 50 deletions(-)
 delete mode 100644 bookwyrm/templates/components/footer.html

diff --git a/bookwyrm/templates/components/footer.html b/bookwyrm/templates/components/footer.html
deleted file mode 100644
index df11e9d55..000000000
--- a/bookwyrm/templates/components/footer.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% load layout %}
-{% load i18n %}
-{% load static %}
-
-<footer class="footer">
-    <div class="container">
-        <div class="columns">
-            <div class="column is-one-fifth">
-                <p>
-                <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
-                </p>
-                {% if site.admin_email %}
-                <p>
-                    <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
-                </p>
-                {% endif %}
-                <p>
-                    <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
-                </p>
-            </div>
-            <div class="column content is-two-fifth">
-                {% if site.support_link %}
-                <p>
-                    <span class="icon icon-heart"></span>
-                    {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
-                </p>
-                {% endif %}
-                <p>
-                {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
-                </p>
-            </div>
-            {% if site.footer_item %}
-            <div class="column">
-                <p>{{ site.footer_item|safe }}</p>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</footer>
-
-<script>
-    var csrf_token = '{{ csrf_token }}';
-</script>
-
-<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
-
-{% block scripts %}{% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 50a7ae6d1..bc85e678e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -222,7 +222,51 @@
     <p id="status-error-message" class="live-message notification is-danger p-3 pr-5 pl-5 is-hidden">{% trans "Error posting status" %}</p>
 </div>
 
-{% include 'components/footer.html' %}
+<footer class="footer">
+    <div class="container">
+        <div class="columns">
+            <div class="column is-one-fifth">
+                <p>
+                <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
+                </p>
+                {% if site.admin_email %}
+                <p>
+                    <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
+                </p>
+                {% endif %}
+                <p>
+                    <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
+                </p>
+            </div>
+            <div class="column content is-two-fifth">
+                {% if site.support_link %}
+                <p>
+                    <span class="icon icon-heart"></span>
+                    {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
+                </p>
+                {% endif %}
+                <p>
+                {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
+                </p>
+            </div>
+            {% if site.footer_item %}
+            <div class="column">
+                <p>{{ site.footer_item|safe }}</p>
+            </div>
+            {% endif %}
+        </div>
+    </div>
+</footer>
+
+<script>
+    var csrf_token = '{{ csrf_token }}';
+</script>
+
+<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
+
+{% block scripts %}{% endblock %}
 
 </body>
 </html>