diff options
| -rw-r--r-- | templates/archives/homepage.html | 2 | ||||
| -rw-r--r-- | templates/archives/writing.html | 2 | ||||
| -rw-r--r-- | templates/base.html | 4 | ||||
| -rw-r--r-- | templates/details/entry.html | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html index aceb846..2d72d0b 100644 --- a/templates/archives/homepage.html +++ b/templates/archives/homepage.html @@ -22,7 +22,7 @@ <dl> <dt> <span class="post-image"><img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}"/></span> - <h3><a href="{{object.get_absolute_url}}" title="{{object.title}}">{{object.title|smartypants|widont|safe}}</a></h3> + <h3><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h3> </dt> <dd> <span class="date">{{object.pub_date|date:"F j, Y"}} {% 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%}</span> diff --git a/templates/archives/writing.html b/templates/archives/writing.html index f3bc288..a3d1a3b 100644 --- a/templates/archives/writing.html +++ b/templates/archives/writing.html @@ -23,7 +23,7 @@ <dl> <dt> <span class="post-image"><img src="{%if object.thumbnail%}{{object.get_thumbnail_url}}" alt="{{ object.title }}{%endif%}"/></span> - <h3><a href="{{object.get_absolute_url}}" title="{{object.title}}">{{object.title|smartypants|widont|safe}}</a></h3> + <h3><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h3> </dt> <dd> <span class="date">{{object.pub_date|date:"F j, Y"}} {% 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%}</span> diff --git a/templates/base.html b/templates/base.html index a1da32f..933c9ea 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,7 +9,7 @@ <link rel="alternate" type="application/rss+xml" title="RSS 2.0" - href="http://feeds.feedburner.com/luxagraf/everything"> + href="http://feeds2.feedburner.com/luxagraf/blog"> <link rel="stylesheet" @@ -65,7 +65,7 @@ {% block primaryoverride %} <div class="content"> - {% block titleoverride %}<h2>{% block title %}{% endblock %}</h2>{% endblock %} + {% block titleoverride %}<h1>{% block title %}{% endblock %}</h1>{% endblock %} {% block primary %} {% endblock %} diff --git a/templates/details/entry.html b/templates/details/entry.html index d9f7cb7..68e331c 100644 --- a/templates/details/entry.html +++ b/templates/details/entry.html @@ -1,8 +1,8 @@ {% extends 'base.html' %} {% load typogrify %} -{% block pagetitle %}Luxagraf | {{object.title|title|smartypants|safe}}{% endblock %} +{% 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 metadescription %}Luxagraf: {{object.dek|striptags|safe}}{% endblock %} -{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% 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%}</span>{% endblock %} +{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="http://luxagraf.net/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="http://luxagraf.net/writing/{{object.location.state.country.slug}}" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%}</span>{% endblock %} |