From 647176b83d2316a8f68613adac18e579dac6e2b1 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Thu, 6 Aug 2020 15:09:05 -0400
Subject: updated to Django 3.1

---
 design/templates/admin/index.html |  2 +-
 design/templates/base.html        | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'design')

diff --git a/design/templates/admin/index.html b/design/templates/admin/index.html
index e797eb2..f8c4fb2 100644
--- a/design/templates/admin/index.html
+++ b/design/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load admin_list static i18n %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />
 <style>
diff --git a/design/templates/base.html b/design/templates/base.html
index 2a80f4e..6a74d54 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -32,11 +32,9 @@
             </div>
             <nav>
                 <ul>
-                    <li><a href="/jrnl/" title="Stories of life on the road.">Jrnl</a></li>
-                    <!--<li><a href="/guides/" title="Advice, Tools, Tips and Tricks for Full Time Van or RV Life.">Guides</a></li>-->
-                    <!--<li><a href="/essays/" title="longer essays and posts about non-travel related things">Essays</a></li>-->
-                    <!--<li><a href="/field-notes/" title="Short stories, snapshots of daily life on the road.">Notes</a></li>-->
-                    <li><a href="/newsletter/" title="The 'friends of a long year' newsletter">Lttr</a></li>
+                    <li><a href="{% url "jrnl:list" %}" title="Stories of life on the road.">Jrnl</a> &amp; <a href="{% url "fieldnotes:list" %}" title="Short stories, snapshots of daily life on the road.">Field Notes</a></li>
+                    <li><a href="{% url "guide:guide-base" %}" title="Advice, Tools, Tips and Tricks for Full Time Van or RV Life.">Guides</a></li>
+                    <li><a href="/newsletter/" title="The 'friends of a long year' newsletter">newsletter</a></li>
                     <li><a href="/about" title="About Scott">About</a></li>
                 </ul>
             </nav>
@@ -54,8 +52,7 @@
                 <ul>
                     <li><a href="/jrnl/feed.xml" title="RSS feed">RSS</a></li>
                     <li><a href="/newsletter/" title="Luxagraf Email Updates">Email</a></li>
-                    <li><a href="https://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">Twitter</a></li>
-                    <li><a href="https://www.facebook.com/luxagraf" rel="me" title="luxagraf on Facebook">Facebook</a></li>
+                    <li><a href="https://www.instagram.com/luxagraf" rel="me" title="luxagraf on Instagram">Instagram</a></li>
                 </ul>
         </ul>
          <div class="support">Support luxagraf: 
-- 
cgit v1.2.3-70-g09d2