From 3a794fecbfd99af8d1d1de4eea50fbffa3ec74ea Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 14 Apr 2024 15:41:47 +0100
Subject: [PATCH] Add contact and donate links to the footer

---
 app/flatpages/about.md          |  1 +
 app/templates/base.html         |  4 +++-
 app/templates/donate/index.html | 13 ++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/flatpages/about.md b/app/flatpages/about.md
index 4fe013f4..d1937f5e 100644
--- a/app/flatpages/about.md
+++ b/app/flatpages/about.md
@@ -41,3 +41,4 @@ You can donate to rubenwardy to cover ContentDB's costs and support future devel
 For more information about what the cost of ContentDB and what rubenwardy does, see his donation page:
 
 <a href="https://rubenwardy.com/donate/" class="btn btn-primary me-1">Donate</a>
+<a href="/donate/" class="btn btn-secondary">Support Creators</a>
diff --git a/app/templates/base.html b/app/templates/base.html
index 4cdcbb8c..422bcb3c 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -244,8 +244,10 @@
 		<ul class="list-inline my-1">
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='help') }}">{{ _("Help") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='about') }}">{{ _("About") }}</a></li>
+			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='help/contact_us') }}">{{ _("Contact Us") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='rules') }}">{{ _("Rules") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("Policy and Guidance") }}</a></li>
+			<li class="list-inline-item"><a href="{{ url_for('donate.donate') }}#contentdb">{{ _("Donate") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='help/api') }}">{{ _("API") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('flatpage', path='privacy_policy') }}">{{ _("Privacy Policy") }}</a></li>
 			{% if request.endpoint != "flatpage" and request.endpoint != "report.report" %}
@@ -254,7 +256,7 @@
 			<li class="list-inline-item"><a href="{{ url_for('users.list_all') }}">{{ _("User List") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('threads.list_all') }}">{{ _("Threads") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('collections.list_all') }}">{{ _("Collections") }}</a></li>
-			<li class="list-inline-item"><a href="{{ url_for('donate.donate') }}">{{ _("Support Packages") }}</a></li>
+			<li class="list-inline-item"><a href="{{ url_for('donate.donate') }}">{{ _("Support Creators") }}</a></li>
 			<li class="list-inline-item"><a href="{{ url_for('translate.translate') }}">{{ _("Translate Packages") }}</a></li>
 			<li class="list-inline-item"><a href="https://github.com/minetest/contentdb">{{ _("Source Code") }}</a></li>
 		</ul>
diff --git a/app/templates/donate/index.html b/app/templates/donate/index.html
index e9155aa0..75e4a535 100644
--- a/app/templates/donate/index.html
+++ b/app/templates/donate/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block title -%}
-	{{ _("Support packages") }}
+	{{ _("Support Creators") }}
 {%- endblock %}
 
 {% block description -%}
@@ -59,6 +59,17 @@
 		{{ self.description() }}
 	</p>
 
+	<h2 id="contentdb">{{ _("Support ContentDB") }}</h2>
+	<p>
+		{{ _("You can donate to rubenwardy to cover ContentDB's costs and support future development.") }}
+	</p>
+	<p>
+		{{ _("For more information about what the cost of ContentDB and what rubenwardy does, see his donation page:") }}
+	</p>
+	<p>
+		<a href="https://rubenwardy.com/donate/" class="btn btn-primary me-1">{{ _("Donate") }}</a>
+	</p>
+
 	<h2>{{ _("Based on your reviews / favorites") }}</h2>
 	{% if reviewed_packages %}
 		{{ render_packages(reviewed_packages) }}