From e1ede067a91d1a6c9a8ce79e9af7919487a89cf9 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Nov 2019 15:44:06 +0000
Subject: [PATCH] Drop newsletter and add sign up button

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am                              |  7 -------
 src/templates/base.html                  | 17 ++++++-----------
 src/templates/newsletter/subscribe.txt   |  4 ----
 src/templates/newsletter/subscribed.html | 19 -------------------
 src/web/__init__.py                      |  4 ----
 src/web/newsletter.py                    | 20 --------------------
 6 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 src/templates/newsletter/subscribe.txt
 delete mode 100644 src/templates/newsletter/subscribed.html
 delete mode 100644 src/web/newsletter.py

diff --git a/Makefile.am b/Makefile.am
index bed8f9d6..c9610d3b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,6 @@ web_PYTHON = \
 	src/web/iuse.py \
 	src/web/location.py \
 	src/web/mirrors.py \
-	src/web/newsletter.py \
 	src/web/nopaste.py \
 	src/web/people.py \
 	src/web/ui_modules.py \
@@ -247,12 +246,6 @@ templates_netboot_DATA = \
 
 templates_netbootdir = $(templatesdir)/netboot
 
-templates_newsletter_DATA = \
-	src/templates/newsletter/subscribe.txt \
-	src/templates/newsletter/subscribed.html
-
-templates_newsletterdir = $(templatesdir)/newsletter
-
 templates_nopaste_DATA = \
 	src/templates/nopaste/create.html \
 	src/templates/nopaste/view.html
diff --git a/src/templates/base.html b/src/templates/base.html
index b3453a3f..7f3ebfb0 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -286,18 +286,13 @@
 							<div class="container pb-3">
 								<div class="row mb-6 justify-content-between">
 									<div class="col-12 col-lg-4 mb-4">
-										<h6>{{ _("Subscribe to our Newsletter") }}</h6>
-
-										<form method="POST" action="https://{{ "dev.ipfire.org" if hostname == "dev.ipfire.org" else "www.ipfire.org" }}/newsletter/subscribe">
-											{% raw xsrf_form_html() %}
-
-											<label class="sr-only" for="email">{{ _("Email Address") }}</label>
-
-											<input type="email" class="form-control mb-2 mr-sm-2" id="email" name="email"
-												placeholder="{{ _("Your Email Address") }}" required>
+										<a class="btn btn-primary btn-block mb-3" href="https://people.ipfire.org/register">
+											{{ _("Join Us To Stay Up To Date") }}
+										</a>
 
-											<button type="submit" class="btn btn-primary btn-block mb-2">{{ _("Subscribe") }}</button>
-										</form>
+										<p>
+											{{ _("Sign up to our community to take part and get the latest news") }}
+										</p>
 									</div>
 
 									<div class="col-12 col-lg-3 mb-4 small">
diff --git a/src/templates/newsletter/subscribe.txt b/src/templates/newsletter/subscribe.txt
deleted file mode 100644
index 126eff77..00000000
--- a/src/templates/newsletter/subscribe.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-To: ipfire-announce-join@lists.ipfire.org
-From: {{ address }}
-Sender: no-reply@ipfire.org
-Subject: Subscribe
diff --git a/src/templates/newsletter/subscribed.html b/src/templates/newsletter/subscribed.html
deleted file mode 100644
index 6db5fc07..00000000
--- a/src/templates/newsletter/subscribed.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Successfully subscribed") }}{% end block %}
-
-{% block content %}
-	<div class="row justify-content-center my-5">
-		<div class="col-12 col-md-6">
-			<div class="card bg-success text-white p-md-5">
-				<div class="card-body text-center">
-					<span class="fas fa-check fa-5x my-4"></span>
-
-					<p class="lead">
-						{{ _("You have been successfully subscribed to our newsletter") }}
-					</p>
-				</div>
-			</div>
-		</div>
-	</div>
-{% end block %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 6d6acf11..7408496b 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -23,7 +23,6 @@ from . import fireinfo
 from . import iuse
 from . import location
 from . import mirrors
-from . import newsletter
 from . import nopaste
 from . import people
 from . import ui_modules
@@ -130,9 +129,6 @@ class Application(tornado.web.Application):
 			(r"/donate/error", donate.ErrorHandler),
 			(r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }),
 
-			# Newsletter
-			(r"/newsletter/subscribe", newsletter.SubscribeHandler),
-
 			# RSS feed
 			(r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
 
diff --git a/src/web/newsletter.py b/src/web/newsletter.py
deleted file mode 100644
index 0eb7875f..00000000
--- a/src/web/newsletter.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python3
-
-import email.mime.text
-import logging
-import tornado.process
-
-from . import base
-
-class SubscribeHandler(base.BaseHandler):
-	@base.ratelimit(minutes=15, requests=5)
-	def post(self):
-		address = self.get_argument("email")
-
-		with self.db.transaction():
-			self.backend.messages.send_template(
-				"newsletter/subscribe", address=address)
-
-		logging.info("%s has subscribed to the newsletter" % address)
-
-		self.render("newsletter/subscribed.html", address=address)
-- 
2.47.3