summaryrefslogtreecommitdiff
path: root/templates/details
diff options
context:
space:
mode:
Diffstat (limited to 'templates/details')
-rw-r--r--templates/details/entry.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/details/entry.html b/templates/details/entry.html
index 3e15f83..ccae192 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -1,9 +1,9 @@
{% extends 'base.html' %}
{% load typogrify %}
-{% block pagetitle %}{{object.title|title|smartypants|safe}} ({% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}) | Luxagraf, a travelogue{% endblock %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}){% endblock %}
-{% block metadescription %}Luxagraf: {{object.dek|striptags|safe}}{% endblock %}
+{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
{%block extrahead%}
<link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
<meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
@@ -18,7 +18,7 @@
{% block primary %}
<article>
<section id="post">
- <h1>{{object.title|smartypants|safe}}</h1>
+ <h1>{{object.title|smartypants|widont|safe}}</h1>
<aside class="meta">
<div class="geo">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></div>
<span class="topics">Topics: {%for topic in object.topics.all%}<a href="{{topic.get_absolute_url}}" title="view more {{topic.name}} posts">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{% endfor %}</span>
@@ -65,4 +65,4 @@
})();
//]]>
</script>
-{% endblock%} \ No newline at end of file
+{% endblock%}ck%}} \ No newline at end of file