range: tweaked newsletter templates

2 files changed, 3 insertions, 10 deletions

diff --git a/app/lttr/templates/lttr/emails/range_html_email.html b/app/lttr/templates/lttr/emails/range_html_email.html
index 09c2db3..e68fe19 100644
--- a/app/lttr/templates/lttr/emails/range_html_email.html
+++ b/app/lttr/templates/lttr/emails/range_html_email.html
@@ -183,13 +183,10 @@ ul li, ol li {
           <h1 style="margin-top:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;font-family:mffnweb, 'Lora', 'Lucida Serif', Lucida, Georgia, serif;line-height:1;margin-bottom:15px;color:#000;text-align:center;font-weight:400;font-size:44px;" ><singleline style="margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;" >{{object.title|safe|smartypants}}</singleline></h1>
           
           <hr style="padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;width:50%;margin-top:40px;margin-bottom:40px;margin-right:auto;margin-left:auto;border-width:0;border-top-width:1px;border-top-style:solid;border-top-color:#ddd;" />
-          <a href="https://luxagraf.net{{object.post.get_absolute_url}}" style="margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;border-width:0;color:#000;font-weight:600;text-decoration:none;border-bottom-width:1px;border-bottom-style:solid;border-bottom-color:#ddd;" >
-              {% include "lib/friends_featured_img.html" with image=object.featured_image %}
-          </a>
           <br style="margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;" />
           <br style="margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;" />
 
-          If you'd like to view a larger version, read some backstory, and see a video of the development process in Darktable, head on over to: <a href="https://luxagraf.net{{object.post.get_absolute_url}}">https://luxagraf.net{{object.post.get_absolute_url}}</a>
+            {{object.body_email_html|safe|smartypants}}
 
           <hr style="padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;width:50%;margin-top:40px;margin-bottom:40px;margin-right:auto;margin-left:auto;border-width:0;border-top-width:1px;border-top-style:solid;border-top-color:#ddd;" />
         </td>
diff --git a/app/lttr/templates/lttr/emails/range_plain_text_email.txt b/app/lttr/templates/lttr/emails/range_plain_text_email.txt
index 2044e44..7b8543a 100644
--- a/app/lttr/templates/lttr/emails/range_plain_text_email.txt
+++ b/app/lttr/templates/lttr/emails/range_plain_text_email.txt
@@ -1,14 +1,10 @@
-Greetings Range subscribers-
-
-I respect your desire for plain text email, but there really isn't a way to do a photo newsletter in plain text, except to say, here's a link to the web-based version:
-
-<https://luxagraf.net{{ object.get_absolute_url }}>
+{{ object.email_encode|safe }}
 
 -----
 
 You're getting this email because you signed up for
 
-Scott Gilbertson's (luxagraf)[https://luxagraf.net/] photo newsletter,
+Scott Gilbertson's (luxagraf)[https://luxagraf.net/] newsletter,
 
 *Range* [https://luxagraf.net/range/]