added h-entry u-photo to notes template

6 files changed, 37 insertions, 39 deletions

diff --git a/config/base_urls.py b/config/base_urls.py
index ee9fce1..8a699ba 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -6,6 +6,7 @@ from django.contrib.sitemaps.views import sitemap
 
 from pages.views import PageDetailView
 from jrnl.models import BlogSitemap
+from fieldnotes.models import FieldNoteSitemap 
 from jrnl.views import HomepageList
 from locations.models import WritingbyCountrySitemap
 from photos.models import PhotoGallerySitemap
@@ -23,9 +24,8 @@ admin.autodiscover()
 
 sitemaps = {
     'blog': BlogSitemap,
+    'notes': FieldNoteSitemap,
     'writingbyloc': WritingbyCountrySitemap,
-    'photos': PhotoGallerySitemap,
-    'projects': ProjectSitemap,
     'src': SrcSitemap,
     'essays': EssaySitemap,
     'books': BookSitemap,
diff --git a/config/requirements.txt b/config/requirements.txt
index f705262..2bbeb1e 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -1,36 +1,33 @@
-beautifulsoup4==4.4.0
-bleach==1.4.1
-certifi==2017.7.27.1
+beautifulsoup4==4.7.1
+bleach==3.1.0
+certifi==2018.11.29
 chardet==3.0.4
-decorator==4.0.4
-Django==1.11.5
-django-autocomplete-light==3.2.10
-django-bleach==0.3.0
-django-debug-toolbar django-extensions django-gravatar2 django-taggit django-typogrify
-EbookLib==0.16
-facebook-sdk==2.0.0
-flickrapi==2.3
-html5lib==0.999999
-idna==2.6
-Jinja2==2.9.6
+Django==2.1.7
+django-bleach==0.5.1
+django-debug-toolbar==1.11
+django-extensions==2.1.6
+django-gravatar2==1.4.2
+django-taggit==0.24.0
+django-typogrify==1.3.3
+EbookLib==0.17.1
+idna==2.8
+Jinja2==2.10
 jsmin==2.2.2
-lxml==4.0.0
-Markdown==2.6.9
-MarkupSafe==1.0
-medium==0.3.0
-oauthlib==2.0.4
-olefile==0.44
-Markdown Pillow psycopg2 python-resize-image smartypants typogrify
-
-pytz==2017.2
-requests==2.18.4
-requests-oauthlib==0.8.0
-requests-toolbelt==0.8.0
-six==1.11.0
-smartypants==1.8.6
-sqlparse==0.2.3
-twython==3.6.0
+lxml==4.3.1
+Markdown==3.0.1
+MarkupSafe==1.1.1
+Pillow==5.4.1
+pkg-resources==0.0.0
+psycopg2==2.7.7
+psycopg2-binary==2.7.7
+PyExifTool==0.1
+python-resize-image==1.1.18
+pytz==2018.9
+requests==2.21.0
+six==1.12.0
+smartypants==2.0.1
+soupsieve==1.8
+sqlparse==0.2.4
 typogrify==2.0.7
-urllib3==1.22
-uWSGI==2.0.15
-pip install https://github.com/smarnach/pyexiftool/tarball/master
+urllib3==1.24.1
+webencodings==0.5.1
diff --git a/design/sass/_archives.scss b/design/sass/_archives.scss
index 166d9c5..db232ee 100644
--- a/design/sass/_archives.scss
+++ b/design/sass/_archives.scss
@@ -411,12 +411,13 @@
         margin-top: 4px;
     }
     h3.p-summary {
+        @include fontsize(22);
+        font-weight: 300;
         font-family: $headline_font_serif;
         font-style: italic;
         margin-top: .25rem;
         margin-bottom: .25rem;
         line-height: 1.2;
-        @include fontsize(22);
     }
     .post-location {
         margin: .5rem 0 0 0;
diff --git a/design/templates/base.html b/design/templates/base.html
index 451d568..214b88d 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -33,11 +33,11 @@
                 <ul>
                     <li><a href="/jrnl/" title="What I've been up to lately">Jrnl</a></li>
                     <li><a href="/essays/" title="longer essays and posts about non-travel related things">Essays</a></li>
+                    <li><a href="/field-notes/" title="Shorter posts">Notes</a></li>
                     <li><a href="/newsletter/" title="The 'friends of a long year' newsletter">Lttr</a></li>
                     <!--<li id="guide"><a href="/guides/" title="">Guides</a></li>-->
                     <li><a href="/src/" title="The indie web is awesome, learn how to built it">Src</a></li>
                     <li><a href="/about" title="About Scott">About</a></li>
-                    <li><a href="/projects/" title="the less visible portions of the iceberg">More</a></li>
                 </ul>
             </nav>
         </header>
diff --git a/design/templates/fieldnotes/fieldnote_list.html b/design/templates/fieldnotes/fieldnote_list.html
index 5c9c808..089c694 100644
--- a/design/templates/fieldnotes/fieldnote_list.html
+++ b/design/templates/fieldnotes/fieldnote_list.html
@@ -14,7 +14,7 @@
     <main role="main" id="essay-archive" class="essay-archive archive-list">
         <div class="essay-intro">
             <h2>Field Notes</h2>
-            <p>Quick notes, sketches and images from the road. This is the semi-orgnized brain dump that comes before the more organized <a href="/jrnl/" title="read the journal">journal entries</a> and <a href="/essays/" title="read essays">essays</a>. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot few people read it.</p>
+            <p>Quick notes, sketches and images from the road. This is the semi-orgnized brain dump that comes before the more organized <a href="/jrnl/" title="read the journal">journal entries</a> and <a href="/essays/" title="read essays">essays</a>. If I used social media this is the stuff I'd probably put there, but I prefer to put it here, even if it means a lot fewer people read it.</p>
         </div>
          {% autopaginate object_list 30 %}
         <ul class="fancy-archive-list">{% for object in object_list %}{% if object.slug != 'about' %}
diff --git a/design/templates/lib/img_picwide.html b/design/templates/lib/img_picwide.html
index 5e78c72..3709e37 100644
--- a/design/templates/lib/img_picwide.html
+++ b/design/templates/lib/img_picwide.html
@@ -2,7 +2,7 @@
 {% if caption or exif or image.photo_credit_source %}
 <figure{%if not is_cluster %} class="picwide"{%endif%}>{%else%}{%if not is_cluster %}<div class="picwide">{%endif%}{%endif%}
         <a itemscope itemtype="http://schema.org/ImageObject" href="{%get_image_by_size image "original"%} " title="view larger image">
-            <img itemprop="contentUrl" sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {{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.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%}>
+            <img class="u-photo" itemprop="contentUrl" sizes="(max-width: 1439px) 100vw, (min-width: 1440px) 1440px" srcset="{% for size in image.sizes.all%}{% get_image_by_size image size.name %} {{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.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 or exif or image.photo_credit_source %}<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 image.photo_credit_source %}{%if caption or exif %} | {%endif%}image by {% if image.photo_credit_url %}<a href="{{image.photo_credit_url}}" itemprop="author">{%endif%}{{image.photo_credit_source}}{% if image.photo_credit_url %}</a>{%endif%}{%endif%}{% if caption or exif or image.photo_credit_source %}</figcaption>
 </figure>{%else%}{%if not is_cluster %}</div>{%endif%}