57 files changed, 126 insertions, 169 deletions
diff --git a/app/builder/views.py b/app/builder/views.py
index 211b585..c39297d 100644
--- a/app/builder/views.py
+++ b/app/builder/views.py
@@ -2,11 +2,11 @@ from django.shortcuts import render
 from django.template import RequestContext
 #from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPhotos, BuildProjects, BuildSitemap
 #from jrnl.build import archive_builder, detail_builder, home_builder, rss_builder, map_builder
-from resume.build import pub_builder, resume_builder
+#from resume.build import pub_builder, resume_builder
 from books.build import builder as book_builder
 from sightings.build import builder as sightings_builder
 from pages.build import BuildPages, BuildHome
-from posts.build import BuildJrnl, BuildFieldNotes, BuildSrc, BuildGuide, BuildEssays, BuildRange, BuildFriends, BuildFilms, BuildTrips, BuildSitemap
+from posts.build import BuildJrnl, BuildFieldNotes, BuildSrc, BuildGuide, BuildEssays, BuildRange, BuildFriends, BuildFilms, BuildTrips, BuildSitemap, BuildPhotoEssays
 
 def do_build(request):
     section = request.GET.get('id', '')
@@ -28,6 +28,9 @@ def do_build(request):
     elif section == 'homepage':
         context = {'message': 'Writing index to Disk'}
         BuildHome("pages", "homepage").build()
+    elif section == 'photos':
+        context = {'message': 'Writing Photo Essasy to Disk'}
+        BuildPhotoEssays("posts", "post").build()
     elif section == 'films':
         context = {'message': 'Writing films to Disk'}
         BuildFilms("posts", "post").build()
diff --git a/app/gtd/admin.py b/app/gtd/admin.py
index 7335727..49520f2 100644
--- a/app/gtd/admin.py
+++ b/app/gtd/admin.py
@@ -5,7 +5,9 @@ from utils.widgets import AdminImageWidget, LGEntryForm
 from .models import (
     WiredNote,
     WiredPost,
-    WiredUpdate
+    WiredUpdate,
+    GTDNote,
+    GTDProject
 )
 @admin.register(WiredPost)
 class WiredPostAdmin(admin.ModelAdmin):
@@ -22,3 +24,8 @@ class WiredPostAdmin(admin.ModelAdmin):
 class WiredUpdateAdmin(admin.ModelAdmin):
     list_display = ('name', 'date')
 
+
+@admin.register(GTDNote)
+class GTDNoteAdmin(admin.ModelAdmin):
+    list_display = ('title', 'project','url', 'note_type' )
+    list_filter = ['project', 'note_type']
diff --git a/app/posts/build.py b/app/posts/build.py
index fdfcd1a..ba0fe27 100644
--- a/app/posts/build.py
+++ b/app/posts/build.py
@@ -175,6 +175,18 @@ class BuildFilms(BuildNew):
         self.build_detail_view()
 
 
+class BuildPhotoEssays(BuildNew):
+
+    def get_model_queryset(self):
+        return self.model.objects.filter(post_type=PostType.PHOTO_ESSAY).filter(status__exact=1).order_by('-pub_date')
+
+    def build(self):
+        self.build_list_view(
+            base_path=reverse("photo_essay:list"),
+            paginate_by=30
+        )
+        self.build_detail_view()
+
 class BuildTrips(BuildNew):
 
     def get_model_queryset(self):
diff --git a/app/posts/models.py b/app/posts/models.py
index 6179fbe..ba578b8 100644
--- a/app/posts/models.py
+++ b/app/posts/models.py
@@ -135,6 +135,8 @@ class Post(models.Model):
         return self.title
 
     def get_absolute_url(self):
+        if self.post_type == PostType.PHOTO_ESSAY:
+            return reverse('photo_essay:detail', kwargs={"slug": self.slug})
         if self.post_type == PostType.ESSAY:
             return reverse('essays:detail', kwargs={"cat": self.get_post_topic_display(), "slug": self.slug})
         if self.post_type == PostType.SRC:
diff --git a/app/posts/templates/photo_essay_detail.html b/app/posts/templates/photo_essay_detail.html
index 8195ae7..de735f2 100644
--- a/app/posts/templates/photo_essay_detail.html
+++ b/app/posts/templates/photo_essay_detail.html
@@ -9,7 +9,7 @@
 {% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}			
 {% block primary %}
     <main role="main">
-        <figure class="large-top-image">{%with object=object_list%}
+        <figure class="large-top-image">
             <a href="{{object.get_absolute_url}}" title="{{object.title}}">{%with image=object.featured_image%}
                 <img style="margin:0;" sizes="(max-width: 960px) 100vw"
                 srcset="{{image.get_srcset}}"
@@ -18,7 +18,7 @@
              </a>
         </figure>{%endwith%}
         <div class="folio-wrapper">
-        <article class="h-entry hentry content" itemscope itemType="http://schema.org/BlogPosting">
+        <article class="h-entry hentry" itemscope itemType="http://schema.org/BlogPosting">
             <header id="header" class="post-header">
                 <h1 class="p-name post-title" itemprop="headline">{{object.title|smartypants|safe}}</h1>
                 <div class="post-dateline">
@@ -30,5 +30,5 @@
             {{object.body_html|safe|smartypants}}
         </div>
         </div>
-    </main>{%endwith%}
+    </main>
 {% endblock%}
diff --git a/app/posts/templates/photo_essay_list.html b/app/posts/templates/photo_essay_list.html
new file mode 100644
index 0000000..e8bebfd
--- /dev/null
+++ b/app/posts/templates/photo_essay_list.html
@@ -0,0 +1,47 @@
+{% extends 'base.html' %}
+{%block htmlclass%}class="detail single"{% endblock %}
+{% load typogrify_tags %}
+{% load get_image_by_size %}
+{% load html5_datetime %}
+{% load pagination_tags %}
+{% block pagetitle %} Photos | luxagraf {% endblock %}
+{% block metadescription %} Recent Images {% endblock %}
+{%block bodyid%}class="photos" id="notes-archive"{%endblock%}
+{% block breadcrumbs %}{% include "lib/breadcrumbs.html" with breadcrumbs=breadcrumbs %}{% endblock %}			
+{% block primary %}
+    <main class="archive-wrapper">
+    <div class="archive-intro">
+            <h1>Photos</h1>
+            <h3>I first picked up a camera in the late 1980s and started documenting trips into the mountains, inspired by <a href="https://en.wikipedia.org/wiki/Galen_Rowell">Galen Rowell</a>. These are ongoing projects, updated regularly.</h3>
+            <hr />
+            <h2>Join us. Subscribe to <em>Friends of a Long Year</em></h2>
+            <iframe target='_parent' style="border:none; background:white; width:100%;" title="embedded form for subscribing the the Friends of a Long Year newsletter" onload="resizeIframe(this)" src="{% url 'lttr:subscribe' slug='friends' %}"></iframe> 
+        </div>
+        <ul class="photo-list">{% for object in object_list %}
+            <li class="h-entry hentry" itemscope itemType="http://schema.org/BlogPosting">{% get_image_by_size object.featured_image 'featured_photo_essay' as featured %}
+                <figure>
+                    <a href="{{object.get_absolute_url}}">
+                        <img src="{{featured}}" alt="{{object.featured_image.alt}} photographed by Scott Gilbertson">
+                    </a>
+                    <figcaption>
+                        <h1 class="p-name" itemprop="headline">{{object.title|smartypants|safe}}</h1> 
+                        <time class="dt-published published dt-updated card-smcaps" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished"> &nbsp;&ndash; Last update: {{object.last_updated|date:"F Y"}}</time>
+                        <span class="hide" itemprop="author" itemscope itemtype="http://schema.org/Person">by <span class="p-author h-card" ><span itemprop="name">Scott Gilbertson</span></span></span>
+                        {%if object.location %}<span class="p-location h-adr adr card-smcaps" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">(
+                        {% if object.location.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.location.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.location.country_slug}}/" title="travel writing from {{object.location.country_name}}">{{object.location.country_name}}</a>{%endif%}
+                        )</span>{%endif%}
+                    </figcaption>
+                </figure>
+                </a>
+            </li>{%endfor%}
+        </ul>
+    </main>
+{% endblock%}
+{% block js %}
+
+<script>
+  function resizeIframe(obj) {
+    obj.style.height = (obj.contentWindow.document.body.scrollHeight - 75) + 'px';
+  }
+</script>
+{% endblock %}
diff --git a/app/posts/urls/__init__old.py b/app/posts/urls/__init__old.py
deleted file mode 100644
index 4993c34..0000000
--- a/app/posts/urls/__init__old.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .guide_urls import urlpatterns as guide_urlpatterns
-from .reviews_urls import urlpatterns as review_urlpatterns
-
-urlpatterns = review_urlpatterns + guide_urlpatterns
diff --git a/app/posts/urls/friends_urls.py b/app/posts/urls/friends_urls.py
deleted file mode 100644
index ca68ca0..0000000
--- a/app/posts/urls/friends_urls.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from django.urls import path, re_path, include
-from django.views.generic.base import RedirectView
-
-from ..views import friends_views as views
-
-app_name = "range"
-
-urlpatterns = [
-        #    path(
-        #        r'feed.xml',
-        #        views.FriendsRSSFeedView(),
-        #        name="feed"
-        #    ),
-        #    path(
-        #        r'<int:issue>/<str:slug>',
-        #        views.FriendsDetailView.as_view(),
-        #        name="friends-detail"
-        #    ),
-    path(
-        r'',
-        views.FriendsListView.as_view(),
-        {'page':1}, 
-        name="friends-list"
-    ),
-]
diff --git a/app/posts/urls/guide_urls.py b/app/posts/urls/guide_urls.py
deleted file mode 100644
index 5e2b37e..0000000
--- a/app/posts/urls/guide_urls.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from django.urls import path, re_path, include
-from django.views.generic.base import RedirectView
-
-from ..views import guide_views as views
-
-app_name = "guides"
-
-urlpatterns = [
-    path(
-        r'',
-        views.GuideListView.as_view(),
-        {'page':1}, 
-        name="guide-list"
-    ),
-    path(
-        r'<int:page>/',
-        views.GuideListView.as_view(),
-        name="guide-list"
-    ),
-    path(
-        r'<str:topic>/<str:slug>',
-        views.GuidePostDetailView.as_view(),
-        name="guide-post-detail"
-    ),
-    path(
-        r'<str:slug>/',
-        views.GuideDetailView.as_view(),
-        name="guide-detail"
-    ),
-]
diff --git a/app/posts/urls/range_urls.py b/app/posts/urls/range_urls.py
deleted file mode 100644
index 65638ce..0000000
--- a/app/posts/urls/range_urls.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from django.urls import path, re_path, include
-from django.views.generic.base import RedirectView
-
-from ..views import range_views as views
-
-app_name = "range"
-
-urlpatterns = [
-    path(
-        r'',
-        views.RangeListView.as_view(),
-        {'page':1}, 
-        name="list"
-    ),
-    path(
-        r'<int:page>',
-        views.RangeListView.as_view(),
-        name="list"
-    ),
-]
diff --git a/app/posts/urls/trip_urls.py b/app/posts/urls/trip_urls.py
deleted file mode 100644
index 7e9c95f..0000000
--- a/app/posts/urls/trip_urls.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from django.urls import path, re_path, include
-from django.views.generic.base import RedirectView
-
-from ..views import trip_views as views
-
-app_name = "trips"
-
-urlpatterns = [
-    path(
-        r'<str:slug>',
-        views.TripDetailView.as_view(),
-        name="detail"
-    ),
-    path(
-        r'<int:page>/',
-        views.TripListView.as_view(),
-        name="list"
-    ),
-    path(
-        r'',
-        views.TripListView.as_view(),
-        {'page':1}, 
-        name="list"
-    ),
-]
diff --git a/app/posts/views/photo_essay_views.py b/app/posts/views/photo_essay_views.py
index 4f08910..8c35621 100644
--- a/app/posts/views/photo_essay_views.py
+++ b/app/posts/views/photo_essay_views.py
@@ -14,13 +14,11 @@ from taxonomy.models import Category
 class PhotoEssayListView(PaginatedListView):
     model = Post
     # TODO: change this when I have an actual archive to show
-    template_name = "photo_essay_detail.html"
+    template_name = "photo_essay_list.html"
 
     def get_queryset(self):
         queryset = super(PhotoEssayListView, self).get_queryset()
-        return queryset.get(slug="dawn")
-        # real queryset
-        #return queryset.filter(site__domain='luxagraf.net').filter(post_type__in=[PostType.PHOTO_ESSAY]).filter(status__exact=1).order_by('-pub_date').prefetch_related('location').prefetch_related('featured_image')
+        return queryset.filter(site__domain='luxagraf.net').filter(post_type__in=[PostType.PHOTO_ESSAY]).filter(status__exact=1).order_by('-pub_date').prefetch_related('location').prefetch_related('featured_image')
 
     def get_context_data(self, **kwargs):
         '''
@@ -48,10 +46,10 @@ class PhotoEssayDetailView(LuxDetailView):
             related.append(model.objects.get(slug=obj.slug, pub_date=obj.pub_date))
         context['related'] = related
         context['breadcrumbs'] = ('Photos',)
-        context['crumb_url'] = reverse('posts:photo-essay-list')
+        context['crumb_url'] = reverse('photo_essay:list')
         return context
 
     def get_template_names(self):
         obj = self.get_object()
-        return ["film_detail.html"]
+        return ["photo_essay_detail.html"]
 
diff --git a/app/trading/admin.py b/app/trading/admin.py
index 46982b0..5206c82 100644
--- a/app/trading/admin.py
+++ b/app/trading/admin.py
@@ -26,7 +26,7 @@ class LuxOptionsTradeAdmin(admin.ModelAdmin):
 
 @admin.register(LuxTrade)
 class LuxTradeAdmin(admin.ModelAdmin):
-    list_display = ('symbol', 'status', 'open_date', 'entry_price', 'stop_price', 'close_price', 'shares', 'amount_invested')
+    list_display = ('symbol', 'status', 'open_date', 'close_date', 'entry_price', 'stop_price', 'close_price', 'shares', 'amount_invested')
     list_filter = ['status', 'open_date']
     class Media:
         js = ('image-loader.js', 'next-prev-links.js')
diff --git a/app/utils/util.py b/app/utils/util.py
index 32a9838..5370d7a 100644
--- a/app/utils/util.py
+++ b/app/utils/util.py
@@ -78,43 +78,29 @@ def parse_image(s):
                     image_id = img['id'].split("image-")[1]
                     i = apps.get_model('media', '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]
+                        css_class = cl[0]
                         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
-                        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})
+                    return render_to_string("lib/img_%s.html" % css_class, {'image': i, 'caption': caption, 'is_cluster': is_cluster, 'cluster_class': cluster_class})
                 except KeyError:
                     ''' regular inline image, not a luximage '''
                     return str(img)
diff --git a/app/budget/0007_luxpurchase_cat.py b/bak/unused_apps/budget/0007_luxpurchase_cat.py
index b7bb553..b7bb553 100644
--- a/app/budget/0007_luxpurchase_cat.py
+++ b/bak/unused_apps/budget/0007_luxpurchase_cat.py
diff --git a/app/budget/admin.py b/bak/unused_apps/budget/admin.py
index 0f578fb..0f578fb 100644
--- a/app/budget/admin.py
+++ b/bak/unused_apps/budget/admin.py
diff --git a/app/budget/migrations/0001_initial.py b/bak/unused_apps/budget/migrations/0001_initial.py
index 30bd5a1..30bd5a1 100644
--- a/app/budget/migrations/0001_initial.py
+++ b/bak/unused_apps/budget/migrations/0001_initial.py
diff --git a/app/budget/migrations/0002_alter_luxpurchase_amount.py b/bak/unused_apps/budget/migrations/0002_alter_luxpurchase_amount.py
index 06400dd..06400dd 100644
--- a/app/budget/migrations/0002_alter_luxpurchase_amount.py
+++ b/bak/unused_apps/budget/migrations/0002_alter_luxpurchase_amount.py
diff --git a/app/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py b/bak/unused_apps/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py
index a880acf..a880acf 100644
--- a/app/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py
+++ b/bak/unused_apps/budget/migrations/0003_alter_luxpurchase_category_alter_luxpurchase_source.py
diff --git a/app/budget/migrations/0004_alter_luxpurchase_source.py b/bak/unused_apps/budget/migrations/0004_alter_luxpurchase_source.py
index 0eab270..0eab270 100644
--- a/app/budget/migrations/0004_alter_luxpurchase_source.py
+++ b/bak/unused_apps/budget/migrations/0004_alter_luxpurchase_source.py
diff --git a/app/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py b/bak/unused_apps/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py
index 66af470..66af470 100644
--- a/app/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py
+++ b/bak/unused_apps/budget/migrations/0005_luxspendingcategory_luxfixedmonthly.py
diff --git a/app/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py b/bak/unused_apps/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py
index 3631cc3..3631cc3 100644
--- a/app/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py
+++ b/bak/unused_apps/budget/migrations/0006_remove_luxfixedmonthly_cat_and_more.py
diff --git a/app/budget/migrations/0007_luxpurchase_cat.py b/bak/unused_apps/budget/migrations/0007_luxpurchase_cat.py
index 7a8e548..7a8e548 100644
--- a/app/budget/migrations/0007_luxpurchase_cat.py
+++ b/bak/unused_apps/budget/migrations/0007_luxpurchase_cat.py
diff --git a/app/budget/migrations/0008_remove_luxpurchase_category.py b/bak/unused_apps/budget/migrations/0008_remove_luxpurchase_category.py
index 7e2a0b9..7e2a0b9 100644
--- a/app/budget/migrations/0008_remove_luxpurchase_category.py
+++ b/bak/unused_apps/budget/migrations/0008_remove_luxpurchase_category.py
diff --git a/app/budget/migrations/0009_rename_cat_luxpurchase_category.py b/bak/unused_apps/budget/migrations/0009_rename_cat_luxpurchase_category.py
index c0efeff..c0efeff 100644
--- a/app/budget/migrations/0009_rename_cat_luxpurchase_category.py
+++ b/bak/unused_apps/budget/migrations/0009_rename_cat_luxpurchase_category.py
diff --git a/app/budget/migrations/0010_luxfixedmonthly_amount.py b/bak/unused_apps/budget/migrations/0010_luxfixedmonthly_amount.py
index 15461d4..15461d4 100644
--- a/app/budget/migrations/0010_luxfixedmonthly_amount.py
+++ b/bak/unused_apps/budget/migrations/0010_luxfixedmonthly_amount.py
diff --git a/app/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py b/bak/unused_apps/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py
index 4186c52..4186c52 100644
--- a/app/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py
+++ b/bak/unused_apps/budget/migrations/0011_luxpaymentmethod_alter_luxfixedmonthly_amount_and_more.py
diff --git a/app/budget/migrations/__init__.py b/bak/unused_apps/budget/migrations/__init__.py
index e69de29..e69de29 100644
--- a/app/budget/migrations/__init__.py
+++ b/bak/unused_apps/budget/migrations/__init__.py
diff --git a/app/budget/models.py b/bak/unused_apps/budget/models.py
index 512b019..512b019 100644
--- a/app/budget/models.py
+++ b/bak/unused_apps/budget/models.py
diff --git a/app/budget/templates/budget/base.html b/bak/unused_apps/budget/templates/budget/base.html
index 9d6bfd0..9d6bfd0 100644
--- a/app/budget/templates/budget/base.html
+++ b/bak/unused_apps/budget/templates/budget/base.html
diff --git a/app/budget/templates/budget/create_cat_form.html b/bak/unused_apps/budget/templates/budget/create_cat_form.html
index 03e996a..03e996a 100644
--- a/app/budget/templates/budget/create_cat_form.html
+++ b/bak/unused_apps/budget/templates/budget/create_cat_form.html
diff --git a/app/budget/templates/budget/create_form.html b/bak/unused_apps/budget/templates/budget/create_form.html
index 2d38acf..2d38acf 100644
--- a/app/budget/templates/budget/create_form.html
+++ b/bak/unused_apps/budget/templates/budget/create_form.html
diff --git a/app/budget/templates/budget/luxpurchase_list.html b/bak/unused_apps/budget/templates/budget/luxpurchase_list.html
index c03f14d..c03f14d 100644
--- a/app/budget/templates/budget/luxpurchase_list.html
+++ b/bak/unused_apps/budget/templates/budget/luxpurchase_list.html
diff --git a/app/budget/templates/budget/update_form.html b/bak/unused_apps/budget/templates/budget/update_form.html
index b19efaa..b19efaa 100644
--- a/app/budget/templates/budget/update_form.html
+++ b/bak/unused_apps/budget/templates/budget/update_form.html
diff --git a/app/budget/urls.py b/bak/unused_apps/budget/urls.py
index ef7852f..ef7852f 100644
--- a/app/budget/urls.py
+++ b/bak/unused_apps/budget/urls.py
diff --git a/app/budget/views.py b/bak/unused_apps/budget/views.py
index 6a34b1e..6a34b1e 100644
--- a/app/budget/views.py
+++ b/bak/unused_apps/budget/views.py
diff --git a/app/resume/admin.py b/bak/unused_apps/resume/admin.py
index 8646cca..8646cca 100644
--- a/app/resume/admin.py
+++ b/bak/unused_apps/resume/admin.py
diff --git a/app/resume/build.py b/bak/unused_apps/resume/build.py
index 4f051d5..4f051d5 100644
--- a/app/resume/build.py
+++ b/bak/unused_apps/resume/build.py
diff --git a/app/resume/migrations/0001_initial.py b/bak/unused_apps/resume/migrations/0001_initial.py
index 14c9348..14c9348 100644
--- a/app/resume/migrations/0001_initial.py
+++ b/bak/unused_apps/resume/migrations/0001_initial.py
diff --git a/app/resume/migrations/0002_auto_20151207_2105.py b/bak/unused_apps/resume/migrations/0002_auto_20151207_2105.py
index 7ac653f..7ac653f 100644
--- a/app/resume/migrations/0002_auto_20151207_2105.py
+++ b/bak/unused_apps/resume/migrations/0002_auto_20151207_2105.py
diff --git a/app/resume/migrations/0003_auto_20151211_1925.py b/bak/unused_apps/resume/migrations/0003_auto_20151211_1925.py
index 77e3049..77e3049 100644
--- a/app/resume/migrations/0003_auto_20151211_1925.py
+++ b/bak/unused_apps/resume/migrations/0003_auto_20151211_1925.py
diff --git a/app/resume/migrations/0004_job_resume.py b/bak/unused_apps/resume/migrations/0004_job_resume.py
index e056fec..e056fec 100644
--- a/app/resume/migrations/0004_job_resume.py
+++ b/bak/unused_apps/resume/migrations/0004_job_resume.py
diff --git a/app/resume/migrations/0005_job_slug.py b/bak/unused_apps/resume/migrations/0005_job_slug.py
index d18baeb..d18baeb 100644
--- a/app/resume/migrations/0005_job_slug.py
+++ b/bak/unused_apps/resume/migrations/0005_job_slug.py
diff --git a/app/resume/migrations/0006_auto_20190112_1257.py b/bak/unused_apps/resume/migrations/0006_auto_20190112_1257.py
index 9ee8f1b..9ee8f1b 100644
--- a/app/resume/migrations/0006_auto_20190112_1257.py
+++ b/bak/unused_apps/resume/migrations/0006_auto_20190112_1257.py
diff --git a/app/resume/migrations/0007_auto_20190113_1128.py b/bak/unused_apps/resume/migrations/0007_auto_20190113_1128.py
index a635258..a635258 100644
--- a/app/resume/migrations/0007_auto_20190113_1128.py
+++ b/bak/unused_apps/resume/migrations/0007_auto_20190113_1128.py
diff --git a/app/resume/migrations/0008_auto_20190113_1139.py b/bak/unused_apps/resume/migrations/0008_auto_20190113_1139.py
index 29d975d..29d975d 100644
--- a/app/resume/migrations/0008_auto_20190113_1139.py
+++ b/bak/unused_apps/resume/migrations/0008_auto_20190113_1139.py
diff --git a/app/resume/migrations/0009_job_body_html.py b/bak/unused_apps/resume/migrations/0009_job_body_html.py
index fdeea15..fdeea15 100644
--- a/app/resume/migrations/0009_job_body_html.py
+++ b/bak/unused_apps/resume/migrations/0009_job_body_html.py
diff --git a/app/resume/migrations/0010_auto_20190113_1147.py b/bak/unused_apps/resume/migrations/0010_auto_20190113_1147.py
index 879bd55..879bd55 100644
--- a/app/resume/migrations/0010_auto_20190113_1147.py
+++ b/bak/unused_apps/resume/migrations/0010_auto_20190113_1147.py
diff --git a/app/resume/migrations/0011_auto_20190114_0227.py b/bak/unused_apps/resume/migrations/0011_auto_20190114_0227.py
index 7656c6e..7656c6e 100644
--- a/app/resume/migrations/0011_auto_20190114_0227.py
+++ b/bak/unused_apps/resume/migrations/0011_auto_20190114_0227.py
diff --git a/app/resume/migrations/__init__.py b/bak/unused_apps/resume/migrations/__init__.py
index e69de29..e69de29 100644
--- a/app/resume/migrations/__init__.py
+++ b/bak/unused_apps/resume/migrations/__init__.py
diff --git a/app/resume/models.py b/bak/unused_apps/resume/models.py
index bac3115..bac3115 100644
--- a/app/resume/models.py
+++ b/bak/unused_apps/resume/models.py
diff --git a/app/resume/urls.py b/bak/unused_apps/resume/urls.py
index de95866..de95866 100644
--- a/app/resume/urls.py
+++ b/bak/unused_apps/resume/urls.py
diff --git a/app/resume/views.py b/bak/unused_apps/resume/views.py
index 3d0cd8d..3d0cd8d 100644
--- a/app/resume/views.py
+++ b/bak/unused_apps/resume/views.py
diff --git a/config/base_urls.py b/config/base_urls.py
index 0677a15..93b90b7 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -27,61 +27,62 @@ sitemaps = {
 }
 
 urlpatterns = [
-    re_path(r'^admin/build/.*', builder.views.do_build),
-    path(r'admin/data/', include('utils.urls')),
+    # old unused urls
     #path(r'admin/income/invoice/monthlyview/<str:slug>/invoice/', DownloadMonthlyInvoiceView.as_view(), name="download-invoice"),
     #path(r'admin/income/invoice/monthlyview/<str:slug>/', MonthlyInvoiceView.as_view(), name="monthly-invoice"),
+    #path(r'spending/', include('budget.urls')),
+    #path(r'projects/', include('projects.urls')),
+    #path(r'expenses/', include('expenses.urls', namespace='expenses')),
+    #path(r'film/', include('posts.urls.film_urls')),
+    #re_path(r'^film/$', RedirectView.as_view(url='/films/')),
+    #path(r'films/', include('posts.urls.film_urls', namespace='films')),
+    #path(r'review/', include('posts.urls.review_urls')),
+    #re_path(r'^review/$', RedirectView.as_view(url='/reviews/')),
+    #path(r'reviews/', include('posts.urls.review_urls', namespace='review-list')),
+    #path(r'how-to/', include('posts.urls.craft_urls')),
+    #re_path(r'^how-to/$', RedirectView.as_view(url='/how-to/')),
+    #path(r'how-tos/', include('posts.urls.craft_urls', namespace='craft')),
+    #path(r'people/', include('people.urls')),
+    #path(r'work/', include('resume.urls', namespace='resume')),
+    #path(r'<path>/<slug>/', PageDetailView.as_view()),
+    #re_path(r'^trip/$', RedirectView.as_view(url='/trips/')),
+    #path(r'trip/', include('posts.urls.trip_urls')),
+    #path(r'trips/', include('posts.urls.trip_urls', namespace='trips')),
+    #re_path(r'^guide/$', RedirectView.as_view(url='/guides/')),
+    #path(r'guides/', include('posts.urls.guide_urls', namespace='guides')),
+    #path(r'guide/', include('posts.urls.guide_urls')),
+    re_path(r'^admin/build/.*', builder.views.do_build),
+    path(r'admin/data/', include('utils.urls')),
     path(r'admin/', admin.site.urls),
     path(r'trading/', include('trading.urls')),
     path(r'gtd/', include('gtd.urls')),
-    path(r'spending/', include('budget.urls')),
     path(r'planner/', include('planner.urls')),
     path(r'luximages/insert/', utils.views.insert_image),
     path(r'feed.xml', JrnlRSSFeedView(),name="feed"),
     path(r'sitemap.xml', sitemap, {'sitemaps': sitemaps}),
     path(r'links/', include('links.urls')),
     path(r'jrnl/', include('posts.urls.jrnl_urls', namespace='jrnl')),
-    #path(r'projects/', include('projects.urls')),
     path(r'walk/', include('locations.walk_urls')),
     path(r'walks/', include('locations.walk_urls')),
     path(r'locations/', include('locations.urls')),
-    #path(r'expenses/', include('expenses.urls', namespace='expenses')),
     path(r'newsletter/', include('lttr.urls')),
-    path(r'photos/', include('media.urls')),
-    path(r'images/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')),
-    #path(r'film/', include('posts.urls.film_urls')),
-    #re_path(r'^film/$', RedirectView.as_view(url='/films/')),
-    #path(r'films/', include('posts.urls.film_urls', namespace='films')),
-    re_path(r'^trip/$', RedirectView.as_view(url='/trips/')),
-    path(r'trip/', include('posts.urls.trip_urls')),
-    path(r'trips/', include('posts.urls.trip_urls', namespace='trips')),
-    #path(r'review/', include('posts.urls.review_urls')),
-    #re_path(r'^review/$', RedirectView.as_view(url='/reviews/')),
-    #path(r'reviews/', include('posts.urls.review_urls', namespace='review-list')),
-    re_path(r'^guide/$', RedirectView.as_view(url='/guides/')),
-    path(r'guides/', include('posts.urls.guide_urls', namespace='guides')),
-    path(r'guide/', include('posts.urls.guide_urls')),
+    #path(r'photos/', include('media.urls')),
+    path(r'photos/', include('posts.urls.photo_essay_urls', namespace='photo-essay-list')),
     re_path(r'^essay/$', RedirectView.as_view(url='/essays/')),
     path(r'essay/', include('posts.urls.essay_urls')),
     path(r'essays/', include('posts.urls.essay_urls', namespace='essay-list')),
-    path(r'range/', include('posts.urls.range_urls', namespace='range')),
-    path(r'friends/', include('posts.urls.friends_urls', namespace='friends')),
-    #path(r'how-to/', include('posts.urls.craft_urls')),
-    #re_path(r'^how-to/$', RedirectView.as_view(url='/how-to/')),
-    #path(r'how-tos/', include('posts.urls.craft_urls', namespace='craft')),
+    #path(r'range/', include('posts.urls.range_urls', namespace='range')),
+    #path(r'friends/', include('posts.urls.friends_urls', namespace='friends')),
     path(r'book-notes/', include('books.urls')),
-    #path(r'people/', include('people.urls')),
     path(r'dialogues/', include('sightings.urls', namespace='sightings')),
     path(r'field-notes/', include('posts.urls.field_note_urls', namespace='fieldnote')),
     path(r'src/', include('posts.urls.src_urls', namespace='src')),
-    path(r'work/', include('resume.urls', namespace='resume')),
     path(r'map', include('locations.urls', namespace='map')),
     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>.txt', PageDetailTXTView.as_view()),
     path(r'<slug>', include('pages.urls', namespace='pages')),
-    #path(r'<path>/<slug>/', PageDetailView.as_view()),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 
diff --git a/templates/base.html b/templates/base.html
index 0bce354..2e4eb8b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,7 +16,7 @@
           title="Luxagraf RSS feed"
           href="https://luxagraf.net/rss/">
     {%block stylesheet%}<link rel="stylesheet" 
-          href="/media/screenv11.min.css?{% now "u" %}" 
+          href="/media/screenv11.css?{% now "u" %}" 
           media="screen">{%endblock%}
     {%block extrahead%}{%endblock%}
 </head>
@@ -29,10 +29,8 @@
         <nav>
             <a class="nav-item smcaps" href="{% url "jrnl:list" %}" title="Stories of life on the road.">Jrnl</a>
             <a class="nav-item smcaps" href="/essays/" title="Life and how to live it">Essays</a>
-            <!--<a class="nav-item smcaps" href="{% url "guides:guide-list" %}" title="Guides">Guides</a> -->
+            <a class="nav-item smcaps" href="{% url "photo_essay:list" %}" title="Photo essays">Photos</a>
             <a class="nav-item smcaps" href="/about" title="About Scott">About</a>
-            <!--
-            <a class="nav-item smcaps" href="/guides/" title="Useful Stuff">Guides</a> -->
         </nav>
     </header>
     {% block breadcrumbs %}{% endblock %}
diff --git a/templates/lib/img_cluster.html b/templates/lib/img_cluster.html
index 317bf8b..8117298 100644
--- a/templates/lib/img_cluster.html
+++ b/templates/lib/img_cluster.html
@@ -1,6 +1,13 @@
-{% load get_image_by_size %}{% if caption or exif %}<figure {%if cluster_class != "picwide"%}class="{{cluster_class}}"{%endif%}>{%endif%}
-    <a href="{%get_image_by_size image "original"%}" title="view larger image {% if image.photo_credit_source%}(photo by {{image.photo_credit_source}}){%endif%}">
-        <img class="{% if caption or exif %}{%else%}{%if cluster_class != "picwide"%}{{cluster_class}}{%endif%}{%endif%} {%if extra%}{{extra}}{%endif%}" {%if cluster_class == "picwide"%} sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.slug %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}{% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.slug%}"{%endif%}{%endfor%}{%else%} src="{% get_image_by_size image cluster_class %}"{%endif%} alt="{%if image.alt %}{{image.alt}}{%else%}{{image.title}}{%endif%} photographed by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}Scott Gilbertson{%endif%}"></a>
-{% if caption or exif %}<figcaption>{% endif %}{% if caption %}{{image.caption|safe}}{% endif %}{% if exif %} | <small>Camera: {{image.exif_make}} {{image.exif_model}} with {{image.exif_lens}}</small>{% endif %}{% if caption or exif %}</figcaption>
-</figure>
+{% load get_image_by_size %}{%if cluster_class != "picwide"%}<span class="{{cluster_class}}">{%endif%}
+{% if caption %}<figure {%if cluster_class != "picwide"%}class="{{cluster_class}}"{%endif%}>{%endif%}
+    <a href="{%get_image_by_size image "original"%}" title="view larger image">
+        <img {%if cluster_class == "picwide"%} class="picwide"
+                        sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.slug %} {{size.width}}w{% if forloop.last%}"{%else%}, {%endif%}{%endfor%}
+                        {% for size in image.sizes.all%}{%if not forloop.first and not forloop.last%} src="{% get_image_by_size image size.slug%}"{%endif%}{%endfor%}
+                    {%else%}
+                    src="{% get_image_by_size image cluster_class %}"
+                    {%endif%}
+                    alt="{%if image.alt %}{{image.alt}}{%else%}{{image.title}}{%endif%} by {% if image.photo_credit_source %}{{image.photo_credit_source}}{%else%}Scott Gilbertson{%endif%}"></a>
+                    {% if caption %}<figcaption>{{image.caption|safe}}</figcaption></figure>
 {% endif %}
+    {%if cluster_class != "picwide"%}</span>{%endif%}
diff --git a/templates/lib/img_wideessay.html b/templates/lib/img_wideessay.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/templates/lib/img_wideessay.html