Gave the newsletter top billing

3 files changed, 4 insertions, 48 deletions

diff --git a/design/templates/base.html b/design/templates/base.html
index ffeb1d6..2efefc4 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -39,6 +39,7 @@
             <ul>
                 <li id="laverdad"><a href="/jrnl/" title="What we've been up to lately">Jrnl</a></li>
                 <li id="laverdad"><a href="/essays/" title="Writings">Essays</a></li>
+                <li id="lttr"><a href="/lttr/" title="The 'friends of a long year' newsletter">Lttr</a></li>
                 <!--<li id="nota"><a href="/field-notes/" title="Quick notes and images from the road">Notes</a></li>
                 <li id="fotos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li>i-->
                 <!--<li id="maps"><a href="/map" title="Maps">Map</a></li>-->
diff --git a/design/templates/essays/entry_list.html b/design/templates/essays/entry_list.html
deleted file mode 100644
index d58bd05..0000000
--- a/design/templates/essays/entry_list.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% load pagination_tags %}
-
-{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %}
-{% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%} Page {{page}}{% endblock %}
-{%block bodyid%}id="writing" class="archive"{%endblock%}
-
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-        {% if region %}{%if region.name == 'United States'%} <li><a href="/jrnl/" title="See all Journal Entries" itemprop="url"><span itemprop="title">Journal</span></a> &rarr;</li>
-        <li itemprop="title">the United States</li>{%else%}<li><a href="/jrnl/" title="See all Journal Entries" itemprop="url"><span>Journal</span></a> &rarr;</li> 
-        <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Journal</li>{%endif%}
-    </ul>
-    <main class="archive-grid">
-        <h1 class="hide">{% if region %}Journal entries from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Journal {%endif%}</h1>{% autopaginate object_list 24 %} {% for object in object_list %}
-        <article class="h-entry hentry archive-card {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}" itemscope itemType="http://schema.org/Article">
-            <div class="post-image">
-                <a href="{{object.get_absolute_url}}" title="{{object.title}}">{% if object.featured_image %}
-                    {% include "lib/img_archive.html" with image=object.featured_image %}
-                    {%else%}
-                    <img src="{{object.get_image_url}}" alt="{{ object.title }}" class="u-photo post-image" itemprop="image" />{%endif%}</a>
-            </div>
-            <h2 class="p-name entry-title post-title" itemprop="headline"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|safe|smartypants|widont}}</a></h2>
-            <p class="p-author author hide" itemprop="author"><span class="byline-author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">Scott Gilbertson</span></span></p>
-            <time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <p class="post-summary">
-                <span class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
-                    {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
-                </span> &ndash;
-                <span class="p-summary" itemprop="description">
-                    {{object.dek|safe}}
-                </span>
-            </p>
-        </article> {% endfor %}
-    </main>
-    <nav class="pagination">
-    {% paginate %}
-    </nav>
-{% endblock %}
-
-
-
-{% block js %}<script src="/media/js/hyphenate.min.js" type="text/javascript"></script>{% endblock%}
diff --git a/design/templates/lttr/subscriber_form.html b/design/templates/lttr/subscriber_form.html
index c495cfa..3fb906a 100644
--- a/design/templates/lttr/subscriber_form.html
+++ b/design/templates/lttr/subscriber_form.html
@@ -10,7 +10,7 @@
     </ul>
     <main role="main" id="essay-archive" class="essay-archive archive-list">
         <div class="essay-intro">
-            <h2>Sign up for the newsletter.</h2>
+            <h2>Join the <em>Friends of a Long Year</em>.</h2>
             <form action="" method="post" class="generic-form flex">{% csrf_token %}
                 {% for field in form %}
                 <fieldset>
@@ -21,8 +21,8 @@
             </form>
             <small class="alert">{% if field.errors %}{{field.errors}}{% endif %}</small>
                 {%endfor%}
-            <p>Join <em>Friends of a Long Year</em>, an infrequent mailing that will keep you up-to-date with luxagraf and offer some thoughts on topics like travel, photography, the natural world, tools, walking and other ephemera. It comes about twice a month, sometimes less, sometimes more. Unsubscribing is easy. It's all self-hosted, secure, and <a href="/privacy" title="My privacy policy">private</a>.</p>
-            <p>The name comes from the great 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". This somewhoat inscrutable dedication grabbed me, and seemed like the perfect name for this mailing list.</p>
+            <p>Say what? <em>Friends of a Long Year</em> is an infrequent mailing that will keep you up-to-date with luxagraf and offer some thoughts on topics like travel, photography, the natural world, tools, walking and other ephemera. It comes about twice a month, sometimes less, sometimes more. Unsubscribing is easy. It's all self-hosted, secure, and <a href="/privacy" title="My privacy policy">private</a>.</p>
+            <p>The name comes from the great 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". This somewhat inscrutable dedication grabbed me, and seemed like the perfect name for this mailing list.</p>
         </div>
         <h1 class="topic-hed">Letters</h1>
     <ul>{% for object in object_list %}