summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/lttr/templates/lttr/friends_list.html2
-rw-r--r--app/lttr/templates/lttr/range_list.html4
-rw-r--r--app/lttr/urls.py14
-rw-r--r--config/base_urls.py2
-rw-r--r--design/sass/screenv10.scss14
-rw-r--r--design/templates/base.html7
6 files changed, 24 insertions, 19 deletions
diff --git a/app/lttr/templates/lttr/friends_list.html b/app/lttr/templates/lttr/friends_list.html
index 4e94c4d..3318a08 100644
--- a/app/lttr/templates/lttr/friends_list.html
+++ b/app/lttr/templates/lttr/friends_list.html
@@ -12,7 +12,7 @@
<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. 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>
+ <p>There's also the <em><a href="/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 a2b16fc..c6875e9 100644
--- a/app/lttr/templates/lttr/range_list.html
+++ b/app/lttr/templates/lttr/range_list.html
@@ -21,8 +21,8 @@
<p><em>Range</em> is a weekly mailing of a single photograph. </p>
<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>
+ <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="/range/feed.xml">an RSS feed</a>, and it's all archived below.</p>
+ <p>There's also the <em><a href="/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/lttr/urls.py b/app/lttr/urls.py
index 9186ed1..b470431 100644
--- a/app/lttr/urls.py
+++ b/app/lttr/urls.py
@@ -6,32 +6,32 @@ app_name = "lttr"
urlpatterns = [
path(
- r'<str:slug>/feed.xml',
+ r'feed.xml',
views.NewsletterRSSFeedView(),
name="feed"
),
path(
- '<str:slug>/unsubscribe/<str:activation_code>',
+ 'unsubscribe/<str:activation_code>',
views.UnsubscribeRequestView.as_view(),
name='newsletter_unsubscribe'
),
path(
- r'<str:slug>/<int:issue>/<str:mailing>',
+ r'<int:issue>/<str:mailing>',
views.NewsletterMailingDetail.as_view(),
name="detail"
),
path(
- r'<str:slug>/subscribe',
+ r'subscribe',
views.NewsletterSubscribeView.as_view(),
name="subscribe"
),
path(
- r'<str:slug>/<int:page>',
+ r'<int:page>',
views.NewsletterListView.as_view(),
name="list"
),
path(
- '<str:slug>/activate/<str:activation_code>/',
+ 'activate/<str:activation_code>/',
views.ConfirmSubscriptionView.as_view(), name='newsletter_activate'
),
path(
@@ -40,7 +40,7 @@ urlpatterns = [
name="subscribed"
),
path(
- r'<str:slug>/',
+ r'',
views.NewsletterListView.as_view(),
{'page': 1},
name="list"
diff --git a/config/base_urls.py b/config/base_urls.py
index 34141ca..e1ec3d4 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -38,7 +38,6 @@ urlpatterns = [
path(r'feed.xml', PostRSSFeedView(),name="feed"),
path(r'sitemap.xml', sitemap, {'sitemaps': sitemaps}),
path(r'links/', include('links.urls')),
- path(r'newsletter/', include('lttr.urls')),
path(r'jrnl/', include('posts.urls.jrnl_urls', namespace='jrnl')),
#path(r'projects/', include('projects.urls')),
path(r'walk/', include('locations.walk_urls')),
@@ -66,6 +65,7 @@ urlpatterns = [
path(r'map/', include('locations.urls', namespace='map')),
path(r'', HomePageList.as_view(), {'pk':1,}, name="homepage"),
path(r'comments/', include('django_comments.urls')),
+ path(r'<slug>/', include('lttr.urls')),
path(r'<slug>.txt', PageDetailTXTView.as_view()),
path(r'<slug>', include('pages.urls', namespace='pages')),
path(r'<path>/<slug>/', PageDetailView.as_view()),
diff --git a/design/sass/screenv10.scss b/design/sass/screenv10.scss
index 21cb224..814db0d 100644
--- a/design/sass/screenv10.scss
+++ b/design/sass/screenv10.scss
@@ -954,7 +954,8 @@ p + .picwide {
border-top: 3px double #efefef;
border-bottom: 3px double #efefef;
margin-top: 3rem;
- padding: 2rem;
+ padding-top: 2rem;
+ padding-bottom: 2rem;
font-size: 90%;
}
@media screen and (min-width: 750px) {
@@ -1001,7 +1002,6 @@ p + .picwide {
line-height: 1;
}
-
//}}}
//*********** jrnl interpage nav ************************{{{
.page-navigation {
@@ -1014,6 +1014,7 @@ p + .picwide {
@media screen and (min-width: 750px) {
.page-navigation {
max-width: 750px;
+ width: 750px;
}
}
.page-navigation div {
@@ -1136,9 +1137,12 @@ pre{
font-family: mffnweb, Helvetica, sans-serif;
font-size: 20px;
font-size: 1.25rem;
- p {
- line-height: 1.3;
- }
+}
+.donate p {
+ line-height: 1.3;
+}
+.donate h3 {
+ margin-top: .5rem;
}
.donate-btn {
display: inline-block;
diff --git a/design/templates/base.html b/design/templates/base.html
index 61b9172..97b8f4e 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -29,10 +29,11 @@
<span class="sitesubtitle">{%block sitesubtitle %}Walk Slowly{% endblock%}</span>
</div>
<nav>
- <a class="nav-item" href="{% url "jrnl:list" %}" title="Stories of life on the road.">Jrnl</a>{%comment%} &amp; <a href="{% url "fieldnotes:list" %}" title="Short stories, snapshots of daily life on the road.">Field Notes</a>
- <a href="{% url "guides:guide-base" %}" title="Advice, Tools, Tips and Tricks for Full Time Van or RV Life.">Guides</a>{%endcomment%}
+ <a class="nav-item" href="{% url "jrnl:list" %}" title="Stories of life on the road.">Jrnl</a>{%comment%} &amp; <a href="{% url "fieldnotes:list" %}" title="Short stories, snapshots of daily life on the road.">Field Notes</a>{%endcomment%}
+ <a class="nav-item" href="/friends/" title="Join 'friends of a long year'">Friends</a>
+ <a class="nav-item" href="/range/" title="Range, a photo a week, in your inbox">Range</a></span>
+ <a class="nav-item" href="{% url "src:list" %}" title="make cool stuff">src</a>
<a class="nav-item" href="/about" title="About Scott">About</a>
- <span class="nav-item">Lttrs: <a href="/newsletter/friends/" title="Join 'friends of a long year'">Friends</a> &amp; <a href="/newsletter/range/" title="Range, a photo a week, in your inbox">Range</a></span>
</nav>
</header>
{% block breadcrumbs %}{% endblock %}