redid sightings design and moved all location defered things to location

objects

2 files changed, 99 insertions, 0 deletions

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%}