From e7af8a1e0f71d38b7e83a22a822fb9d971a41ec2 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Mon, 18 Feb 2019 15:21:42 -0600
Subject: redid sightings design and moved all location defered things to
 location objects

---
 design/templates/archives/homepage-light.html |  8 ++--
 design/templates/archives/sightings.html      | 40 ------------------
 design/templates/details/sighting.html        | 53 ------------------------
 design/templates/essays/essay_detail.html     |  2 +-
 design/templates/jrnl/entry_detail.html       |  6 +--
 design/templates/jrnl/entry_list.html         |  2 +-
 design/templates/sightings/ap_detail.html     | 59 +++++++++++++++++++++++++++
 design/templates/sightings/sighting_list.html | 40 ++++++++++++++++++
 8 files changed, 108 insertions(+), 102 deletions(-)
 delete mode 100644 design/templates/archives/sightings.html
 delete mode 100644 design/templates/details/sighting.html
 create mode 100644 design/templates/sightings/ap_detail.html
 create mode 100644 design/templates/sightings/sighting_list.html

(limited to 'design/templates')

diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html
index 26ff437..00243aa 100644
--- a/design/templates/archives/homepage-light.html
+++ b/design/templates/archives/homepage-light.html
@@ -31,7 +31,7 @@
                     <p class="p-author author hide" itemprop="author">Scott Gilbertson</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>, {{object.state_name}}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location_name|smartypants|safe}}</span>, {{object.country_name}}{%endif%}</span>
+                    <span class="p-location h-adr adr post-location" 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>, {{object.location.state_name}}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, {{object.location.country_name}}{%endif%}</span>
                         <span class="p-summary" itemprop="description">
                             {{homepage.tag_line|safe|smartypants}}
                         </span>
@@ -46,7 +46,7 @@
         <h1 class="homepage-section-header">About Luxagraf</h1>
         <img src="/media/img/usa-resize.svg" alt="map of travels" class="homepage-map-img" />
         <p>After nearly two years exploring the U.S. in our home, a 1969 Dodge Travco RV, we left the states to spend the winter in Mexico.</p>
-        <p>We left our former home in Athens, GA in the Spring of 2017. We were most recently in <span class="p-location h-adr adr " itemprop="contentLocation" itemscope itemtype="http://schema.org/Place"> {% if location.country_name == "United States" %}<span class="p-locality locality">{{location.location_name|smartypants|safe}}</span>, {{location.location.state.code|safe}}{%else%}<span class="p-region">{{location.location_name|smartypants|safe}}</span>, {{location.country_name|safe}}</a>{%endif%}</span>. The map <span class="addafter"><span class="subcontent">above</span></span> has a rough sketch of our route to date. You can read about our adventures in the <a href="/jrnl/">journal</a> section. There's more about us on the <a href="/about">about page</a> </p>
+        <p>We left our former home in Athens, GA in the Spring of 2017. We were most recently in <span class="p-location h-adr adr " itemprop="contentLocation" itemscope itemtype="http://schema.org/Place"> {% if location.country_name == "United States" %}<span class="p-locality locality">{{location.location_name|smartypants|safe}}</span>, {{location.location.comma_name|safe}}{%else%}<span class="p-region">{{location.location_name|smartypants|safe}}</span>, {{location.country_name|safe}}</a>{%endif%}</span>. The map <span class="addafter"><span class="subcontent">above</span></span> has a rough sketch of our route to date. You can read about our adventures in the <a href="/jrnl/">journal</a> section. There's more about us on the <a href="/about">about page</a> </p>
     </section>
     <section class="recent-popular">
         <div class="recent">
@@ -64,7 +64,7 @@
             <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%}
+                    {% 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> 
             </p>
         </article> {% endfor %}
@@ -85,7 +85,7 @@
             <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%}
+                    {% 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.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.location.country_name}}">{{object.location.country_name}}</a>{%endif%}
                 </span>
             </p>
         </article> {% endfor %}
diff --git a/design/templates/archives/sightings.html b/design/templates/archives/sightings.html
deleted file mode 100644
index 3eb8ef6..0000000
--- a/design/templates/archives/sightings.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% load pagination_tags %}
-
-{% block pagetitle %}Luxagraf | Plants and Animals seen {% if region %}in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %}
-{% block metadescription %}Plants and Animals  seen {% if region %} in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%} Page {{page}}{% endblock %}
-{%block bodyid%}id="birds" 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="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Plants and Animals</span></a> &rarr;</li>
-        <li itemprop="title">the United States</li>{%else%}<li><a href="/jrnl/" title="See all Journal Entries" itemprop="url"><span>Plants and Animals</span></a> &rarr;</li> 
-        <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>dialogues</li>{%endif%}
-    </ul>
-    <main class="archive-grid dialogue-grid">{% autopaginate object_list 24%}
-    <h1 class="hide">Plants and Animals seen {% if region %}in {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%} by {{user}}{%endif%}</h1> {% for object in object_list %}
-    <article class="archive-card">{% if object.ap.image%} 
-            <div class="post--image">
-                <a href="{{object.ap.get_absolute_url}}" title="{{object.ap}}">
-                    {% include "lib/img_archive.html" with image=object.ap.image  %}
-                </a>
-            </div>{% endif %}
-            <h2 class="post-title"><a href="{{object.ap.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.ap}}{%endif%}">{{object.ap|safe|smartypants|widont}}</a> (<span class="sci">{{object.ap.scientific_name}}</span>)</h2>
-            <time class="post-date" datetime="{{object.pub_date|date:'c'}}">Last Seen: {{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <div class="post-summary">
-                <span class="post-location" itemscope itemtype="http://schema.org/Place">
-                    {% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, {{object.state.name}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, {{object.country.name}}</a>{%endif%}
-                </span>
-            </div>
-        </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/details/sighting.html b/design/templates/details/sighting.html
deleted file mode 100644
index 1af2433..0000000
--- a/design/templates/details/sighting.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify_tags %}
-{% block extrahead %}
-<style>
-#detail-map-canvas { height: 100%;}
-</style>
-{% endblock %}
-{% block bodyid %}class="detail"{%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><a href="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Dialogues</span></a></li>
-    </ul>
-
-<main>
-<article>
-<h1>{{object.common_name}}</h1>
-<h2 class="sci">{{object.scientific_name}}</h2>
-<h3 class="sci">Family {{object.apclass.scientific_name}} ({{object.apclass}})</h3>
-            {{object.body_html|safe|smartypants|widont}}
-{%if recording %}
-<div class="audio-figure">
-<audio autoplay="autoplay" controls="controls">  
-    <source src="/media/{{recording.audio}}" />  
-</audio> 
-<small>Audio recorded by {{recording.recorder}} on {{recording.pub_date|date:"F j, Y"}} in {{recording.location}}. <a href="{{recording.link}}">&copy; {{recording.copyright}}</a></small>
-</div>
-{%endif%}
-<div class="entry-footer" id="endnode">
-    <aside id="locations">
-        <h5>Seen at</h5>
-        <ul>{%for sight in sighting %}
-            <li><a href="{{sight.location.get_absolute_url}}">{{sight.location}}</a>, {{sight.location.comma_name}}, {{sight.pub_date|date:"M Y"}}</li>
-        {%endfor%}</ul>
-    </aside>
-</div>
-</article>
-</main>
-{% endblock %}
-
-{% block js %}
-<script src="/media/js/leaflet-master/leaflet-mod.js"></script>
-<script src="/media/js/detail.js"></script>
-<script type="text/javascript">
-sightings = [];
-{% for s in sighting %}
-sightings.push(['{{s.latitude}}', '{{s.longitude}}']);
-{% endfor %}
-window.onload = function() {
-    createBirdMap({% for s in sighting %}{% if forloop.first %}{{s.latitude}},{{s.longitude}}{%endif%}{%endfor%}, 5, { type:'point', lat:'{{sighting.latitude}}', lon:'{{sighting.longitude}}'}, sightings); return false;
-}
-</script>
-{% endblock %}
diff --git a/design/templates/essays/essay_detail.html b/design/templates/essays/essay_detail.html
index 780c80c..34f5d78 100644
--- a/design/templates/essays/essay_detail.html
+++ b/design/templates/essays/essay_detail.html
@@ -2,7 +2,7 @@
 {% 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 pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Essays{% endblock %}
 
 {% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
 {%block extrahead%}
diff --git a/design/templates/jrnl/entry_detail.html b/design/templates/jrnl/entry_detail.html
index 3e75017..4e84103 100644
--- a/design/templates/jrnl/entry_detail.html
+++ b/design/templates/jrnl/entry_detail.html
@@ -2,14 +2,14 @@
 {% 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 pagetitle %}{{object.title|title|smartypants|safe}} - Luxagraf, Writing{%comment%}{% if object.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state_name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name}}{%endif%}{%endcomment%}{% endblock %}
 
 {% block metadescription %}{% autoescape on %}{{object.meta_description|striptags|safe}}{% endautoescape %}{% endblock %}
 {%block extrahead%}
     <link rel="canonical" href="https://luxagraf.net{{object.get_absolute_url}}" />
     <meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
     <meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
-    <meta name="geo.placename" content="{% if object.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.country_name}}{%endif%}"> 
+    <meta name="geo.placename" content="{% if object.location.country_name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.country_name}}{%endif%}"> 
     <meta name="geo.region" content="{{object.country.iso2}}{%if object.state.code != '' %}-{{object.state.code}}{%endif%}">
     <meta property="og:type" content="article" />
     <meta property="og:title" content="{{object.title|safe}}" />
@@ -40,7 +40,7 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
             <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>
                 <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%}
+                    {% 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.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.location.country_slug}}/" title="travel writing from {{object.location.country_name}}">{{object.location.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>
                 <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>
diff --git a/design/templates/jrnl/entry_list.html b/design/templates/jrnl/entry_list.html
index 0295f8f..2201e34 100644
--- a/design/templates/jrnl/entry_list.html
+++ b/design/templates/jrnl/entry_list.html
@@ -26,7 +26,7 @@
             <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%}
+                    {% 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> &ndash;
                 <span class="p-summary" itemprop="description">
                     {{object.dek|safe}}
diff --git a/design/templates/sightings/ap_detail.html b/design/templates/sightings/ap_detail.html
new file mode 100644
index 0000000..154d7ac
--- /dev/null
+++ b/design/templates/sightings/ap_detail.html
@@ -0,0 +1,59 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% block extrahead %}
+<style>
+#detail-map-canvas { height: 100%;}
+</style>
+{% endblock %}
+{% block bodyid %}class="detail"{%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><a href="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Dialogues</span></a>&rarr; </li>
+        <li><span itemprop="title">{{object.common_name}}</span></li>
+    </ul>
+
+    <main>
+    <article>
+        <header class="tight">
+            <h1 class="hed">{{object.common_name}}</h1>
+            <h2 class="post-subtitle">{{object.scientific_name}}</h2>
+            <h3 class="post-subtitle-segundo">Family {{object.apclass.scientific_name}} ({{object.apclass}})</h3>
+        </header>
+    {% if object.body_html %}{{object.body_html|safe|smartypants|widont}}{%endif%}
+{%if recording %}
+<div class="audio-figure">
+<audio autoplay="autoplay" controls="controls">  
+    <source src="/media/{{recording.audio}}" />  
+</audio> 
+<small>Audio recorded by {{recording.recorder}} on {{recording.pub_date|date:"F j, Y"}} in {{recording.location}}. <a href="{{recording.link}}">&copy; {{recording.copyright}}</a></small>
+</div>
+{%endif%}
+ {% if field_notes %}
+            <h4>Field Notes</h4>{% for note in field_notes %}
+                {{note.body_html|safe|smartypants}}
+                <p class="post-subtitle-segundo">&ndash; <a href="{{note.sighting.location.get_absolute_url}}">{{note.sighting.location}}</a>, {{note.sighting.location.comma_name}}, {{note.sighting.pub_date|date:"M Y"}}</p>
+                <hr />
+        {%endfor%}
+{%endif%}
+        <h5>Seen at</h5>
+        <ul>{%for sight in sighting %}
+            <li><a href="{{sight.location.get_absolute_url}}">{{sight.location}}</a>, {{sight.location.comma_name}}, {{sight.pub_date|date:"M Y"}}</li>
+        {%endfor%}
+</article>
+</main>
+{% endblock %}
+
+{% block js %}
+<script src="/media/js/leaflet-master/leaflet-mod.js"></script>
+<script src="/media/js/detail.js"></script>
+<script type="text/javascript">
+sightings = [];
+{% for s in sighting %}
+sightings.push(['{{s.latitude}}', '{{s.longitude}}']);
+{% endfor %}
+window.onload = function() {
+    createBirdMap({% for s in sighting %}{% if forloop.first %}{{s.latitude}},{{s.longitude}}{%endif%}{%endfor%}, 5, { type:'point', lat:'{{sighting.latitude}}', lon:'{{sighting.longitude}}'}, sightings); return false;
+}
+</script>
+{% endblock %}
diff --git a/design/templates/sightings/sighting_list.html b/design/templates/sightings/sighting_list.html
new file mode 100644
index 0000000..3ae33e5
--- /dev/null
+++ b/design/templates/sightings/sighting_list.html
@@ -0,0 +1,40 @@
+{% extends 'base.html' %}
+{% load typogrify_tags %}
+{% load pagination_tags %}
+
+{% block pagetitle %}Luxagraf | Plants and Animals seen {% if region %}in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %}
+{% block metadescription %}Plants and Animals  seen {% if region %} in {{region.name|title|smartypants|safe}}{%else%}by {{user}}{%endif%} Page {{page}}{% endblock %}
+{%block bodyid%}id="birds" 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="{% url 'sightings:list' %}" title="See all" itemprop="url"><span itemprop="title">Plants and Animals</span></a> &rarr;</li>
+        <li itemprop="title">the United States</li>{%else%}<li><a href="/jrnl/" title="See all Journal Entries" itemprop="url"><span>Plants and Animals</span></a> &rarr;</li> 
+        <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>dialogues</li>{%endif%}
+    </ul>
+    <main class="archive-grid dialogue-grid">{% autopaginate object_list 24%}
+    <h1 class="hide">Plants and Animals seen {% if region %}in {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%} by {{user}}{%endif%}</h1> {% for object in object_list %}
+    <article class="archive-card">{% if object.ap.image%} 
+            <div class="post--image">
+                <a href="{{object.ap.get_absolute_url}}" title="{{object.ap}}">
+                    {% include "lib/img_archive.html" with image=object.ap.image  %}
+                </a>
+            </div>{% endif %}
+            <h2 class="post-title"><a href="{{object.ap.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.ap}}{%endif%}">{{object.ap|safe|smartypants|widont}}</a> (<span class="sci">{{object.ap.scientific_name}}</span>)</h2>
+            <time class="post-date" datetime="{{object.pub_date|date:'c'}}">Last Seen: {{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+            <div class="post-summary">
+                <span class="post-location" itemscope itemtype="http://schema.org/Place">
+                    {% if object.country_name == "United States" %}<span class="p-locality locality">{{object.location_name|smartypants|safe}}</span>, {{object.state_name}}, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location_name|smartypants|safe}}</span>, {{object.country_name}}</a>{%endif%}
+                </span>
+            </div>
+        </article> {% endfor %}
+    </main>
+    <nav class="pagination">
+    {% paginate %}
+    </nav>
+{% endblock %}
+
+
+
+{% block js %}<script src="/media/js/hyphenate.min.js" type="text/javascript"></script>{% endblock%}
-- 
cgit v1.2.3