redid notes to make them self-contained and local

3 files changed, 25 insertions, 6 deletions

diff --git a/design/templates/admin/notes/change_form.html b/design/templates/admin/notes/change_form.html
new file mode 100644
index 0000000..3d97a4f
--- /dev/null
+++ b/design/templates/admin/notes/change_form.html
@@ -0,0 +1,19 @@
+{% extends "admin/change_form.html" %}
+{% load i18n admin_urls %}
+{% block content %}
+    <a class="btn" onclick="geoFindMe();" href="javascript:void(0);" class="historylink">Get Location</a>
+    {{block.super}}
+{% endblock %}
+{% block object-tools-items %}
+    <li>
+        <a onclick="geoFindMe();" href="javascript:void(0);" class="historylink">Get Location</a>
+    </li>
+    <li>
+        <a href="{% url opts|admin_urlname:'history' original.pk|admin_urlquote %}" class="historylink">{% trans "History" %}</a>
+    </li>
+    {% if has_absolute_url %}
+        <li>
+            <a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a>
+        </li>
+    {% endif %}
+{% endblock %}
diff --git a/design/templates/archives/notes.html b/design/templates/archives/notes.html
index 4ee5269..ed2a7be 100644
--- a/design/templates/archives/notes.html
+++ b/design/templates/archives/notes.html
@@ -16,7 +16,7 @@
         <article class="h-entry">
             <h2 class="p-name note--title">{{object.title|safe|amp|smartypants}}</h2>
             <div class="e-content">
-            {{object.render|safe|amp|smartypants|urlizetrunc:45 }}
+            {{object.body_html|safe|amp|smartypants|urlizetrunc:45 }}
             </div>
             <span class="p-author h-card">
                 <data class="p-name" value="Scott Gilbertson"></data>
@@ -24,11 +24,11 @@
             </span>
             <footer>
                 <p class="note--date">
-                    <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.date_created|html5_datetime}}">{{object.date_created|date:"F j, Y"}}</time></a>
+                    <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a>
                 </p>{% if object.location %}
                 <p class="p-location h-adr note--location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">
                     <span class="p-locality">{{object.location.name|smartypants|safe}}</span>, 
-                    <span class="p-region">{{object.state_name}}</span>,
+                    <span class="p-region">{{object.location.state.name}}</span>,
                     <span class="p-country-name">{{object.location.state.country.name}}</span>
                     <data class="p-latitude" value="{{object.latitude}}"></data>
                     <data class="p-longitude" value="{{object.longitude}}"></data>
diff --git a/design/templates/details/note.html b/design/templates/details/note.html
index 87a1e25..269d82a 100644
--- a/design/templates/details/note.html
+++ b/design/templates/details/note.html
@@ -20,7 +20,7 @@
         <article class="h-entry">
             <h1 class="p-name note--title hide">{{object.title|safe|amp|smartypants}}</h1>
             <div class="e-content">
-            {{object.render|safe|amp|smartypants|urlizetrunc:45 }}
+            {{object.body_html|safe|amp|smartypants}}
             </div>
             <span class="p-author h-card">
                 <data class="p-name" value="Scott Gilbertson"></data>
@@ -28,11 +28,11 @@
             </span>
             <footer class="note--footer">
                 <p class="note--date">
-                    <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.date_created|html5_datetime}}">{{object.date_created|date:"F j, Y"}}</time></a>
+                    <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a>
                 </p>{% if object.location %}
                 <p class="p-location h-adr note--location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">
                     <span class="p-locality">{{object.location.name|smartypants|safe}}</span>, 
-                    <span class="p-region">{{object.state_name}}</span>,
+                    <span class="p-region">{{object.location.state}}</span>,
                     <span class="p-country-name">{{object.location.state.country.name}}</span>
                     <data class="p-latitude" value="{{object.latitude}}"></data>
                     <data class="p-longitude" value="{{object.longitude}}"></data>