Halfway through extending subscriptions by selectable unsubscription process. Also contains changes towards better handling of scenarios when address is already subscribed.

views/subscription/mail-already-subscribed-html.mjml.hbs

@@ -0,0 +1,24 @@
+<mj-section>
+    <mj-column>
+        <mj-text mj-class="h3">
+            {{#translate}}Email address already subscribed{{/translate}}
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}We have received a subscription request. Your email address is however already registered.{{/translate}}.
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}If you received this email by mistake, simply delete it. Your existing subscription won't be affected.{{/translate}}
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}If you want to modify your subscription then you can {{/translate}}
+            <a href="{{preferencesUrl}}">{{#translate}}manage your preferences{{/translate}}</a> {{#translate}}or{{/translate}} <a href="{{unsubscribeUrl}}">{{#translate}}unsubscribe here{{/translate}}</a>.
+        </mj-text>
+        <mj-button mj-class="button" href="{{homepage}}">
+            {{#translate}}Return to our website{{/translate}}
+        </mj-button>
+        <mj-text mj-class="p">
+            {{#translate}}For questions about this list, please contact:{{/translate}}
+            <br/><a href="mailto:{{contactAddress}}">{{contactAddress}}</a>
+        </mj-text>
+    </mj-column>
+</mj-section>

views/subscription/mail-already-subscribed-text.hbs

@@ -0,0 +1,18 @@
+{{{title}}}
+{{#translate}}Email address already subscribed{{/translate}}
+================================
+
+{{#translate}}We have received a subscription request. Your email address is however already registered.{{/translate}}
+
+{{#translate}}If you received this email by mistake, simply delete it. Your existing subscription won't be affected.{{/translate}}
+
+{{#translate}}If you want to modify your subscription then you can:{{/translate}}
+
+{{#translate}}manage your preferences{{/translate}}: {{preferencesUrl}}
+
+- {{#translate}}or{{/translate}} -
+
+{{#translate}}unsubscribe here{{/translate}}: {{unsubscribeUrl}}
+
+{{#translate}}For questions about this list, please contact:{{/translate}}
+{{{contactAddress}}}

views/subscription/mail-confirm-address-change-html.mjml.hbs

@@ -0,0 +1,17 @@
+<mj-section>
+    <mj-column>
+        <mj-text mj-class="h3">
+            {{#translate}}Please Confirm Subscription Address Change{{/translate}}
+        </mj-text>
+        <mj-button mj-class="button" href="{{confirmUrl}}">
+            {{#translate}}Yes, subscribe this email address to the list{{/translate}}
+        </mj-button>
+        <mj-text mj-class="p">
+            {{#translate}}If you received this email by mistake, simply delete it. You won't be subscribed if you don't click the confirmation link above.{{/translate}}
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}For questions about this list, please contact:{{/translate}}
+            <br/><a href="mailto:{{contactAddress}}">{{contactAddress}}</a>
+        </mj-text>
+    </mj-column>
+</mj-section>

views/subscription/mail-confirm-address-change-text.hbs

@@ -0,0 +1,10 @@
+{{{title}}}
+{{#translate}}Please Confirm Subscription Address Change{{/translate}}
+==========================================
+
+{{#translate}}Yes, subscribe this email address to the list{{/translate}}: {{{confirmUrl}}}
+
+{{#translate}}If you received this email by mistake, simply delete it. You won't be subscribed unless you click the confirmation link above.{{/translate}}
+
+{{#translate}}For questions about this list, please contact:{{/translate}}
+{{{contactAddress}}}

views/subscription/mail-confirm-unsubscription-html.mjml.hbs

@@ -0,0 +1,17 @@
+<mj-section>
+    <mj-column>
+        <mj-text mj-class="h3">
+            {{#translate}}Please Confirm Unsubscription{{/translate}}
+        </mj-text>
+        <mj-button mj-class="button" href="{{confirmUrl}}">
+            {{#translate}}Yes, unsubscribe me from this list{{/translate}}
+        </mj-button>
+        <mj-text mj-class="p">
+            {{#translate}}If you received this email by mistake, simply delete it. You won't be unsubscribed if you don't click the confirmation link above.{{/translate}}
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}For questions about this list, please contact:{{/translate}}
+            <br/><a href="mailto:{{contactAddress}}">{{contactAddress}}</a>
+        </mj-text>
+    </mj-column>
+</mj-section>

views/subscription/mail-confirm-unsubscription-text.hbs

@@ -0,0 +1,10 @@
+{{{title}}}
+{{#translate}}Please Confirm Subscription{{/translate}}
+===========================
+
+{{#translate}}Yes, unsubscribe me from this list{{/translate}}: {{{confirmUrl}}}
+
+{{#translate}}If you received this email by mistake, simply delete it. You won't be unsubscribed unless you click the confirmation link above.{{/translate}}
+
+{{#translate}}For questions about this list, please contact:{{/translate}}
+{{{contactAddress}}}

views/subscription/web-confirm-unsubscription-notice.mjml.hbs

@@ -0,0 +1,13 @@
+<mj-section>
+    <mj-column>
+        <mj-text mj-class="h3">
+            {{#translate}}Almost Finished{{/translate}}
+        </mj-text>
+        <mj-text mj-class="p">
+            {{#translate}}We need to confirm your email address. To complete the unsubscription process, please click the link in the email we just sent you.{{/translate}}
+        </mj-text>
+        <mj-button mj-class="button" href="{{homepage}}">
+            {{#translate}}Return to our website{{/translate}}
+        </mj-button>
+    </mj-column>
+</mj-section>