[tor-commits] [newsletter/master] Added subscription-confirmed and request-sent

[hiro at torproject.org]

commit 30aff5d425dc675a3abc8c9f63d0c9d3f63fce4a
Author: Peter Haight <peterh at giantrabbit.com>
Date:   Tue Sep 22 16:34:33 2020 -0700

    Added subscription-confirmed and request-sent
    
    With moving all of the display pages that exist on the donate site, we
    need these sebuscription request sent and subscription confirmed pages.
    
    Issue #48283
---
 content/subscription-confirmed/contents.lr      | 15 +++++++++++++++
 content/subscription-error/contents.lr          |  2 +-
 content/subscription-request-sent/contents.lr   | 11 +++++++++++
 lego                                            |  2 +-
 templates/{errors.html => page-no-sidebar.html} |  2 +-
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/content/subscription-confirmed/contents.lr b/content/subscription-confirmed/contents.lr
new file mode 100644
index 0000000..afae0d3
--- /dev/null
+++ b/content/subscription-confirmed/contents.lr
@@ -0,0 +1,15 @@
+_model: page
+---
+title: Subscription Confirmed
+---
+html: errors.html
+---
+_template: page-no-sidebar.html
+---
+body:
+
+Thanks for joining our email list - you'll hear from us soon! In the meantime, follow @TorProject on Twitter to keep in touch.
+
+As a non-profit organization, we rely on contributions from people like you to help us create and maintain technology used by millions of users daily to browse, communicate, and express themselves online privately. Every little bit helps - please donate today.
+
+<a class="btn btn-purple" href="https://www.torproject.org/donate">Donate Now</a>
diff --git a/content/subscription-error/contents.lr b/content/subscription-error/contents.lr
index ac648bb..33bd71c 100644
--- a/content/subscription-error/contents.lr
+++ b/content/subscription-error/contents.lr
@@ -4,4 +4,4 @@ title: Error Confirming Your Subscription
 ---
 html: errors.html
 ---
-_template: errors.html
+_template: page-no-sidebar.html
diff --git a/content/subscription-request-sent/contents.lr b/content/subscription-request-sent/contents.lr
new file mode 100644
index 0000000..f9393bf
--- /dev/null
+++ b/content/subscription-request-sent/contents.lr
@@ -0,0 +1,11 @@
+_model: page
+---
+title: Confirmation Sent
+---
+html: errors.html
+---
+_template: page-no-sidebar.html
+---
+body:
+
+ A request for confirmation has been sent to your email address. Once you click on that link, you will be subscribed. 
diff --git a/lego b/lego
index de11708..34e2d07 160000
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit de117085d3e2f48f1f5878b5f1d6951a07662d5c
+Subproject commit 34e2d07774123f707c707ce186423a96bf036299
diff --git a/templates/errors.html b/templates/page-no-sidebar.html
similarity index 94%
rename from templates/errors.html
rename to templates/page-no-sidebar.html
index ebc1a5b..d6c9fe2 100644
--- a/templates/errors.html
+++ b/templates/page-no-sidebar.html
@@ -16,7 +16,7 @@
           <h2>{{ this.title }}</h2>
           <div class="errors">
           </div>
-          {% block body %}{% endblock %}
+          {% block body %}{{ this.body }}{% endblock %}
           <script src="{{ '/static/js/errors.js'|asseturl }}" ></script>
         </main>
       </div>