updated stylesheets and added essays

40 files changed, 962 insertions, 103 deletions

diff --git a/app/essays/__init__.py b/app/essays/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/essays/__init__.py
diff --git a/app/essays/admin.py b/app/essays/admin.py
new file mode 100644
index 0000000..f326092
--- /dev/null
+++ b/app/essays/admin.py
@@ -0,0 +1,49 @@
+from django.contrib import admin
+from .models import Essay, PostType
+from utils.widgets import LGEntryForm
+
+
+@admin.register(PostType)
+class PostTypeAdmin(admin.ModelAdmin):
+    prepopulated_fields = {"slug": ('name',)}
+
+
+@admin.register(Essay)
+class EssayAdmin(admin.ModelAdmin):
+    form = LGEntryForm
+    list_display = ('title', 'pub_date', 'enable_comments', 'status')
+    list_filter = ('pub_date', 'enable_comments', 'status')
+    prepopulated_fields = {"slug": ('title',)}
+    fieldsets = (
+        ('Entry', {
+            'fields': (
+                'title',
+                'sub_title',
+                'body_markdown',
+                ('pub_date', 'status'),
+                'meta_description',
+                ('slug', 'enable_comments', 'has_code', 'post_type'),
+            ),
+            'classes': (
+                'show',
+                'extrapretty',
+                'wide'
+            )
+        }),
+        ('meta', {
+            'fields': (
+                'originally_published_by',
+                'originally_published_by_url',
+                'afterword',
+                ('field_notes', 'books'),
+            ),
+            'classes': (
+                'hide',
+                'extrapretty',
+                'wide'
+            )
+        }),
+    )
+
+    class Media:
+        js = ('image-loader.js', 'next-prev-links.js')
diff --git a/app/essays/build.py b/app/essays/build.py
new file mode 100644
index 0000000..cd6cc28
--- /dev/null
+++ b/app/essays/build.py
@@ -0,0 +1,59 @@
+import os
+from builder.base import BuildNew
+from django.urls import reverse
+from . import models
+
+
+class BuildSrc(BuildNew):
+
+    def build(self):
+        self.build_list_view(
+            base_path=reverse("src:list"),
+            paginate_by=99999
+        )
+        self.build_list_view(
+            base_path=reverse("src:list_books"),
+            paginate_by=99999
+        )
+        self.build_detail_view()
+        # These are the unique classes for this model:
+        # self.build_books_view()
+        self.build_topic_view()
+        self.build_feed("src:feed")
+
+    def build_topic_view(self):
+        for topic in models.Topic.objects.all():
+            url = reverse("src:list_topics", kwargs={'slug': topic.slug, })
+            path, slug = os.path.split(url)
+            response = self.client.get(url, HTTP_HOST='127.0.0.1')
+            self.write_file('%s/' % path, response.content, filename=slug)
+
+    def build_books_view(self):
+        for obj in models.Book.objects.all():
+            url = reverse("src:detail_book", kwargs={'slug': obj.slug, })
+            path, slug = os.path.split(url)
+            response = self.client.get(url, HTTP_HOST='127.0.0.1')
+            self.write_file('%s/' % path, response.content, filename=slug)
+
+
+def builder():
+    j = BuildSrc("src", "post")
+    j.build()
+
+
+"""
+
+
+
+    
+    def build_books(self):
+        path = 'src/books/'
+        c = Context({
+            'object_list': Book.objects.filter(status__exact=1),
+            'MEDIA_URL': settings.BAKED_MEDIA_URL,
+            'IMAGES_URL': settings.BAKED_IMAGES_URL
+        })
+        t = render_to_string('archives/src_books.html', c).encode('utf-8')
+        self.write_file(path, t)
+
+"""
diff --git a/app/essays/migrations/0001_initial.py b/app/essays/migrations/0001_initial.py
new file mode 100644
index 0000000..e315809
--- /dev/null
+++ b/app/essays/migrations/0001_initial.py
@@ -0,0 +1,51 @@
+# Generated by Django 2.1.5 on 2019-02-04 14:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('photos', '0018_auto_20161130_1218'),
+        ('sketches', '0002_auto_20180208_0743'),
+        ('books', '0007_auto_20190131_2351'),
+        ('taxonomy', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Essay',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('sub_title', models.CharField(blank=True, max_length=200)),
+                ('dek', models.TextField(blank=True)),
+                ('slug', models.SlugField(unique_for_date='pub_date')),
+                ('body_html', models.TextField(blank=True)),
+                ('body_markdown', models.TextField()),
+                ('pub_date', models.DateTimeField(verbose_name='Date published')),
+                ('last_updated', models.DateTimeField(auto_now=True)),
+                ('enable_comments', models.BooleanField(default=False)),
+                ('has_code', models.BooleanField(default=False)),
+                ('status', models.IntegerField(choices=[(0, 'Draft'), (1, 'Published')], default=0)),
+                ('meta_description', models.CharField(blank=True, max_length=256, null=True)),
+                ('post_type', models.IntegerField(choices=[(0, 'essay'), (1, 'tools'), (2, 'figment')], default=0)),
+                ('elsewhere', models.CharField(blank=True, max_length=400)),
+                ('has_video', models.BooleanField(blank=True, default=False)),
+                ('afterword', models.TextField(blank=True)),
+                ('books', models.ManyToManyField(blank=True, to='books.Book')),
+                ('featured_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='photos.LuxImage')),
+                ('field_notes', models.ManyToManyField(blank=True, to='sketches.Sketch')),
+                ('tags', taggit.managers.TaggableManager(blank=True, help_text='Topics Covered', through='taxonomy.TaggedItems', to='taxonomy.LuxTag', verbose_name='Tags')),
+            ],
+            options={
+                'verbose_name_plural': 'Essays',
+                'ordering': ('-pub_date',),
+                'get_latest_by': 'pub_date',
+            },
+        ),
+    ]
diff --git a/app/essays/migrations/0002_auto_20190204_1541.py b/app/essays/migrations/0002_auto_20190204_1541.py
new file mode 100644
index 0000000..f4e6744
--- /dev/null
+++ b/app/essays/migrations/0002_auto_20190204_1541.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.1.5 on 2019-02-04 15:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('essays', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='essay',
+            old_name='elsewhere',
+            new_name='originally_published_by',
+        ),
+        migrations.AddField(
+            model_name='essay',
+            name='originally_published_by_url',
+            field=models.CharField(blank=True, max_length=400),
+        ),
+    ]
diff --git a/app/essays/migrations/0003_essay_afterword_html.py b/app/essays/migrations/0003_essay_afterword_html.py
new file mode 100644
index 0000000..5f8301b
--- /dev/null
+++ b/app/essays/migrations/0003_essay_afterword_html.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.5 on 2019-02-04 16:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('essays', '0002_auto_20190204_1541'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='essay',
+            name='afterword_html',
+            field=models.TextField(blank=True),
+        ),
+    ]
diff --git a/app/essays/migrations/0004_auto_20190205_0830.py b/app/essays/migrations/0004_auto_20190205_0830.py
new file mode 100644
index 0000000..65e2e5d
--- /dev/null
+++ b/app/essays/migrations/0004_auto_20190205_0830.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.1.5 on 2019-02-05 08:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('essays', '0003_essay_afterword_html'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PostType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('dek', models.TextField(blank=True)),
+                ('slug', models.SlugField()),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='essay',
+            name='post_type',
+            field=models.IntegerField(choices=[(0, 'essays'), (1, 'tools'), (2, 'figments')], default=0),
+        ),
+    ]
diff --git a/app/essays/migrations/__init__.py b/app/essays/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/essays/migrations/__init__.py
diff --git a/app/essays/models.py b/app/essays/models.py
new file mode 100644
index 0000000..23a4cce
--- /dev/null
+++ b/app/essays/models.py
@@ -0,0 +1,100 @@
+from django.db import models
+from django.urls import reverse
+from django.contrib.sitemaps import Sitemap
+import datetime
+from itertools import chain
+
+from taggit.managers import TaggableManager
+
+from taxonomy.models import TaggedItems
+from utils.util import render_images, markdown_to_html
+from sketches.models import Sketch
+from books.models import Book
+from photos.models import LuxImage
+
+
+POST_TYPE = (
+    (0, 'essays'),
+    (1, 'tools'),
+    (2, 'figments'),
+)
+
+
+class PostType(models.Model):
+    name = models.CharField(max_length=200)
+    dek = models.TextField(blank=True)
+    slug = models.SlugField()
+
+    def __str__(self):
+        return self.name
+
+
+class Essay(models.Model):
+    title = models.CharField(max_length=200)
+    sub_title = models.CharField(max_length=200, blank=True)
+    dek = models.TextField(blank=True)
+    slug = models.SlugField(unique_for_date='pub_date')
+    body_html = models.TextField(blank=True)
+    body_markdown = models.TextField()
+    pub_date = models.DateTimeField('Date published')
+    last_updated = models.DateTimeField(auto_now=True)
+    enable_comments = models.BooleanField(default=False)
+    has_code = models.BooleanField(default=False)
+    PUB_STATUS = (
+        (0, 'Draft'),
+        (1, 'Published'),
+    )
+    status = models.IntegerField(choices=PUB_STATUS, default=0)
+    meta_description = models.CharField(max_length=256, null=True, blank=True)
+    post_type = models.IntegerField(choices=POST_TYPE, default=0)
+    tags = TaggableManager(through=TaggedItems, blank=True, help_text='Topics Covered')
+    originally_published_by = models.CharField(max_length=400, blank=True)
+    originally_published_by_url = models.CharField(max_length=400, blank=True)
+    featured_image = models.ForeignKey(LuxImage, on_delete=models.CASCADE, null=True, blank=True)
+    has_video = models.BooleanField(blank=True, default=False)
+    field_notes = models.ManyToManyField(Sketch, blank=True)
+    books = models.ManyToManyField(Book, blank=True)
+    afterword = models.TextField(blank=True)
+    afterword_html = models.TextField(blank=True)
+
+    class Meta:
+        ordering = ('-pub_date',)
+        get_latest_by = 'pub_date'
+        verbose_name_plural = 'Essays'
+
+    def __str__(self):
+        return self.title
+
+    def get_absolute_url(self):
+        return "/%s/%s" % (self.get_post_type_display(), self.slug)
+
+    def comment_period_open(self):
+        return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date
+
+    @property
+    def get_previous_published(self):
+        return self.get_previous_by_pub_date(status__exact=1)
+
+    @property
+    def get_next_published(self):
+        return self.get_next_by_pub_date(status__exact=1)
+
+    def save(self):
+        md = render_images(self.body_markdown)
+        self.body_html = markdown_to_html(md)
+        self.afterword_html = markdown_to_html(self.afterword)
+        super(Essay, self).save()
+
+
+class EssaySitemap(Sitemap):
+    changefreq = "never"
+    priority = 0.7
+    protocol = "https"
+
+    def items(self):
+        return list(chain(
+            Essay.objects.all(),
+        ))
+
+    def lastmod(self, obj):
+        return obj.pub_date
diff --git a/app/essays/urls.py b/app/essays/urls.py
new file mode 100644
index 0000000..408e959
--- /dev/null
+++ b/app/essays/urls.py
@@ -0,0 +1,28 @@
+from django.urls import path, re_path
+
+from . import views
+
+app_name = "essays"
+
+urlpatterns = [
+    #path(
+    #    r'topic/<str:slug>',
+    #    views.TopicListView.as_view(),
+    #    name="list_topics"
+    #),
+    path(
+        r'<str:slug>',
+        views.EntryDetailView.as_view(),
+        name="detail"
+    ),
+    path(
+        r'<str:slug>.txt',
+        views.EntryDetailViewTXT.as_view(),
+        name="detail-txt"
+    ),
+    path(
+        r'',
+        views.EssayListView.as_view(),
+        name="list",
+    ),
+]
diff --git a/app/essays/views.py b/app/essays/views.py
new file mode 100644
index 0000000..0fdaa63
--- /dev/null
+++ b/app/essays/views.py
@@ -0,0 +1,56 @@
+from django.views.generic import ListView
+from django.views.generic.detail import DetailView
+from django.contrib.syndication.views import Feed
+
+
+from .models import Essay, PostType, POST_TYPE
+
+
+class EssayListView(ListView):
+    model = Essay
+
+    def get_queryset(self, **kwargs):
+        t = self.request.path.split('/')[1]
+        type_reverse = dict((v, k) for k, v in POST_TYPE)
+        self.essay_type = t
+        qs = Essay.objects.filter(post_type=type_reverse[t])
+        return qs
+
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super(EssayListView, self).get_context_data(**kwargs)
+        context['essay_type'] = PostType.objects.get(slug=self.essay_type)
+        return context
+
+
+class EntryDetailView(DetailView):
+    model = Essay
+
+
+class EntryDetailViewTXT(EntryDetailView):
+    template_name = "essays/entry_detail.txt"
+
+
+'''
+class TopicListView(ListView):
+    template_name = 'archives/src_home.html'
+
+    def queryset(self):
+        return Post.objects.filter(topics__slug=self.kwargs['slug'])
+
+    def get_context_data(self, **kwargs):
+        # Call the base implementation first to get a context
+        context = super(TopicListView, self).get_context_data(**kwargs)
+        context['topic'] = Topic.objects.get(slug__exact=self.kwargs['slug'])
+        return context
+
+
+class SrcRSSFeedView(Feed):
+    title = "luxagraf:src Code and Technology"
+    link = "/src/"
+    description = "Latest postings to luxagraf.net/src"
+    description_template = 'feeds/blog_description.html'
+
+    def items(self):
+        return Post.objects.filter(status__exact=1).order_by('-pub_date')[:10]
+'''
diff --git a/app/income/views.py b/app/income/views.py
index fc22c0d..1c34068 100644
--- a/app/income/views.py
+++ b/app/income/views.py
@@ -4,7 +4,7 @@ from django.template.loader import render_to_string
 from django.http import HttpResponse
 from django.conf import settings
 
-from weasyprint import HTML, CSS
+#from weasyprint import HTML, CSS
 
 from .models import Invoice, InvoiceItem
 
@@ -45,8 +45,9 @@ class DownloadMonthlyInvoiceView(MonthlyInvoiceView):
             'invoice_number': self.object.id+23
         }
         t = render_to_string('details/invoice.html', c).encode('utf-8')
-        html = HTML(string=t, base_url=self.request.build_absolute_uri())
-        pdf = html.write_pdf(stylesheets=[CSS(settings.MEDIA_ROOT + '/pdf_gen.css')], presentational_hints=True)
-        response = HttpResponse(pdf, content_type='application/pdf')
-        response['Content-Disposition'] = 'inline; filename="invoice.pdf"'
+        #html = HTML(string=t, base_url=self.request.build_absolute_uri())
+        #pdf = html.write_pdf(stylesheets=[CSS(settings.MEDIA_ROOT + '/pdf_gen.css')], presentational_hints=True)
+        #response = HttpResponse(pdf, content_type='application/pdf')
+        #response['Content-Disposition'] = 'inline; filename="invoice.pdf"'
+        response = HttpResponse('', content_type='application/pdf')
         return response
diff --git a/app/jrnl/views.py b/app/jrnl/views.py
index 5dc627e..b2b0316 100644
--- a/app/jrnl/views.py
+++ b/app/jrnl/views.py
@@ -73,7 +73,6 @@ class EntryMonthArchiveView(MonthArchiveView):
 
 class EntryDetailView(DetailView):
     model = Entry
-    template_name = "details/entry.html"
     slug_field = "slug"
 
     def get_queryset(self):
diff --git a/app/pages/admin.py b/app/pages/admin.py
index abe903d..809c2a6 100644
--- a/app/pages/admin.py
+++ b/app/pages/admin.py
@@ -6,6 +6,7 @@ from django.db import models
 
 from pages.models import Page
 
+
 class PageEntryForm(forms.ModelForm):
     class Meta:
         model = Page
@@ -14,6 +15,7 @@ class PageEntryForm(forms.ModelForm):
             'body_markdown': forms.Textarea(attrs={'rows': 50, 'cols': 100}),
         }
 
+
 class PageAdmin(admin.ModelAdmin):
     form = PageEntryForm
     list_display = ('title', 'slug', 'path', 'app', 'build')
@@ -21,7 +23,7 @@ class PageAdmin(admin.ModelAdmin):
     prepopulated_fields = {"slug": ('title',)}
     fieldsets = (
         ('Page', {
-            'fields': ('title', 'body_markdown', 'build', ('slug', 'path', 'app')),
+            'fields': ('title', 'sub_title', 'body_markdown', 'build', ('slug', 'path', 'app')),
             'classes': ('show', 'extrapretty', 'wide')
         }),
         ('Metadata', {
diff --git a/app/pages/migrations/0005_auto_20190203_1434.py b/app/pages/migrations/0005_auto_20190203_1434.py
new file mode 100644
index 0000000..d1f0062
--- /dev/null
+++ b/app/pages/migrations/0005_auto_20190203_1434.py
@@ -0,0 +1,36 @@
+# Generated by Django 2.1.5 on 2019-02-03 14:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pages', '0004_page_build'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='page',
+            name='sub_title',
+            field=models.CharField(blank=True, max_length=300),
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='app',
+            field=models.CharField(blank=True, default='', max_length=50),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='meta_description',
+            field=models.CharField(blank=True, default='', max_length=256),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='path',
+            field=models.CharField(blank=True, default='', max_length=200),
+            preserve_default=False,
+        ),
+    ]
diff --git a/app/pages/models.py b/app/pages/models.py
index 73c33dd..fa2bbc3 100644
--- a/app/pages/models.py
+++ b/app/pages/models.py
@@ -7,12 +7,13 @@ from utils.util import markdown_to_html, render_images
 
 class Page(models.Model):
     title = models.CharField(max_length=200)
+    sub_title = models.CharField(max_length=300, blank=True)
     slug = models.SlugField()
     body_html = models.TextField(blank=True)
     body_markdown = models.TextField()
-    meta_description = models.CharField(max_length=256, null=True, blank=True)
-    path = models.CharField(max_length=200, null=True, blank=True)
-    app = models.CharField(max_length=50, null=True, blank=True)
+    meta_description = models.CharField(max_length=256, blank=True)
+    path = models.CharField(max_length=200, blank=True)
+    app = models.CharField(max_length=50, blank=True)
     build = models.BooleanField(default=True)
 
     def __str__(self):
diff --git a/app/utils/util.py b/app/utils/util.py
index 714403b..6d20a54 100644
--- a/app/utils/util.py
+++ b/app/utils/util.py
@@ -58,46 +58,50 @@ def parse_image(s):
             s = str(img).replace('[[base_url]]', settings.IMAGES_URL)
             return s
         else:
-            image_id = img['id'].split("image-")[1]
-            i = apps.get_model('photos', 'LuxImage').objects.get(pk=image_id)
-            caption = False
-            exif = False
-            cluster_class = None
-            is_cluster = False
-            extra = None
-            if cl[0] == 'cluster':
-                css_class = cl[0]
-                is_cluster = True
-                cluster_class = cl[1]
-                try:
-                    if cl[2] == 'caption':
+            try: 
+                image_id = img['id'].split("image-")[1]
+                i = apps.get_model('photos', 'LuxImage').objects.get(pk=image_id)
+                caption = False
+                exif = False
+                cluster_class = None
+                is_cluster = False
+                extra = None
+                if cl[0] == 'cluster':
+                    css_class = cl[0]
+                    is_cluster = True
+                    cluster_class = cl[1]
+                    try:
+                        if cl[2] == 'caption':
+                            caption = True
+                        elif cl[2] == 'exif':
+                            exif = True
+                        else:
+                            extra = cl[2]
+
+                        if len(cl) > 3:
+                            if cl[3] == 'exif':
+                                exif = True
+                    except:
+                        pass
+                elif cl[0] != 'cluster' and len(cl) > 1:
+                    css_class = cl[0]
+                    if cl[1] == 'caption':
                         caption = True
-                    elif cl[2] == 'exif':
+                    if cl[1] == 'exif':
                         exif = True
-                    else:
-                        extra = cl[2]
-
-                    if len(cl) > 3:
-                        if cl[3] == 'exif':
-                            exif = True
-                except:
-                    pass
-            elif cl[0] != 'cluster' and len(cl) > 1:
-                css_class = cl[0]
-                if cl[1] == 'caption':
-                    caption = True
-                if cl[1] == 'exif':
-                    exif = True
-            elif cl[0] != 'cluster' and len(cl) > 2:
-                css_class = cl[0]
-                if cl[1] == 'caption':
-                    caption = True
-                if cl[2] == 'exif':
-                    exif = True
-                print('caption'+str(caption))
-            else:
-                css_class = cl[0]
-            return render_to_string("lib/img_%s.html" % css_class, {'image': i, 'caption': caption, 'exif': exif, 'is_cluster': is_cluster, 'cluster_class': cluster_class, 'extra': extra})
+                elif cl[0] != 'cluster' and len(cl) > 2:
+                    css_class = cl[0]
+                    if cl[1] == 'caption':
+                        caption = True
+                    if cl[2] == 'exif':
+                        exif = True
+                    print('caption'+str(caption))
+                else:
+                    css_class = cl[0]
+                return render_to_string("lib/img_%s.html" % css_class, {'image': i, 'caption': caption, 'exif': exif, 'is_cluster': is_cluster, 'cluster_class': cluster_class, 'extra': extra})
+            except KeyError:
+                ''' regular inline image, not a luximage '''
+                return str(img)
 
 
 def render_images(s):
diff --git a/config/base_urls.py b/config/base_urls.py
index 3c22638..6f2f1e6 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -48,6 +48,8 @@ urlpatterns = [
     path(r'dialogues/', include('sightings.urls', namespace='sightings')),
     path(r'field-notes/', include('sketches.urls', namespace='sketches')),
     path(r'src/', include('src.urls', namespace='src')),
+    path(r'tools/', include('essays.urls', namespace='tools')),
+    path(r'essays/', include('essays.urls', namespace='essays')),
     path(r'figments/', include('figments.urls', namespace='figments')),
     path(r'work/', include('resume.urls', namespace='resume')),
     path(r'map', include('locations.urls', namespace='map')),
diff --git a/config/requirements.txt b/config/requirements.txt
index 64ccef5..982fbbc 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -40,3 +40,4 @@ twython==3.6.0
 typogrify==2.0.7
 urllib3==1.22
 uWSGI==2.0.15
+pip install https://github.com/smarnach/pyexiftool/tarball/master
diff --git a/design/sass/_archives.scss b/design/sass/_archives.scss
index 6e2e66a..a2caba9 100644
--- a/design/sass/_archives.scss
+++ b/design/sass/_archives.scss
@@ -64,6 +64,45 @@
     margin: 0;
 }
 
+.archive-list {
+    @include constrain_narrow;
+    @include breakpoint(epsilon) {
+    }
+    text-align: left;
+    h1 {
+        text-align: left;
+        @include fancy_sans;
+    }
+    span {
+        @include fancy_sans;
+        @include smcaps;
+        @include fontsize(13);
+        font-weight: bold;
+        color: #999;
+    }
+    ul {
+        padding: 0;
+        list-style-type: none;
+    }
+    a { 
+        text-decoration: none;
+        color: lighten($body_font_color, 20);
+        &:hover {
+            color: $link_color;
+        }
+    }
+    h2 {
+        font-family: $fancy_headline_font_serif;
+        @include fontsize(32);
+        margin: 0;
+        line-height: 1.1;
+    }
+    p {
+        margin: 0;
+        @include fontsize(20);
+        font-family: $fancy_italic;
+    }
+}
 // Specific pages vary slightly
 // Books
 .book-grid {
@@ -228,6 +267,7 @@
     }
     .post-location {
         color: lighten($body_font_light, 5);
+
     }
     .btn {
         @include smcaps;
diff --git a/design/sass/_comments.scss b/design/sass/_comments.scss
index 52ff6b1..45c81dc 100644
--- a/design/sass/_comments.scss
+++ b/design/sass/_comments.scss
@@ -59,8 +59,8 @@
 
 .comment--form--wrapper {
     @include constrain_narrow();
-    &:before {
-        @include faded_line_after;
+    p {
+        font-family: $fancy_headline_font_serif;
     }
 }
 .comment--form--header {
diff --git a/design/sass/_details.scss b/design/sass/_details.scss
index 8cadba4..ffc32f5 100644
--- a/design/sass/_details.scss
+++ b/design/sass/_details.scss
@@ -1,12 +1,31 @@
 .detail {
+    #article {
+        padding-bottom: 2rem;
+        border-bottom: 3px double #efefef;
+    }
     article {
+        font-family: mffweb, Georgia, 'Times New Roman', serif;
         @include constrain_narrow;    
         margin-top: 4rem;
+        h1 {
+            font-family: mffweb, Georgia, 'Times New Roman', serif;
+            line-height: 1em;
+            letter-spacing: -1px;
+            @include fontsize(48);
+            font-weight: normal;
+            margin-bottom: .25rem
+        }
         ul {
             text-align: left;
             @include fontsize(18);
         }
     }
+    .post-subtitle {
+        font-family: $fancy_italic;
+        font-size: 1.5rem;
+        line-height: 1;
+        margin-top: .5rem;
+    }
     .map {
         width: 100vw;
         position: relative;
@@ -16,12 +35,39 @@
         margin-right: -50vw;
     }
     .post-header {
+        @include fancy_sans;
+        @include fontsize(18);
+        color: lighten($body_font_color, 20);
+        padding-bottom: 2.6rem;
+        border-bottom: 1px solid #efefef;
         @include breakpoint(alpha) {
             text-align: left;
         }
         time {
         }
     }
+    p:first-of-type {
+        margin-top: 2.6rem;
+    }
+    h4, h5 {
+        @include fancy_sans;
+        margin: 3rem 0 0 0;
+    }
+    h4 + p, .afterward h4 + p {
+        margin-top: .125rem;
+    }
+    h5 {
+        margin: 0
+    }
+    .afterward {
+        font-family: $fancy_italic;
+        h4 {
+            margin-bottom: 0;
+        }
+    }
+    p.small {
+        @include fontsize(18);
+    }
     .sci {
         text-align: center;
         @include fontsize(24);
@@ -33,6 +79,12 @@
         @include fontsize(18);
         margin-bottom: 2rem;
     }
+    ul {
+        list-style: circle;
+        margin-left: 2.5em;
+        list-style-position: outside;
+        margin-bottom: 2.4em;
+    }
     // Ack, id selector, so wrong, but easy handles the slightly different footer
     // in the dialogue section that lists all the sightings
     #endnode {
@@ -69,11 +121,31 @@
         margin-right: -49vw;
     }
 }
-
+h4.post-source {
+    @include fontsize(14);
+    @include smcaps;
+    display: inline-block;
+    margin-top: 0em;
+    padding-top: 1em;
+    padding-bottom: 0em;
+    border-top: 1px solid #efefef;
+    margin-bottom: 0;
+    font-weight: bold;
+    color: #b6b6b6;
+    a {
+        color: #b6b6b6;
+        &:hover {
+            color: $link_color;
+        }
+    }
+}
 //### PAGE NAVIGATION ###
+.nav-wrapper {
+    @include constrain_narrow();
+    border-bottom: 3px double #efefef;
+}
 #page-navigation {
     margin: 2em auto;
-    @include constrain_narrow();
     text-align: center;
     display: table;
     ul {
@@ -90,16 +162,18 @@
         text-align: center;
     }
     span {
+        @include fancy_sans;
+        @include fontsize(14);
         min-width: 70px;
         display: block;
         text-align: right;
         margin-right: 10px;
-        margin-top: 2px;
         float: left;
     }
     a {
         display: block;
         float: left;
+        font-family: $fancy_headline_font_serif;
         text-align: left;
         font-style: italic;
         color: $brown;
@@ -110,6 +184,7 @@
 .entry-footer {
     @extend %clearfix;
     @include constrain_narrow;
+    border-bottom: 3px double #efefef;
     margin-top: 2em;
     text-align: left;
     h3 {
@@ -148,7 +223,7 @@
         }
     }
     @include breakpoint(beta) {
-        margin-bottom: 4em;
+        padding-bottom: 2rem;
         #wildlife {  
             max-width: 55%;
             float: left;
@@ -165,14 +240,6 @@
     }
     aside {
         @extend %clearfix;
-        margin-bottom: 3em;
-    }
-    &:after, &:before {
-        @include faded_line_after;
-        @include breakpoint(beta) {
-            display: block;
-            margin-bottom: 2em;
-        }
     }
 }
 #field_notes {
@@ -197,12 +264,6 @@
     margin: 1em auto 0 auto;
     padding: 0;
     list-style-type: none;
-    &:before, &:after {
-        @include faded_line_after;
-        @include breakpoint(beta) {
-            margin-bottom: 2em;
-        }
-    }
     p {
         font-size: 1rem;
         line-height: 1.4;
@@ -229,7 +290,6 @@ sup {
 }
 
 // ### Books ###
-
 .book-metadata {
     text-align: left;
     dd {
diff --git a/design/sass/_fonts.scss b/design/sass/_fonts.scss
index dfe632a..ed4a212 100644
--- a/design/sass/_fonts.scss
+++ b/design/sass/_fonts.scss
@@ -1,10 +1,34 @@
 @font-face {
     font-family: 'carrois_gothicregular';
-    src: url('carroisgothic-regular-webfont.eot');
-    src: url('carroisgothic-regular-webfont.eot?#iefix') format('embedded-opentype'),
-         url('carroisgothic-regular-webfont.woff') format('woff'),
-         url('carroisgothic-regular-webfont.ttf') format('truetype');
+    src: url('/media/fonts/carroisgothic-regular-webfont.eot');
+    src: url('/media/fonts/carroisgothic-regular-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/media/fonts/carroisgothic-regular-webfont.woff') format('woff'),
+         url('/media/fonts/carroisgothic-regular-webfont.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 
 }
+
+@font-face {
+    font-family: 'mffweb';
+    src: url('/media/fonts/ffmpb.woff2') format('woff2');
+    src: url('/media/fonts/ffmpb.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'mffnweb';
+    src: url('/media/fonts/ffmn.woff2') format('woff2');
+    src: url('/media/fonts/ffmn.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'mffmbi';
+    src: url('/media/fonts/ffmbi.woff2') format('woff2');
+    src: url('/media/fonts/ffmbi.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
diff --git a/design/sass/_global.scss b/design/sass/_global.scss
index 6807fa4..20f9056 100644
--- a/design/sass/_global.scss
+++ b/design/sass/_global.scss
@@ -154,6 +154,22 @@ h3 {
         line-height: 1.4;
     }
 }
+h4 {
+    @include fontsize(20);
+    text-align: left;
+    @include breakpoint(gamma){
+        @include fontsize(22);
+        line-height: 1.4;
+    }
+}
+h5 {
+    @include fontsize(16);
+    text-align: left;
+    @include breakpoint(gamma){
+        @include fontsize(18);
+        line-height: 1.4;
+    }
+}
 //**************  Universals ************************
 .hide {
     display: none;
diff --git a/design/sass/_header.scss b/design/sass/_header.scss
index 9c00f5e..a4f0386 100644
--- a/design/sass/_header.scss
+++ b/design/sass/_header.scss
@@ -95,12 +95,14 @@ nav[role="navigation"] {
     padding: 0.25em 0.5em;
     a {
         text-decoration: none;
-        color: #505050;
+        color: lighten(#505050, 20);
     }
     ul {
         @include smcaps;
+        @include fancy_sans;
+        @include fontsize(13);
         max-width: 100%;
-        font-weight: 300;
+        font-weight: 600;
         margin-top: 0.5em;
         margin-bottom: 0.5em;
         padding: 0;
@@ -140,7 +142,7 @@ nav[role="navigation"] {
     @extend %clearfix;
     margin-bottom: 1em;
     @include breakpoint(beta) {
-        border-bottom: 1px $brown solid;
+        border-bottom: 1px #e4e4e4 solid;
         position: relative;
     }
     @include breakpoint(gamma) {
@@ -149,11 +151,11 @@ nav[role="navigation"] {
         margin-right: auto;
     }
     @include breakpoint(delta) {
-        margin-top: 1.5em; 
+        margin-top: 1.3rem; 
         max-width: $breakpoint-delta;
     }
     @include breakpoint(epsilon) {
-        margin-top: 1.5em; 
+        margin-top: 1.3rem; 
         max-width: $max_width;
     }
 }
diff --git a/design/sass/_images.scss b/design/sass/_images.scss
index 298171e..faf6e88 100644
--- a/design/sass/_images.scss
+++ b/design/sass/_images.scss
@@ -97,3 +97,12 @@ p + .picwide {
     width: 100%; 
     height: 100%; 
 }
+.pullpicleft {
+    display: none;
+    @include breakpoint(gamma) {
+        display: block;
+        float: left;
+        margin-left: -280px;
+        padding-right: 1rem;
+    }
+}
diff --git a/design/sass/_mixins.scss b/design/sass/_mixins.scss
index 1df6cad..2de8000 100644
--- a/design/sass/_mixins.scss
+++ b/design/sass/_mixins.scss
@@ -5,6 +5,8 @@ $orange: #b53a04;
 $link_color: #b53a04;
 
 $headline_font_serif: Georgia, 'Times New Roman', serif;
+$fancy_headline_font_serif: mffweb, Georgia, 'Times New Roman', serif;
+$fancy_italic: mffmbi, Georgia, 'Times New Roman', serif; 
 
 $body_p_font: normal 100% / 1.5 Georgia, Cambria, "Times New Roman", Times, serif;
 $body_font_color: $brown;
@@ -13,7 +15,7 @@ $body_font_light: #b3aeae;
 $archive_p_line_height: 1.6;
 //$light;
 $narrow-beta-width: 640px;
-$narrow-max-width: 700px;
+$narrow-max-width: 750px;
 $max_width: 1440px;
 
 @mixin smcaps {
@@ -49,7 +51,7 @@ $max_width: 1440px;
     font-family: sans-serif;
 }
 @mixin fancy-sans {
-    font-family: Helvetica, sans-serif;
+    font-family: mffnweb, Helvetica, sans-serif;
 }
 @mixin fancy-sans-bold {
     font-family: Helvetica, sans-serif;
diff --git a/design/sass/_photos.scss b/design/sass/_photos.scss
index c8fbb95..0ae3b0d 100644
--- a/design/sass/_photos.scss
+++ b/design/sass/_photos.scss
@@ -229,6 +229,15 @@
 //  }
 //}
 
+.circle-pic {
+    border-radius: 50%;
+    border: 3px solid #000;
+}
+#about-luxagraf .circle-pic {
+    float: left;
+    margin-left: -250px;
+}
+
 //lightbox stuff from https://github.com/felixhagspiel/jsOnlyLightbox/blob/master/css/lightbox.scss
 
 /**
diff --git a/design/templates/base.html b/design/templates/base.html
index d0d1618..ffeb1d6 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -37,7 +37,8 @@
         </header>
         <nav role="navigation" class="bl">
             <ul>
-                <li id="laverdad"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li>
+                <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="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/details/entry-bak.txt b/design/templates/details/entry-bak.txt
deleted file mode 100644
index 4244d0e..0000000
--- a/design/templates/details/entry-bak.txt
+++ /dev/null
@@ -1,13 +0,0 @@
----
-template: {{object.get_template_name_display}}
-point: {{object.latitude}},{{object.longitude}}
-location: {{object.location.name|safe}},{{object.state.name|safe}},{{object.country.name|safe}}
-image: {{object.get_image_url}}
-desc: {{object.meta_description|safe}}
-dek: {{object.dek|safe}}
-pub_date: {{object.pub_date}}
-title: {{object.title|safe}}
-
----
-
-{{object.body_markdown|safe}}
diff --git a/design/templates/details/page.html b/design/templates/details/page.html
index d4435b3..d6cc4de 100644
--- a/design/templates/details/page.html
+++ b/design/templates/details/page.html
@@ -3,7 +3,7 @@
 {% block pagetitle %}Luxagraf | {{object.title}}{% endblock %}
 {% block metadescription %}{{object.meta_description}}{% endblock %}
 {%block htmlclass%}class="detail"{%endblock%}
-{%block bodyid%}id="{{object.title|lower}}"{%endblock%}								
+{%block bodyid%}id="{{object.title|slugify}}"{%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>
@@ -14,6 +14,7 @@
     <article>
         <header class="post-header">
         <h1 class="post-title">{{object.title}}</h1>
+        {%if object.sub_title %}<h2 class="post-subtitle">{{object.sub_title}}</h2>{%endif%}
         </header>
         <div class="post-article">
         {{object.body_html|safe|smartypants|widont}}
diff --git a/design/templates/details/entry.txt b/design/templates/essays/entry_detail.txt
index 547ce79..547ce79 100644
--- a/design/templates/details/entry.txt
+++ b/design/templates/essays/entry_detail.txt
diff --git a/design/templates/essays/entry_list.html b/design/templates/essays/entry_list.html
new file mode 100644
index 0000000..d58bd05
--- /dev/null
+++ b/design/templates/essays/entry_list.html
@@ -0,0 +1,45 @@
+{% 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/essays/essay_detail.html b/design/templates/essays/essay_detail.html
new file mode 100644
index 0000000..9aae254
--- /dev/null
+++ b/design/templates/essays/essay_detail.html
@@ -0,0 +1,173 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+
+{% block pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}{%endcomment%}{% endblock %}
+
+{% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
+{%block extrahead%}
+{% if object.has_code %}
+    <link rel="stylesheet" href="/media/src/solarized.css" type="text/css" media="screen"/>
+{%endif %}
+    <link rel="canonical" href="https://luxagraf.net{{object.get_absolute_url}}" />
+
+    <meta property="og:type" content="article" />
+    <meta property="og:title" content="{{object.title|safe}}" />
+    <meta property="og:url" content="https://luxagraf.net{{object.get_absolute_url}}" />
+    <meta property="og:description" content="{% if object.meta_description %}{{object.meta_description}}{%else%}{{object.sub_title}}{%endif%}" />
+    <meta property="article:published_time" content="{{object.pub_date|date:'c'}}" />
+    <meta property="article:author" content="Scott Gilbertson" />
+    <meta property="og:site_name" content="Luxagraf" />
+    <meta property="og:image" content="{{self.get_featured_image}}" />
+    <meta property="og:locale" content="en_US" />
+    <meta name="twitter:card" content="summary_large_image"/>
+    <meta name="twitter:description" content="{% if object.meta_description %}{{object.meta_description}}{%else%}{{object.sub_title}}{%endif%}"/>
+    <meta name="twitter:title" content="{{object.title|safe}}"/>
+    <meta name="twitter:site" content="@luxagraf"/>
+    <meta name="twitter:domain" content="luxagraf"/>{% if object.featured_image %}
+    <meta name="twitter:image:src" content="{{object.featured_image.get_image_url}}"/>{%endif%}
+    <meta name="twitter:creator" content="@luxagraf"/>
+{%endblock%}
+{%block htmlclass%}{% with object.template_name as t %}
+class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}{%if t == 4 or t == 5 %} black{%endif%}"{%endwith%}{%endblock%}
+							
+{%block bodyid %}{% if object.get_post_type_display == 'tools' %}class="src"{% endif %}{%endblock%}
+				
+{% block primary %}		
+    <main>
+    <article class="h-entry hentry {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article">
+            <header id="header" class="post-header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
+                <h1 class="p-name entry-title post-title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
+                <h2 class="post-subtitle">{{object.sub_title|smartypants|safe}}</h2>
+                <h4 class="post-source">Originally Published By: <a href="{{object.originally_published_by_url}}" title="View {{object.title}} on {{object.originally_published_by}}">{{object.originally_published_by}}</a></h4>
+                <time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+                <aside 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|safe}}</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|safe}}</a>{%endif%}
+                    {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%}
+                </aside>
+            </header>
+        <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
+            {{object.body_html|safe|smartypants}}
+        </div>
+        <div class="afterward">
+            <h4>Afterward</h4>
+            {{object.afterword_html|smartypants|safe}}
+        </div>
+        {%if wildlife or object.field_notes.all or object.books.all %}<div class="entry-footer">{%if wildlife %}
+            <aside id="wildlife">
+                <h3>Fauna and Flora</h3>
+                {% regroup wildlife by ap.apclass.get_kind_display as wildlife_list %}
+                <ul>
+                {% for object_list in wildlife_list %}
+                <li class="grouper">{{object_list.grouper}}<ul>
+                {% for object in object_list.list %}
+                <li>{%if object.ap.body_markdown%}<a href="{% url 'sightings:detail' object.ap.slug %}">{{object}}</a>{%else%}{{object}}{%endif%} </li>
+                {% endfor %}</ul>
+                    {% endfor %}</ul>
+            </aside>
+            {% endif %}{%if object.field_notes.all %}
+            <aside {% if wildlife %}class="margin-left-none" {%endif%}id="field_notes">
+                <h3>Field Notes</h3>
+                <ul>{% for obj in object.field_notes.all %}
+                <li><a href="{% url 'sketches:detail' year=obj.pub_date.year month=obj.pub_date|date:"m"  slug=obj.slug %}">{{obj}}</a></li>
+                {% endfor %}</ul>
+            </aside>{% endif %}
+            {%if object.books.all %}
+            <aside id="recommended-reading" {%if object.field_notes.all and wildlife %}class="rr-clear{%endif%}" >
+                <h3>Recommended Reading</h3>
+                <ul>{% for obj in object.books.all %}
+                    <li><a href="{% url 'books:detail' slug=obj.slug %}"><img src="{{obj.get_small_image_url}}" /></a></li>
+                {% endfor %}</ul>
+            </aside>{% endif %}
+        </div>{%endif%}
+        </article>
+
+        {% comment %}    <div class="mailing-list--wrapper">
+    <h5>If you enjoyed this, you should join the mailing&nbsp;list&hellip;</h5>
+        {% include 'mailing_list.html' %}
+    </div> {% endcomment %}
+    </main>
+    {% 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>
+{% render_comment_list for object %}
+{%endif%}
+{% render_comment_form for object %}
+{% else %}
+<p class="comments--header" style="text-align: center">Sorry, comments have been disabled for this post.</p>
+{%endif%}
+{% endblock %}
+{% block js %}
+<script type="text/javascript">
+document.addEventListener("DOMContentLoaded", function(event) { 
+    var leaflet = document.createElement('script');
+    leaflet.src = "/media/js/leaflet-master/leaflet-mod.js";
+    document.body.appendChild(leaflet);
+    var lightbox = document.createElement('script');
+    lightbox.src = "/media/js/lightbox.js";
+    document.body.appendChild(lightbox);
+    leaflet.onload = function(){
+        var detail = document.createElement('script');
+        detail.src = "/media/js/detail.min.js";
+        document.body.appendChild(detail);
+        {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %}
+        detail.onload = function(){
+            createMap();
+            var open = false;
+        }
+        {%endif%}{%endwith%}
+    }
+
+    lightbox.onload = function() {
+        var opts= {
+            //nextOnClick: false,
+            captions: true,
+            onload: function(){
+                var im = document.getElementById("jslghtbx-contentwrapper");
+                var link = im.appendChild(document.createElement('a'))
+                link.href = im.firstChild.src;
+                link.innerHTML= "open ";
+                link.target = "_blank";
+                link.setAttribute('class', 'p-link');
+                im.appendChild(link);
+            }
+        }; 
+        var lightbox = new Lightbox();
+        lightbox.load(opts);
+    }
+    {% if object.enable_comments %}
+{% get_comment_count for object as comment_count %}
+{%if comment_count > 0 %}
+    //delay loading of gravatar images using noscript data-hash attribute
+    dataattr = document.getElementsByClassName("datahashloader");
+    for(var i=0; i<dataattr.length; i++) {
+        var c = dataattr[i].parentNode;
+        var img = document.createElement("img");
+        img.src = 'https://images.luxagraf.net/gravcache/' + dataattr[i].getAttribute('data-hash') + '.jpg';
+        img.className += "gravatar";
+        c.insertBefore(img, c.childNodes[3]);
+    }
+{%endif%}
+{%endif%}
+{% if object.has_video %}
+var tester = document.getElementsByClassName("vidauto");
+var wrapper = document.getElementById('wrapper');
+var dist = 100;
+
+window.onscroll = function() {
+    for (var i=0; i<tester.length; i++) {
+        checkVisible(tester[i]) ? tester[i].play() : tester[i].pause();
+    }
+};
+
+function checkVisible(elm) {
+  var rect = elm.getBoundingClientRect();
+  var viewHeight = Math.max(document.documentElement.clientHeight, window.innerHeight);
+  return !(rect.bottom < 0 || rect.top - viewHeight >= 0);
+}
+{%endif%}
+
+});
+</script>
+{%endblock%}
diff --git a/design/templates/essays/essay_list.html b/design/templates/essays/essay_list.html
new file mode 100644
index 0000000..6ea89a3
--- /dev/null
+++ b/design/templates/essays/essay_list.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load comments %}
+
+{% block pagetitle %}Luxagraf | {{essay_type}}{% endblock %}
+
+{% block metadescription %}Luxagraf — Collected writing: essays on ecosophia, mediation, life, photography, tools, walking, and other ephemera.{% 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>
+    <li>{{essay_type|capfirst}}</li>
+    </ul>
+    <main role="main" id="essay-archive" class="essay-archive archive-list">
+        <h1 class="topic-hed">{{essay_type.name|capfirst}}</h1>
+        <h6>{{essay_type.dek}}</h6>
+    <ul>{% for object in object_list %}
+        <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
+            <span class="date dt-published">{{object.pub_date|date:"F Y"}}</span>
+            <a href="{{object.get_absolute_url}}">
+            <h2>{{object.title|safe|smartypants|widont}}</h2>
+            <p class="p-summary">{% if object.sub_title %}{{object.sub_title|safe|smartypants}}{%else%}{{object.metadescription}}{%endif%}</p>
+            </a>
+        </li>
+        {%endfor%}</ul>
+    </main>
+{%endblock%}
diff --git a/design/templates/jrnl/entry.txt b/design/templates/jrnl/entry.txt
new file mode 100644
index 0000000..547ce79
--- /dev/null
+++ b/design/templates/jrnl/entry.txt
@@ -0,0 +1,8 @@
+{{object.title|safe}}
+{% for letter in object.title %}={%endfor%}
+
+    by Scott Gilbertson
+    <{{SITE_URL}}{{object.get_absolute_url}}>
+    {{object.pub_date|date:"l, d F Y"}}
+
+{{object.body_markdown|safe}}
diff --git a/design/templates/details/entry.html b/design/templates/jrnl/entry_detail.html
index 2804da3..c7ad0a6 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/jrnl/entry_detail.html
@@ -38,18 +38,17 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
     <main>
     <article class="h-entry hentry {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}" itemscope itemType="http://schema.org/Article">
             <header id="header" class="post-header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
-                <h1 class="p-name entry-title post-title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+                <h1 class="p-name entry-title post-title" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
                 <time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <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>
                 <aside 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|safe}}</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|safe}}</a>{%endif%}
                     {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %} &ndash;&nbsp;<a href="" onclick="showMap({{object.latitude}}, {{object.longitude}}, { type:'point', lat:'{{object.latitude}}', lon:'{{object.longitude}}'}); return false;" title="see a map">Map</a>{%endif%}{%endwith%}
                 </aside>
             </header>
         <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}" itemprop="articleBody">
-            {{object.body_html|safe|smartypants|widont}}
+            {{object.body_html|safe|smartypants}}
         </div>
-        <div class="entry-footer">{%if wildlife %}
+        {%if wildlife or object.field_notes.all or object.books.all %}<div class="entry-footer">{%if wildlife %}
             <aside id="wildlife">
                 <h3>Fauna and Flora</h3>
                 {% regroup wildlife by ap.apclass.get_kind_display as wildlife_list %}
@@ -75,11 +74,12 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
                     <li><a href="{% url 'books:detail' slug=obj.slug %}"><img src="{{obj.get_small_image_url}}" /></a></li>
                 {% endfor %}</ul>
             </aside>{% endif %}
-        </div>
+        </div>{%endif%}
         </article>
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}
-        <nav id="page-navigation">
+        <div class="nav-wrapper">
+        <nav id="page-navigation" {%if wildlife or object.field_notes.all or object.books.all %}{%else%}class="page-border-top"{%endif%}>
             <ul>{% if prev%}
                 <li id="prev"><span class="bl">Previous:</span> 
                     <a href="{{ prev.get_absolute_url }}" rel="prev" title=" {{prev.title}}">{{prev.title|safe}}</a>
@@ -89,6 +89,7 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
                 </li>{%endif%}
             </ul>
         </nav>{%endwith%}{%endwith%}
+        </div>
 
         {% comment %}    <div class="mailing-list--wrapper">
     <h5>If you enjoyed this, you should join the mailing&nbsp;list&hellip;</h5>
diff --git a/design/templates/lib/img_archive.html b/design/templates/lib/img_archive.html
index 22b0cce..c256ebe 100644
--- a/design/templates/lib/img_archive.html
+++ b/design/templates/lib/img_archive.html
@@ -1,4 +1,3 @@
-{% load get_image_by_size %}
 <img sizes="(max-width: 728px) 100vw, (min-width: 729px) 520px"
      srcset="{{image.get_featured_jrnl}} 520w, {{image.get_picwide_sm}} 720w"
      src="{{image.get_featured_jrnl}}"
diff --git a/design/templates/lib/img_picfull.html b/design/templates/lib/img_picfull.html
index 98e8dc4..babcc76 100644
--- a/design/templates/lib/img_picfull.html
+++ b/design/templates/lib/img_picfull.html
@@ -2,7 +2,7 @@
 {% load get_image_width %}
 {% if caption %}
 <figure class="picfull">{%endif%}
-<a href="{%get_image_by_size image "original"%} " title="view larger image"><img class="picfull" sizes="(max-width: 680px) 100vw, (min-width: 681) 680px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {% if image.is_portait %}{% get_image_width image size.height %}w{%else%}{{size.width}}w{%endif%}{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
+<a href="{%get_image_by_size image "original"%} " title="view larger image"><img class="picfull" sizes="(max-width: 680px) 100vw, (min-width: 681) 750px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {% if image.is_portait %}{% get_image_width image size.height %}w{%else%}{{size.width}}w{%endif%}{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
    {% for size in image.sizes.all%}{%if forloop.first %} src="{% get_image_by_size image size.name %}"{%endif%}{%endfor%} alt="{{image.alt}} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}luxagraf{%endif%}" data-jslghtbx="{%get_image_by_size image "original"%}" data-jslghtbx-group="group" {% if caption%}data-jslghtbx-caption="{{image.caption}}"{%endif%}></a>
 {% if caption %}<figcaption>{{image.caption|safe}}</figcaption>
 </figure>
diff --git a/site/media/img/bio.jpg b/site/media/img/bio.jpg
index 5ac5b10..0dcea29 100644
--- a/site/media/img/bio.jpg
+++ b/site/media/img/bio.jpg