diff options
| -rw-r--r-- | app/blog/views.py | 2 | ||||
| -rw-r--r-- | design/templates/archives/writing.html | 20 | ||||
| -rw-r--r-- | design/templates/details/entry.html | 15 |
3 files changed, 20 insertions, 17 deletions
diff --git a/app/blog/views.py b/app/blog/views.py index 8c86839..8ac04dd 100644 --- a/app/blog/views.py +++ b/app/blog/views.py @@ -53,6 +53,7 @@ def entry_list(request, page): extra_context = {'page': page} context = { 'object_list': Entry.objects.filter(status__exact=1).order_by('-pub_date').select_related(), + 'page': page } return render_to_response("archives/writing.html", context, context_instance=RequestContext(request)) @@ -73,5 +74,6 @@ def entry_list_by_area(request, slug, page): context = { 'region': region, 'object_list': qs, + 'page': page } return render_to_response("archives/writing.html", context, context_instance=RequestContext(request)) diff --git a/design/templates/archives/writing.html b/design/templates/archives/writing.html index 4ed8f44..33a2b69 100644 --- a/design/templates/archives/writing.html +++ b/design/templates/archives/writing.html @@ -2,7 +2,7 @@ {% load typogrify_tags %} {% load pagination_tags %} -{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%} Page {{page}}{% endblock %} +{% block pagetitle %}Luxagraf | {% if region %}Travel Writing from {{region.name|title|smartypants|safe}}{%else%}Travel Writing from Around the World {%endif%}{% if page != "1" %} -- Page {{page}}{%endif%}{% endblock %} {% block metadescription %}{% if region %}Travel writing, essays and dispatches from {{region.name|title|smartypants|safe}}{%else%}Travel writing, essays and dispatches from around the world{%endif%} Page {{page}}{% endblock %} {%block bodyid%}id="writing"{%endblock%} @@ -14,19 +14,19 @@ <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Writing </li>{%endif%} </ul> <section id="writing-archive" class="archive"> - <h1 class="hide">{% if region %}Writing Archive from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing Archive {%endif%}</h1>{% autopaginate object_list 10 %} {% for object in object_list %} - <article> - <h1><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1> + <h1 class="hide">{% if region %}Writing from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing Archive {%endif%}</h1>{% autopaginate object_list 10 %} {% for object in object_list %} + <article class="h-entry"> + <h1 class="p-name"><a href="{{object.get_absolute_url}}" class="u-url" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1> <div class="img"> - <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" width="{{object.image_width}}" height="{{object.image_height}}" class="post-image" /></a> + <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" width="{{object.image_width}}" height="{{object.image_height}}" class="u-photo post-image" /></a> </div> <div class="dateline"> - <p class="location bl" 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/" 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}}/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%} - <meta itemprop="latitude" content="{{object.latitude}}" /> - <meta itemprop="longitude" content="{{object.longitude}}" /></p> - <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"m/d/y"}}</time> + <p class="h-adr location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{% if object.country_name == "United States" %}<span class="p-locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name" href="/writing/united-states/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}<span class="p-locality">{{object.location.name|smartypants|safe}}</span></a>, <a class="p-country-name" href="/writing/{{object.location.state.country.slug}}/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%} + <data class="p-latitude" value="{{object.latitude}}"></data> + <data class="p-longitude" value="{{object.longitude}}"></data></p> + <time class="dt-published published updated" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time> </div> - <p class="hyphenate">{{object.dek|safe}}</p> + <p class="p-summary hyphenate">{{object.dek|safe}}</p> </article> {% endfor %} </section> <div id="pagination">{% paginate %} diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html index d227fa2..fc11228 100644 --- a/design/templates/details/entry.html +++ b/design/templates/details/entry.html @@ -16,14 +16,15 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en {% block primary %} - <article role="main" class="hentry h-entry"> + <article role="main" class="h-entry hentry"> <header> - <h1 class="entry-title p-name">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1> - <time class="published updated dt-published" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time> - <aside class="geo bl adr h-adr"> - {% if object.country.name == "United States" %}<span class="locality p-locality">{{object.location.name|smartypants|safe}}</span>, <a class="region p-region" ref="/writing/united-states/1/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="country-name p-country-name" href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%} - <data class="p-latitude" value="{{object.latitude}}"></data> - <data class="p-longitude" value="{{object.longitude}}"></data> + <h1 class="p-name entry-title">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1> + <time class="dt-published published updated" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time> + <p class="p-author hide">Scott Gilbertson</p> + <aside class="h-adr adr geo bl"> + {% 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" ref="/writing/united-states/1/" title="travel writing from the United States">{{object.state.name}}</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="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%} + <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data> + <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data> {%comment%} (<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%} </aside> </header> |