From a73d0e0498f0784859b154840de1da4b0742cc38 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Sun, 26 May 2013 21:58:48 -0400
Subject: fixed bug regarding location data in template code

---
 design/templates/details/entry.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'design/templates/details')

diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 5209d09..adc1c1c 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -19,13 +19,13 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
     <article role="main">
         <header>
             <h1>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
             <aside class="geo bl">
-                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}
+                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
                 <meta itemprop="latitude" content="{{object.latitude}}" />
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span>
                 {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
             </aside>
-            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
         </header>
         <div class="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|smartypants|widont|safe}}
-- 
cgit v1.2.3-70-g09d2


From 9d928c8004e50b2aef49493fb9ad79e4ac13064a Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Sun, 26 May 2013 22:05:13 -0400
Subject: fixed bug regarding state/location data in template code

---
 design/templates/details/entry.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'design/templates/details')

diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index adc1c1c..bc23646 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -21,7 +21,7 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
             <h1>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
             <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
             <aside class="geo bl">
-                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
+                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​Geo">{% if object.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state}}</a>, U.S.{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
                 <meta itemprop="latitude" content="{{object.latitude}}" />
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span>
                 {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
-- 
cgit v1.2.3-70-g09d2