From f2265caef899bb7d06022f38687846a7fa22af40 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Sun, 1 Mar 2015 11:51:18 -0500
Subject: added inline maps to entry pages and fixed some media and footnote
 css bugs

---
 design/templates/details/entry.html | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'design/templates/details/entry.html')

diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 0fe59ae..5288c3c 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -19,18 +19,18 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
 {% block primary %}		
     <main role="main">
     <article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}">
-            <header id="head" class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
+            <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">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-                <time id="map-anchor" 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>
+                <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="p-author author hide" id="author">Scott Gilbertson</p>
                 <aside class="p-location h-adr adr post--location" >
                     {% if object.country.name == "United States" %}<span class="p-locality locality" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{{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%}
                     <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data>
                     <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data>
-                    {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
+                    {% 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>
             </header>
-        <div class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}">
+        <div id="article" class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}">
             {{object.body_html|safe|smartypants|widont}}
         </div>
         </article>
@@ -61,20 +61,14 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
 {% render_comment_form for object %}
 {% endblock %}
 {% block js %}
-     <script type="text/javascript">
-window.onload = function() {
-    var map_anchor = document.getElementById("head");
-    var parentDiv = map_anchor.parentNode;
-    var map_icon = document.createElement("div");
-    //var img = document.createElement("img");
-    //img.src = '//images.luxagraf.net/map-icons/ath.png';
-    //map_icon.appendChild(img);
-    map_icon.className += "map--icon";
-    map_icon.style.background = "url('//images.luxagraf.net/map-icons/ath.png')";
-    //parentDiv.insertAfter(map_icon, map_anchor);
-    map_anchor.parentNode.insertBefore(map_icon, map_anchor.nextSibling);
+{% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %}
+<script src="/media/js/leaflet-master/leaflet-mod.js"></script>
+<script src="/media/js/detail.js"></script>
+{%endif%}{%endwith%}
 
-    //delay loading of gravatar images using nsoscript data-hash attribute
+<script type="text/javascript">
+window.onload = function() {
+    //delay loading of gravatar images using noscript data-hash attribute
     dataattr = document.getElementsByClassName("datahashloader");
     for(var i=0; i<dataattr.length; i++) {
         var c = dataattr[i].parentNode;
@@ -82,10 +76,13 @@ window.onload = function() {
         img.src = 'https://images.luxagraf.net/gravcache/' + dataattr[i].getAttribute('data-hash') + '.jpg';
         img.className += "gravatar";
         c.insertBefore(img, c.childNodes[3]);
-
     }
+    {% with object.get_template_name_display as t %}{%if t == "single" or t == "single-dark" %}
+    createMap();
+    var open = false;
+    {%endif%}{%endwith%}
 }
-     </script>
+</script>
 {% with object.template_name as t %}{%if t == 1 or t == 3 %}
 <script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>
 {%endif%}{%endwith%}{%endblock%}
-- 
cgit v1.2.3-70-g09d2