summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/lttr/templates/lttr/friends_list.html8
-rw-r--r--app/lttr/templates/lttr/range_list.html1
-rw-r--r--app/pages/templates/pages/luxagraf/page_detail.html7
3 files changed, 10 insertions, 6 deletions
diff --git a/app/lttr/templates/lttr/friends_list.html b/app/lttr/templates/lttr/friends_list.html
index 635492d..4e94c4d 100644
--- a/app/lttr/templates/lttr/friends_list.html
+++ b/app/lttr/templates/lttr/friends_list.html
@@ -2,7 +2,7 @@
{% 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 metadescription %}An infrequesnt mailing list about living outdoors, travel, literature, music, vintage vehicles, and other ephemera.{% endblock %}
{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}
{% block primary %}
<main role="main" class="archive-wrapper">
@@ -10,9 +10,9 @@
<h1 class="list-hed">Join the <em>Friends of a Long Year</em>.</h1>
<iframe target='_parent' style="border:none; background:white; width:100%;" title="embedded form for subscribing the the Friends of a Long Year newsletter" src="{% url 'lttr:subscribe' slug='friends' %}"></iframe>
<h2 class="list-subhed">Say what? </h2>
- <p><em>Friends of a Long Year</em> is a monthly letter about living outdoors, travel, literature, music, vintage vehicles, and other ephemera. Unsubscribing is easy. It's all <a href="/src/building-your-own-mailing-list-software">self-hosted</a>, secure, and&nbsp;<a href="/privacy" title="My privacy policy">private</a>.</p>
- <p>The name <em>Friends of a Long Year</em> comes from the 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".</p>
- <p>While I came up with this name last year, it seems particularly fitting in 2020, which is shaping up to be a long year. If you like to travel with friends, mentally for now, please, join us.</p>
+ <p><em>Friends of a Long Year</em> is a monthly letter about living outdoors, travel, literature, music, vintage vehicles, and other ephemera. It's written in the spirit of Mary Austin. And Mike’s emails. A more detailed explaination can be found <a href="/jrnl/2020/11/invitation">here</a>.</p>
+ <p>Unsubscribing is easy. It's all <a href="/src/building-your-own-mailing-list-software">self-hosted</a> and designed to <a href="/privacy" title="My privacy policy">respect your privacy</a>.</p>
+ <p>There's also the <em><a href="/newsletter/range/">Range</a></em> newsletter if you'd like a photo in your inbox once a week.</p>
</div>
<h3 class="archive-sans">Letters</h3>
<ul class="archive-list">{% for object in object_list %}
diff --git a/app/lttr/templates/lttr/range_list.html b/app/lttr/templates/lttr/range_list.html
index 38299f8..6c29fb5 100644
--- a/app/lttr/templates/lttr/range_list.html
+++ b/app/lttr/templates/lttr/range_list.html
@@ -22,6 +22,7 @@
<p>If you're interested there is also a link to a video of the RAW image processing in <a href="https://www.darktable.org/">darktable</a>, and sometimes a few words about the process. But the primary purpose is to deliver a single photo to your inbox. Simple and fun.</p>
<p>Yes, I know about Instagram. This is an attempt to reclaim that space, sharing photos with friends, but without all the distractions of the corporate social web, without the endless scroll of photos, likes, stories, comments, whatever. This is just an image delivered once a week to your inbox. I've been trying to think of a way to make it reciprocal, so you can send a picture to my inbox. If you have ideas, <a href="mailto:comments@luxagraf.net">email me</a>.</p>
<p>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="/newsletter/range/feed.xml">an RSS feed</a>, and it's all archived below.</p>
+ <p>There's also the <em><a href="/newsletter/friends/">Friends of a Long Year</a></em> newsletter if you want some stories in your inbox.</p>
</div>
<h3 class="archive-sans">Images</h3>
<div class="archive-grid">{% for object in object_list %}
diff --git a/app/pages/templates/pages/luxagraf/page_detail.html b/app/pages/templates/pages/luxagraf/page_detail.html
index fc66917..4029f24 100644
--- a/app/pages/templates/pages/luxagraf/page_detail.html
+++ b/app/pages/templates/pages/luxagraf/page_detail.html
@@ -19,12 +19,15 @@
{% if object.enable_comments %}
{% get_comment_count for object as comment_count %}
{%if comment_count > 0 %}
-<p class="comments--header">{{comment_count}} Comment{{ comment_count|pluralize }}</p>
+<div class="comment-wrapper">
+<p class="comments-header">{{comment_count}} Comment{{ comment_count|pluralize }}</p>
{% render_comment_list for object %}
{%endif%}
-<div class="comment--form--wrapper {%if comment_count > 0%}comment-form-border{%endif%}">
+<div class="comment-form-wrapper {%if comment_count > 0%}comment-form-border{%endif%}">
{% render_comment_form for object %}
</div>
+{% else %}
+<p class="comments--header" style="text-align: center">Sorry, comments have been disabled for this post.</p>
{%endif%}
</main>
{% endblock %}