summaryrefslogtreecommitdiff
path: root/design/templates/details
diff options
context:
space:
mode:
authorsng <sng@snglinux.(none)>2013-05-28 19:59:43 -0400
committersng <sng@snglinux.(none)>2013-05-28 19:59:43 -0400
commit4157151bed0c83e72f705c96c0732aab0d6a74f8 (patch)
treeb855113048af9511dd298edacfeee449a11fcabc /design/templates/details
parent38b863f790eecdc328bd43589bca3630e46be73e (diff)
parent9d928c8004e50b2aef49493fb9ad79e4ac13064a (diff)
Merge branch 'master' of http://git.luxagraf.net/luxagraf
Diffstat (limited to 'design/templates/details')
-rw-r--r--design/templates/details/entry.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 5209d09..bc23646 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.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%}
</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}}