From 33209aed7c3e858d95576bdcfefa17c3f5d7597b Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Wed, 5 Feb 2020 16:18:53 -0500
Subject: migrated newsletter templates and updated mailing model

---
 design/templates/lttr/confirm_activate.html        | 17 ---------
 design/templates/lttr/message/subscribe.html       | 24 -------------
 design/templates/lttr/message/subscribe.txt        |  9 -----
 .../templates/lttr/message/subscribe_subject.txt   |  1 -
 design/templates/lttr/message/unsubscribe.html     | 19 ----------
 design/templates/lttr/message/unsubscribe.txt      |  9 -----
 .../templates/lttr/message/unsubscribe_subject.txt |  1 -
 design/templates/lttr/subscribed.html              | 17 ---------
 design/templates/lttr/subscriber_form.html         | 39 --------------------
 design/templates/newsletter/common.html            | 15 ++++++++
 design/templates/newsletter/message/message.html   | 32 +++++++++++++++++
 design/templates/newsletter/message/message.txt    | 15 ++++++++
 .../newsletter/message/message_subject.txt         |  1 +
 design/templates/newsletter/message/subscribe.html | 20 +++++++++++
 design/templates/newsletter/message/subscribe.txt  |  9 +++++
 .../newsletter/message/subscribe_subject.txt       |  1 +
 .../templates/newsletter/message/unsubscribe.html  | 19 ++++++++++
 .../templates/newsletter/message/unsubscribe.txt   |  9 +++++
 .../newsletter/message/unsubscribe_subject.txt     |  1 +
 design/templates/newsletter/message/update.html    | 19 ++++++++++
 design/templates/newsletter/message/update.txt     |  9 +++++
 .../newsletter/message/update_subject.txt          |  1 +
 design/templates/newsletter/newsletter_detail.html | 30 ++++++++++++++++
 design/templates/newsletter/newsletter_list.html   | 41 ++++++++++++++++++++++
 .../templates/newsletter/submission_archive.html   | 21 +++++++++++
 .../newsletter/subscription_activate.html          | 15 ++++++++
 .../newsletter/subscription_subscribe.html         | 25 +++++++++++++
 .../subscription_subscribe_activated.html          | 11 ++++++
 .../subscription_subscribe_email_sent.html         | 11 ++++++
 .../newsletter/subscription_subscribe_user.html    | 25 +++++++++++++
 .../newsletter/subscription_unsubscribe.html       | 25 +++++++++++++
 .../subscription_unsubscribe_activated.html        | 11 ++++++
 .../subscription_unsubscribe_email_sent.html       | 11 ++++++
 .../newsletter/subscription_unsubscribe_user.html  | 27 ++++++++++++++
 .../templates/newsletter/subscription_update.html  | 25 +++++++++++++
 .../newsletter/subscription_update_activated.html  | 11 ++++++
 .../newsletter/subscription_update_email_sent.html | 11 ++++++
 37 files changed, 451 insertions(+), 136 deletions(-)
 delete mode 100644 design/templates/lttr/confirm_activate.html
 delete mode 100644 design/templates/lttr/message/subscribe.html
 delete mode 100644 design/templates/lttr/message/subscribe.txt
 delete mode 100644 design/templates/lttr/message/subscribe_subject.txt
 delete mode 100644 design/templates/lttr/message/unsubscribe.html
 delete mode 100644 design/templates/lttr/message/unsubscribe.txt
 delete mode 100644 design/templates/lttr/message/unsubscribe_subject.txt
 delete mode 100644 design/templates/lttr/subscribed.html
 delete mode 100644 design/templates/lttr/subscriber_form.html
 create mode 100644 design/templates/newsletter/common.html
 create mode 100644 design/templates/newsletter/message/message.html
 create mode 100644 design/templates/newsletter/message/message.txt
 create mode 100644 design/templates/newsletter/message/message_subject.txt
 create mode 100644 design/templates/newsletter/message/subscribe.html
 create mode 100644 design/templates/newsletter/message/subscribe.txt
 create mode 100644 design/templates/newsletter/message/subscribe_subject.txt
 create mode 100644 design/templates/newsletter/message/unsubscribe.html
 create mode 100644 design/templates/newsletter/message/unsubscribe.txt
 create mode 100644 design/templates/newsletter/message/unsubscribe_subject.txt
 create mode 100644 design/templates/newsletter/message/update.html
 create mode 100644 design/templates/newsletter/message/update.txt
 create mode 100644 design/templates/newsletter/message/update_subject.txt
 create mode 100644 design/templates/newsletter/newsletter_detail.html
 create mode 100644 design/templates/newsletter/newsletter_list.html
 create mode 100644 design/templates/newsletter/submission_archive.html
 create mode 100644 design/templates/newsletter/subscription_activate.html
 create mode 100644 design/templates/newsletter/subscription_subscribe.html
 create mode 100644 design/templates/newsletter/subscription_subscribe_activated.html
 create mode 100644 design/templates/newsletter/subscription_subscribe_email_sent.html
 create mode 100644 design/templates/newsletter/subscription_subscribe_user.html
 create mode 100644 design/templates/newsletter/subscription_unsubscribe.html
 create mode 100644 design/templates/newsletter/subscription_unsubscribe_activated.html
 create mode 100644 design/templates/newsletter/subscription_unsubscribe_email_sent.html
 create mode 100644 design/templates/newsletter/subscription_unsubscribe_user.html
 create mode 100644 design/templates/newsletter/subscription_update.html
 create mode 100644 design/templates/newsletter/subscription_update_activated.html
 create mode 100644 design/templates/newsletter/subscription_update_email_sent.html

(limited to 'design')

diff --git a/design/templates/lttr/confirm_activate.html b/design/templates/lttr/confirm_activate.html
deleted file mode 100644
index d67ee1b..0000000
--- a/design/templates/lttr/confirm_activate.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-
-{% block pagetitle %}Luxagraf | Friends of a Long Year {% endblock %}
-{% block metadescription %}An infrequesnt mailing list about travel, photography, tools, walking, the natural world and other ephemera.{% endblock %}
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-    <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-    <li>Lttr</li>
-    </ul>
-    <main role="main" id="essay-archive" class="essay-archive archive-list">
-        <div class="essay-intro">
-            <h2>You're confirmed, thanks for joining.</h2>
-            <p>If you'd like you can <a href="/lttr/">visit the archives</a> of past mailings.</p>
-        </div>
-    </main>
-{%endblock%}
diff --git a/design/templates/lttr/message/subscribe.html b/design/templates/lttr/message/subscribe.html
deleted file mode 100644
index 3ed34db..0000000
--- a/design/templates/lttr/message/subscribe.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% load i18n %}<!DOCTYPE html>
-
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>{% blocktrans with title=newsletter.title %}Subscription to {{ title }}{% endblocktrans %}
-</title>
-</head>
-<body>
-{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}
-
-<p>Hola-</p>
-
-<p>Someone, hopefully you, asked to subscribe to {{ title }}, a luxagraf.net letter.</p>
-
-<p>To confirm your subscription, please follow this activation link:
-</p>
-
-https://{{ domain }}{{ url }}
-{% endblocktrans %}
-<p>cheers<br />
-Scott</p>
-</body>
-</html>
diff --git a/design/templates/lttr/message/subscribe.txt b/design/templates/lttr/message/subscribe.txt
deleted file mode 100644
index 2af5378..0000000
--- a/design/templates/lttr/message/subscribe.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Hola-
-
-Someone, hopefully you, asked to subscribe to {{ newsletter.title }}, a luxagraf.net letter.
-
-If you would like to confirm your subscription, please follow this activation link:
-https://{{ site.domain }}{{ subscription.subscribe_activate_url }}
-
-cheers
-Scott
diff --git a/design/templates/lttr/message/subscribe_subject.txt b/design/templates/lttr/message/subscribe_subject.txt
deleted file mode 100644
index f4660e0..0000000
--- a/design/templates/lttr/message/subscribe_subject.txt
+++ /dev/null
@@ -1 +0,0 @@
-Confirm Your Subscription to {{newsletter.title}}
diff --git a/design/templates/lttr/message/unsubscribe.html b/design/templates/lttr/message/unsubscribe.html
deleted file mode 100644
index 4b1a86b..0000000
--- a/design/templates/lttr/message/unsubscribe.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% load i18n %}<!DOCTYPE html>
-
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>{% blocktrans with title=newsletter.title %}Unsubscription from {{ title }}{% endblocktrans %}</title>
-</head>
-<body>
-{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }},
-
-you, or someone in your name requested unsubscription from {{ title }}.
-
-If you would like to confirm your unsubscription, please follow this activation link:
-http://{{ domain }}{{ url }}
-
-Kind regards,{% endblocktrans %}
-{{ newsletter.sender }}
-</body>
-</html>
diff --git a/design/templates/lttr/message/unsubscribe.txt b/design/templates/lttr/message/unsubscribe.txt
deleted file mode 100644
index ab31fa5..0000000
--- a/design/templates/lttr/message/unsubscribe.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }},
-
-you, or someone in your name requested unsubscription from {{ title }}.
-
-If you would like to confirm your unsubscription, please follow this activation link:
-http://{{ domain }}{{ url }}
-
-Kind regards,{% endblocktrans %}
-{{ newsletter.sender }}
diff --git a/design/templates/lttr/message/unsubscribe_subject.txt b/design/templates/lttr/message/unsubscribe_subject.txt
deleted file mode 100644
index 49c68ef..0000000
--- a/design/templates/lttr/message/unsubscribe_subject.txt
+++ /dev/null
@@ -1 +0,0 @@
-{% load i18n %}{{ newsletter.title }} - {% trans "Confirm unsubscription" %}
diff --git a/design/templates/lttr/subscribed.html b/design/templates/lttr/subscribed.html
deleted file mode 100644
index 18ad151..0000000
--- a/design/templates/lttr/subscribed.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-
-{% block pagetitle %}Luxagraf | Friends of a Long Year {% endblock %}
-{% block metadescription %}An infrequesnt mailing list about travel, photography, tools, walking, the natural world and other ephemera.{% endblock %}
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-    <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-    <li>Lttr</li>
-    </ul>
-    <main role="main" id="essay-archive" class="essay-archive archive-list">
-        <div class="essay-intro">
-            <h2>Thanks for joining.</h2>
-            <p>Check your email for a link to confirm your subscription</p>
-        </div>
-    </main>
-{%endblock%}
diff --git a/design/templates/lttr/subscriber_form.html b/design/templates/lttr/subscriber_form.html
deleted file mode 100644
index 83e1e28..0000000
--- a/design/templates/lttr/subscriber_form.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-
-{% block pagetitle %}Luxagraf | Friends of a Long Year {% endblock %}
-{% block metadescription %}An infrequesnt mailing list about travel, photography, tools, walking, the natural world and other ephemera.{% endblock %}
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-    <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-    <li>Lttr</li>
-    </ul>
-    <main role="main" id="essay-archive" class="essay-archive archive-list">
-        <div class="essay-intro">
-            <h1 class="list-hed">Join the <em>Friends of a Long Year</em>.</h1>
-            <form action="" method="post" class="generic-form flex newsletter-subscribe">{% csrf_token %}
-                {% for field in form %}
-                <fieldset>
-                    {{field.label_tag}}
-                    {{field}}
-                </fieldset>
-                {% if forloop.last %}<input type="submit" name="post" class="btn" value="Subscribe" />{%endif%}
-            </form>
-            <small class="alert">{% if field.errors %}{{field.errors}}{% endif %}</small>
-                {%endfor%}
-            <h2 class="subhead">Say what? </h2>
-            <p><em>Friends of a Long Year</em> is an infrequent mailing that will keep you up-to-date with luxagraf and offer some thoughts on topics like travel, photography, the natural world, tools, walking and other ephemera. It comes about twice a month, sometimes less, sometimes more. Unsubscribing is easy. It's all self-hosted, secure, and <a href="/privacy" title="My privacy policy">private</a>.</p>
-            <p>The name comes from the great early 20th century explorer and desert rat, Mary Hunter Austin, whose collected essays, <a href="https://archive.org/details/lostbordersillu00brotgoog/page/n8"><cite>Lost Borders</cite></a> is dedicated to the "Friends of a Long Year". This somewhat inscrutable dedication grabbed me, and seemed like the perfect name for this mailing list.</p>
-        </div>
-        <h3 class="list-title">Letters</h3>
-    <ul>{% for object in object_list %}
-        <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
-            <span class="date dt-published">{{object.pub_date|date:"F Y"}}</span>
-            <a href="{{object.get_absolute_url}}">
-            <h2>{{object.title|safe|smartypants|widont}}</h2>
-            <p class="p-summary">{% if object.sub_title %}{{object.sub_title|safe|smartypants}}{%else%}{{object.metadescription}}{%endif%}</p>
-            </a>
-        </li>
-        {%endfor%}</ul>
-    </main>
-{%endblock%}
diff --git a/design/templates/newsletter/common.html b/design/templates/newsletter/common.html
new file mode 100644
index 0000000..20ac822
--- /dev/null
+++ b/design/templates/newsletter/common.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>{% block title %}{% trans "Newsletter" %}{% endblock title %}</title>
+        {% block header %}
+        {% endblock header %}
+    </head>
+
+    <body>
+        {% block body %}
+        {% endblock body %}
+    </body>
+</html>
diff --git a/design/templates/newsletter/message/message.html b/design/templates/newsletter/message/message.html
new file mode 100644
index 0000000..8929b67
--- /dev/null
+++ b/design/templates/newsletter/message/message.html
@@ -0,0 +1,32 @@
+{% load thumbnail i18n %}<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8">
+	<title>{{ newsletter.title }}: {{ message.title }}</title>
+</head>
+<body>
+    <h1>{{ newsletter.title }}</h1>
+    <h2>{{ message.title }}</h2>
+    {% for article in message.articles.all %}
+        <h3>{{ article.title }}</h3>
+        
+        {% thumbnail article.image "200x200" as image %}
+            <img src="http://{{ site.domain }}{{ image.url }}" width="{{ image.width }}" height="{{ image.height }}">
+        {% endthumbnail %}
+
+        <div>{{ article.text|safe }}</div>
+        
+        {% if article.url %}
+            <div><a href="{{ article.url }}">{% trans "Read more" %}</a></div>
+        {% endif %}
+    {% endfor %}
+    
+    <ul>
+        {% if submission.publish %}
+        <li><a href="http://{{ site.domain }}{{ submission.get_absolute_url }}">{% trans "Read message online" %}</a></li>
+        {% endif %}
+        <li><a href="http://{{ site.domain }}{% url "newsletter_unsubscribe_request" newsletter.slug %}">{% trans "Unsubscribe" %}</a></li>
+    </ul>
+</body>
+</html>
diff --git a/design/templates/newsletter/message/message.txt b/design/templates/newsletter/message/message.txt
new file mode 100644
index 0000000..ffaab98
--- /dev/null
+++ b/design/templates/newsletter/message/message.txt
@@ -0,0 +1,15 @@
+{% load i18n %}++++++++++++++++++++
+
+{{ newsletter.title }}: {{ message.title }}
+
+++++++++++++++++++++
+
+{% for article in message.articles.all %}
+{{ article.title }}
+{{ article.text|striptags|safe }}
+
+{% endfor %}
+
+++++++++++++++++++++
+
+{% trans "Unsubscribe:" %} http://{{ site }}{% url "newsletter_unsubscribe_request" newsletter.slug %}
diff --git a/design/templates/newsletter/message/message_subject.txt b/design/templates/newsletter/message/message_subject.txt
new file mode 100644
index 0000000..00aa450
--- /dev/null
+++ b/design/templates/newsletter/message/message_subject.txt
@@ -0,0 +1 @@
+{{ newsletter.title }} - {{ message.title }}
\ No newline at end of file
diff --git a/design/templates/newsletter/message/subscribe.html b/design/templates/newsletter/message/subscribe.html
new file mode 100644
index 0000000..088a3d0
--- /dev/null
+++ b/design/templates/newsletter/message/subscribe.html
@@ -0,0 +1,20 @@
+{% load i18n %}<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>{% blocktrans with title=newsletter.title %}Subscription to {{ title }}{% endblocktrans %}
+</title>
+</head>
+<body>
+{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested a subscription to {{ title }}.
+
+If you would like to confirm your subscription, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
+</body>
+</html>
diff --git a/design/templates/newsletter/message/subscribe.txt b/design/templates/newsletter/message/subscribe.txt
new file mode 100644
index 0000000..1f334f2
--- /dev/null
+++ b/design/templates/newsletter/message/subscribe.txt
@@ -0,0 +1,9 @@
+{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested a subscription to {{ title }}.
+
+If you would like to confirm your subscription, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
diff --git a/design/templates/newsletter/message/subscribe_subject.txt b/design/templates/newsletter/message/subscribe_subject.txt
new file mode 100644
index 0000000..f61b228
--- /dev/null
+++ b/design/templates/newsletter/message/subscribe_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{{ newsletter.title }} - {% trans "Confirm subscription" %}
diff --git a/design/templates/newsletter/message/unsubscribe.html b/design/templates/newsletter/message/unsubscribe.html
new file mode 100644
index 0000000..4b1a86b
--- /dev/null
+++ b/design/templates/newsletter/message/unsubscribe.html
@@ -0,0 +1,19 @@
+{% load i18n %}<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>{% blocktrans with title=newsletter.title %}Unsubscription from {{ title }}{% endblocktrans %}</title>
+</head>
+<body>
+{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested unsubscription from {{ title }}.
+
+If you would like to confirm your unsubscription, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
+</body>
+</html>
diff --git a/design/templates/newsletter/message/unsubscribe.txt b/design/templates/newsletter/message/unsubscribe.txt
new file mode 100644
index 0000000..ab31fa5
--- /dev/null
+++ b/design/templates/newsletter/message/unsubscribe.txt
@@ -0,0 +1,9 @@
+{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.unsubscribe_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested unsubscription from {{ title }}.
+
+If you would like to confirm your unsubscription, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
diff --git a/design/templates/newsletter/message/unsubscribe_subject.txt b/design/templates/newsletter/message/unsubscribe_subject.txt
new file mode 100644
index 0000000..49c68ef
--- /dev/null
+++ b/design/templates/newsletter/message/unsubscribe_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{{ newsletter.title }} - {% trans "Confirm unsubscription" %}
diff --git a/design/templates/newsletter/message/update.html b/design/templates/newsletter/message/update.html
new file mode 100644
index 0000000..e46235d
--- /dev/null
+++ b/design/templates/newsletter/message/update.html
@@ -0,0 +1,19 @@
+{% load i18n %}<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>{% blocktrans with title=newsletter.title %}Update of subscription to {{ title }}{% endblocktrans %}</title>
+</head>
+<body>
+{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested updating your personal information for {{ title }}.
+
+To make changes to your information in our database, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
+</body>
+</html>
diff --git a/design/templates/newsletter/message/update.txt b/design/templates/newsletter/message/update.txt
new file mode 100644
index 0000000..aa50b19
--- /dev/null
+++ b/design/templates/newsletter/message/update.txt
@@ -0,0 +1,9 @@
+{% load i18n %}{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.update_activate_url %}Dear {{ name }},
+
+you, or someone in your name requested updating your personal information for {{ title }}.
+
+To make changes to your information in our database, please follow this activation link:
+http://{{ domain }}{{ url }}
+
+Kind regards,{% endblocktrans %}
+{{ newsletter.sender }}
diff --git a/design/templates/newsletter/message/update_subject.txt b/design/templates/newsletter/message/update_subject.txt
new file mode 100644
index 0000000..217d5f6
--- /dev/null
+++ b/design/templates/newsletter/message/update_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{{ newsletter.title }} - {% trans "Update information" %}
diff --git a/design/templates/newsletter/newsletter_detail.html b/design/templates/newsletter/newsletter_detail.html
new file mode 100644
index 0000000..fe23a1f
--- /dev/null
+++ b/design/templates/newsletter/newsletter_detail.html
@@ -0,0 +1,30 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter detail" %}{% endblock title %}
+
+{% block body %}
+<table>
+    <tr>
+        <th>{% trans "Newsletter" %} {{ object.title }}</th>
+    </tr>
+    <tr>
+        <td><a href="{% url "newsletter_subscribe_request" object.slug %}">{% trans "Subscribe" %}</a></td>
+    </tr>
+    {% if not user.is_authenticated %}
+    <tr>
+        <td><a href="{% url "newsletter_update_request" object.slug %}">{% trans "Update" %}</a></td>
+    </tr>
+    {% endif %}
+    <tr>
+        <td><a href="{% url "newsletter_unsubscribe_request" object.slug %}">{% trans "Unsubscribe" %}</a></td>
+    </tr>
+    <tr>
+        <td><a href="{% url "newsletter_archive" object.slug %}">{% trans "Archive" %}</a></td>
+    </tr>
+    <tr>
+        <td><a href="../">{% trans "Back to list" %}</a></td>
+    </tr>
+</table>
+{% endblock body %}
diff --git a/design/templates/newsletter/newsletter_list.html b/design/templates/newsletter/newsletter_list.html
new file mode 100644
index 0000000..2b48fa2
--- /dev/null
+++ b/design/templates/newsletter/newsletter_list.html
@@ -0,0 +1,41 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter list" %}{% endblock title %}
+
+{% block body %}
+{% if user.is_authenticated %}
+<form method="POST" action="">
+  {% csrf_token %}
+  {{ formset.management_form }}
+  <table>
+    <tr>
+        <th>{% trans "Newsletter" %}</th>
+        {% if user %}
+        <th>{% trans "Subscribe" %}</th>
+        {% endif %}
+    </tr>
+    {% for form in formset.forms %}
+      <tr>
+        <td>{{ form.id }}{{ form.newsletter }}
+<a href="{% url "newsletter_detail" form.instance.newsletter.slug %}">{{ form.instance.newsletter.title }}</a></td>
+        <td>{{ form.subscribed }}</td>
+      </tr>
+    {% endfor %}
+  </table>
+  <p><input id="id_submit" name="submit" value="{% trans "Update subscriptions" %}" type="submit" /></p>
+</form>
+{% else %}
+<table>
+    <tr>
+        <th>{% trans "Newsletter" %}</th>
+    </tr>
+    {% for newsletter in object_list %}
+    <tr>
+        <td><a href="{% url "newsletter_detail" newsletter.slug %}">{{ newsletter.title }}</a></td>
+    </tr>
+    {% endfor %}
+</table>
+{% endif %}
+{% endblock body %}
diff --git a/design/templates/newsletter/submission_archive.html b/design/templates/newsletter/submission_archive.html
new file mode 100644
index 0000000..771b995
--- /dev/null
+++ b/design/templates/newsletter/submission_archive.html
@@ -0,0 +1,21 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter archive" %}{% endblock title %}
+
+{% block body %}
+<table>
+    <tr>
+        <th>{% trans "Newsletter archive" %} {{ newsletter.title }}</th>
+    </tr>
+    {% for submission in latest %}
+    <tr>
+        <td><a href="{{ submission.get_absolute_url }}">{{ submission }}</a></td>
+    </tr>
+    {% endfor %}
+    <tr>
+        <td><a href="../">{% trans "Back to list" %}</a></td>
+    </tr>
+</table>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_activate.html b/design/templates/newsletter/subscription_activate.html
new file mode 100644
index 0000000..558013a
--- /dev/null
+++ b/design/templates/newsletter/subscription_activate.html
@@ -0,0 +1,15 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}</h1>
+
+    <form enctype="multipart/form-data" method="post" action=".">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <p><input id="id_submit" name="submit" value="{% trans "Activate" %}" type="submit" /></p>
+    </form>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_subscribe.html b/design/templates/newsletter/subscription_subscribe.html
new file mode 100644
index 0000000..a2716a1
--- /dev/null
+++ b/design/templates/newsletter/subscription_subscribe.html
@@ -0,0 +1,25 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter subscribe" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter subscribe" %} {{ newsletter.title }}</h1>
+
+    {% if error %}
+        <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>
+
+        {% comment %} Replace the the following dummy with a valid email address and remove this comment.
+
+        <p>{% trans "If the error persists, please don't hesitate to contact us at the following email address:" %} <a href="newsletter@luxagraf.net">newsletter@luxagraf.net</a></p>
+
+        {% endcomment %}
+    {% else %}
+        <form enctype="multipart/form-data" method="post" action=".">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <p><input id="id_submit" name="submit" value="{% trans "Subscribe" %}" type="submit" /></p>
+        </form>
+    {% endif %}
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_subscribe_activated.html b/design/templates/newsletter/subscription_subscribe_activated.html
new file mode 100644
index 0000000..c8519d7
--- /dev/null
+++ b/design/templates/newsletter/subscription_subscribe_activated.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}</h1>
+
+    <p>{% trans "Your subscription has successfully been activated." %}</p>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_subscribe_email_sent.html b/design/templates/newsletter/subscription_subscribe_email_sent.html
new file mode 100644
index 0000000..79eea11
--- /dev/null
+++ b/design/templates/newsletter/subscription_subscribe_email_sent.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter subscribe" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter subscribe" %} {{ newsletter.title }}</h1>
+
+    <p>{% trans "Your subscription request was successfully received and an activation email has been sent to you. In that email you will find a link which you need to follow in order to activate your subscription." %}</p>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_subscribe_user.html b/design/templates/newsletter/subscription_subscribe_user.html
new file mode 100644
index 0000000..f0bbf3d
--- /dev/null
+++ b/design/templates/newsletter/subscription_subscribe_user.html
@@ -0,0 +1,25 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter subscribe" %}{% endblock title %}
+
+{% block body %}
+<h1>{% trans "Newsletter subscribe" %} {{ newsletter.title }}</h1>
+
+<p>Welcome, {{ user }}!</p>
+
+{% if messages %}
+<ul>
+    {% for message in messages %}
+    <li>{{ message }}</li>
+    {% endfor %}
+</ul>
+{% else %}
+{% trans "Do you want to subscribe to this newsletter?" %}
+<form enctype="multipart/form-data" method="post" action="{% url "newsletter_subscribe_confirm" newsletter.slug %}">
+    {% csrf_token %}
+    <p><input id="id_submit" name="submit" value="{% trans "Subscribe" %}" type="submit" /></p>
+</form>
+{% endif %}
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_unsubscribe.html b/design/templates/newsletter/subscription_unsubscribe.html
new file mode 100644
index 0000000..022ba4b
--- /dev/null
+++ b/design/templates/newsletter/subscription_unsubscribe.html
@@ -0,0 +1,25 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter unsubscribe" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter unsubscribe" %} {{ newsletter.title }}</h1>
+
+    {% if error %}
+        <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>
+
+        {% comment %} Replace the the following dummy with a valid email address and remove this comment.
+
+        <p>{% trans "If the error persists, please don't hesitate to contact us at the following email address:" %} <a href="mailto:info@foobar.com">info@foobar.com</a></p>
+
+        {% endcomment %}
+    {% else %}
+        <form enctype="multipart/form-data" method="post" action=".">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <p><input id="id_submit" name="submit" value="{% trans "Unsubscribe" %}" type="submit" /></p>
+        </form>
+    {% endif %}
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_unsubscribe_activated.html b/design/templates/newsletter/subscription_unsubscribe_activated.html
new file mode 100644
index 0000000..65628c5
--- /dev/null
+++ b/design/templates/newsletter/subscription_unsubscribe_activated.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}</h1>
+
+    <p>{% trans "You have successfully been unsubscribed." %}</p>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_unsubscribe_email_sent.html b/design/templates/newsletter/subscription_unsubscribe_email_sent.html
new file mode 100644
index 0000000..19d00b8
--- /dev/null
+++ b/design/templates/newsletter/subscription_unsubscribe_email_sent.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter unsubscribe" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter unsubscribe" %} {{ newsletter.title }}</h1>
+
+    <p>{% trans "Your unsubscription request has successfully been received. An email has been sent to you with a link you need to follow in order to confirm your unsubscription." %}</p>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_unsubscribe_user.html b/design/templates/newsletter/subscription_unsubscribe_user.html
new file mode 100644
index 0000000..5bc81dc
--- /dev/null
+++ b/design/templates/newsletter/subscription_unsubscribe_user.html
@@ -0,0 +1,27 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter unsubscribe" %}{% endblock title %}
+
+{% block body %}
+<h1>{% trans "Newsletter unsubscribe" %} {{ newsletter.title }}</h1>
+
+<p>Welcome, {{ user }}!</p>
+
+{% if messages %}
+<ul>
+    {% for message in messages %}
+    <li>{{ message }}</li>
+    {% endfor %}
+</ul>
+{% else %}
+
+{% trans "Do you want to unsubscribe from this newsletter?" %}
+<form enctype="multipart/form-data" method="post" action="{% url "newsletter_unsubscribe_confirm" newsletter.slug %}">
+    {% csrf_token %}
+    <p><input id="id_submit" name="submit" value="{% trans "Unsubscribe" %}" type="submit" /></p>
+</form>
+{% endif %}
+
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_update.html b/design/templates/newsletter/subscription_update.html
new file mode 100644
index 0000000..fe83797
--- /dev/null
+++ b/design/templates/newsletter/subscription_update.html
@@ -0,0 +1,25 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter update" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter update" %} {{ newsletter.title }}</h1>
+
+    {% if error %}
+        <p>{% trans "Due to a technical error we were not able to submit your confirmation email. This could be because your email address is invalid." %}</p>
+
+        {% comment %} Replace the the following dummy with a valid email address and remove this comment.
+
+        <p>{% trans "If the error persists, please don't hesitate to contact us at the following email address:" %} <a href="mailto:info@foobar.com">info@foobar.com</a></p>
+
+        {% endcomment %}
+    {% else %}
+        <form enctype="multipart/form-data" method="post" action=".">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <p><input id="id_submit" name="submit" value="{% trans "Update subscription" %}" type="submit" /></p>
+        </form>
+    {% endif %}
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_update_activated.html b/design/templates/newsletter/subscription_update_activated.html
new file mode 100644
index 0000000..65b0298
--- /dev/null
+++ b/design/templates/newsletter/subscription_update_activated.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter" %} {{ newsletter.title }} {{ action }} {% trans "activate" %}</h1>
+
+    <p>{% trans "Your subscription has successfully been updated." %}</p>
+{% endblock body %}
diff --git a/design/templates/newsletter/subscription_update_email_sent.html b/design/templates/newsletter/subscription_update_email_sent.html
new file mode 100644
index 0000000..b740d18
--- /dev/null
+++ b/design/templates/newsletter/subscription_update_email_sent.html
@@ -0,0 +1,11 @@
+{% extends "newsletter/common.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Newsletter update" %}{% endblock title %}
+
+{% block body %}
+    <h1>{% trans "Newsletter update" %} {{ newsletter.title }}</h1>
+
+    <p>{% trans "Your update request was successfully received and an activation email has been sent to you. In that email you will find a link which you need to follow in order to update your subscription." %}</p>
+{% endblock body %}
-- 
cgit v1.2.3-70-g09d2