diff options
| -rw-r--r-- | app/lttr/models.py | 1 | ||||
| -rw-r--r-- | app/lttr/templates/lttr/message/subscribe.html | 7 | ||||
| -rw-r--r-- | app/lttr/templates/lttr/message/subscribe.txt | 5 | ||||
| -rw-r--r-- | app/posts/templates/posts/src_list.html | 9 |
4 files changed, 13 insertions, 9 deletions
diff --git a/app/lttr/models.py b/app/lttr/models.py index cc5db66..e39b3b0 100644 --- a/app/lttr/models.py +++ b/app/lttr/models.py @@ -50,6 +50,7 @@ class Newsletter(models.Model): """ A model for Newletters. Might I one day have two? I might. """ title = models.CharField(max_length=250) slug = models.SlugField(db_index=True, unique=True) + intro = models.TextField(blank=True, null=True) def __str__(self): return self.title diff --git a/app/lttr/templates/lttr/message/subscribe.html b/app/lttr/templates/lttr/message/subscribe.html index 3ed34db..56ccbcb 100644 --- a/app/lttr/templates/lttr/message/subscribe.html +++ b/app/lttr/templates/lttr/message/subscribe.html @@ -7,14 +7,13 @@ </title> </head> <body> -{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url %} +{% blocktrans with name=subscription.name title=newsletter.title domain=site.domain url=subscription.subscribe_activate_url intro=newsletter.intro %} <p>Hola-</p> -<p>Someone, hopefully you, asked to subscribe to {{ title }}, a luxagraf.net letter.</p> +<p>Someone, hopefully you, asked to subscribe to luxagraf's {{ title }} newsletter. {{ intro }}</p> -<p>To confirm your subscription, please follow this activation link: -</p> +<p>Please click this link to active your subscription:</p> https://{{ domain }}{{ url }} {% endblocktrans %} diff --git a/app/lttr/templates/lttr/message/subscribe.txt b/app/lttr/templates/lttr/message/subscribe.txt index 6869d5f..edbc467 100644 --- a/app/lttr/templates/lttr/message/subscribe.txt +++ b/app/lttr/templates/lttr/message/subscribe.txt @@ -1,8 +1,9 @@ Hola- -Someone, hopefully you, asked to subscribe to {{ newsletter.title }}, a luxagraf.net letter. +Someone, hopefully you, asked to subscribe to luxagraf's {{ newsletter.title }} newsletter. {{ newsletter.intro }} + +Please click this link to active your subscription: -If you would like to confirm your subscription, please follow this activation link: https://{{ site.domain }}{{ subscription.subscribe_activate_url }} -Scott diff --git a/app/posts/templates/posts/src_list.html b/app/posts/templates/posts/src_list.html index dd8ff24..c673935 100644 --- a/app/posts/templates/posts/src_list.html +++ b/app/posts/templates/posts/src_list.html @@ -9,9 +9,12 @@ {% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %} {% block primary %}<main role="main" class="archive-wrapper"> <div class="archive-intro"> - <h2 class="archive-hed">Tutorials and tools for building great things on the web.</h2> - <p>The indie web is an amazing democratic publishing platform unlike anything in history. The catch is, to avoid serving at the pleasure of the corporate king, you need to know <em>how</em> to publish. That's what these articles are here for, to help you learn how to use independent, community supported open source tools. The web won't last forever, let's build something cool while we can.</p> - <p>Topics include HTML, CSS, Django, Linux, Nginx, Python, Postgresql, free software, and, once, the evil that is Google AMP.</p> + <h1 class="archive-hed"><code>/src/</code></h1> + <h2 class="list-subhed">Let's building things.</h2> + <p>Please join us by dropping your email in the form below: </p> + <iframe target='_parent' style="border:none !important; background:white; width:100% !important;" title="embedded form for subscribing the src newsletter" src="{% url 'lttr:subscribe' slug='src' %}"></iframe> + <p>I try to post monthly. Unsubscribing is easy. It's <a href="/src/building-your-own-mailing-list-software">self-hosted</a> and <a href="/privacy" title="My privacy policy">respects your privacy</a>. If you don't want an email, there's also <a href="/src/feed.xml">an RSS feed</a>, and it's all archived below.</p> + <p>Why? The web is an amazing democratic publishing platform unlike anything in history. The catch is, to avoid serving at the pleasure of the corporate king, you need to know <em>how</em> to publish. That's what these articles are here for, to help you learn how to use independent, community-supported, open source tools. The web won't last forever, let's build something cool while we can.</p> <p>A few of the articles below were previously published in: <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://www.wired.com/author/scott-gilbertson/">Wired</a></em>, and <em><a href="https://www.theregister.co.uk/Author/Scott-Gilbertson/">The Register</a></em></p> </div> <h1 class="archive-sans">Articles</h1>{% autopaginate object_list 24 %} |