From 7ac985d48ff9306498362b121244c2cc08647b5c Mon Sep 17 00:00:00 2001
From: akpu1 <akpu1@inventati.org>
Date: Sat, 18 Jun 2016 15:09:49 +1000
Subject: Remove banners.json, add dist.json

dist.json replaces dist{...} and encompasses banners.json
---
 templates/banners.json | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 templates/banners.json

(limited to 'templates')

diff --git a/templates/banners.json b/templates/banners.json
deleted file mode 100644
index 6cefb70..0000000
--- a/templates/banners.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-		"banners/malware_scans.swig",
-		"banners/donate.swig"
-]
-- 
cgit v1.2.3


From 3f696ed6f463d5182915ea5c2c59275da1df4654 Mon Sep 17 00:00:00 2001
From: akpu1 <akpu1@inventati.org>
Date: Sat, 18 Jun 2016 15:11:40 +1000
Subject: Made donation banner more general

Made language more general
Replaced static links with vars
Made showing button conditonal on having matching info
---
 templates/banners/donate.swig    | 17 -----------------
 templates/banners/donations.swig | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 templates/banners/donate.swig
 create mode 100644 templates/banners/donations.swig

(limited to 'templates')

diff --git a/templates/banners/donate.swig b/templates/banners/donate.swig
deleted file mode 100644
index dcd7f7c..0000000
--- a/templates/banners/donate.swig
+++ /dev/null
@@ -1,17 +0,0 @@
-<p class="alert alert-info">
-	<strong>pomf.se is a free service, but our hosting bill isn't</strong> &mdash; we need almost $100 a month for that. Donations help keep pomf.se free, online, and fast. Everything (after fees) goes to the hosting bill.
-	<span class="donate-btns">
-		<a class="donate-btn donate-paypal" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=BHUVEZY96YZ6N" target="_BLANK">
-			<span class="icon icon-paypal"></span>
-			PayPal
-		</a>
-		<a class="donate-btn donate-bitcoin" href="bitcoin:1CrbCGSTFM5ccmjFoU4jRSQod44Ttu8nHY?label=pomf.se&amp;message=Hosting%20Bills" target="_BLANK">
-			<span class="icon icon-bitcoin"></span>
-			Bitcoin
-		</a>
-		<a class="donate-btn donate-flattr" href="https://flattr.com/submit/auto?user_id=neku&amp;url=http://pomf.se" target="_BLANK">
-			<span class="icon icon-flattr"></span>
-			Flattr
-		</a>
-	</span>
-</p>
diff --git a/templates/banners/donations.swig b/templates/banners/donations.swig
new file mode 100644
index 0000000..884f4ba
--- /dev/null
+++ b/templates/banners/donations.swig
@@ -0,0 +1,23 @@
+<p class="alert alert-info">
+	<strong>{{siteName}} is free to use, but our hosting costs are far from it</strong> &mdash; donations are what keep {{siteName}} alive, free, and fast.
+	<span class="donate-btns">
+		{% if paypalUrl != '' %}
+			<a class="donate-btn donate-paypal" href="{{paypalUrl}}" target="_BLANK">
+				<span class="icon icon-paypal"></span>
+				PayPal
+			</a>
+		{% endif %}
+		{% if bitcoinAddress != '' %}
+			<a class="donate-btn donate-bitcoin" href="bitcoin:{{bitcoinAddress}}?label={{siteName}}&amp;message=Hosting%20Costs" target="_BLANK">
+				<span class="icon icon-bitcoin"></span>
+				Bitcoin
+			</a>
+		{% endif %}
+		{% if flattrUrl != '' %}
+			<a class="donate-btn donate-flattr" href="{{flattrUrl}}" target="_BLANK">
+				<span class="icon icon-flattr"></span>
+				Flattr
+			</a>
+		{% endif %}
+	</span>
+</p>
-- 
cgit v1.2.3