Drop newsletter and add sign up button

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index bed8f9d6cfc2b1699a2768372497b5f788658881..c9610d3be729a3db544c69825c24feb1a1bfe123 100644 (file)
--- 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 b3453a3fe8cef9567d06a996ede1249c53caa26a..7f3ebfb08cb5253b1ea58469302fbad8a061f61a 100644 (file)
--- 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 (file)
index 126eff7..0000000
--- 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 (file)
index 6db5fc0..0000000
--- 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 6d6acf1138fbbd61693508bb76be44a64b8b6f6e..7408496bf88e95dad571234ea8a402d5c8f6a1f3 100644 (file)
--- 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 (file)
index 0eb7875..0000000
--- 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)