diff options
Diffstat (limited to 'templates/archives')
| -rw-r--r-- | templates/archives/homepage.html | 47 | ||||
| -rw-r--r-- | templates/archives/map.html | 21 | ||||
| -rw-r--r-- | templates/archives/photos.html | 76 | ||||
| -rw-r--r-- | templates/archives/writing.html | 74 |
4 files changed, 59 insertions, 159 deletions
diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html index c6ad42d..03b2888 100644 --- a/templates/archives/homepage.html +++ b/templates/archives/homepage.html @@ -4,41 +4,18 @@ {%block bodyid%}id="home"{%endblock%} -{% block title %}<a href="{{featured.get_absolute_url}}">{{featured.title|smartypants|safe}}</a>{% endblock %} - -{% block date %}{{featured.pub_date|date:"F j, Y"}}{% endblock %} - {% block primary %} -{{featured.lede|smartypants|widont|safe}} -<span class="date"><a href="{{featured.get_absolute_url}}" title="{{object.title}}">More »</a></span> -{% endblock %} - -{% block extrabody %} -<div class="archives"> - <h4 id="archive-header">Recently</h4> - {% include 'includes/recent_entries.html' %} -</div> -{% endblock %} - - - -{% block sidebar %} -<div id="sidebar"> - <div id="nav" class="first"><a href="{{featured.get_previous_published.get_absolute_url}}" title="">«Previous</a></div> - <div class="blok"> - <h4>Topography</h4> - {% include 'includes/regions_sidebar.html' %} - </div> - <div class="blok"> - <h4>About Luxagraf</h4> - {% chunk "about_sidebar" %} - - </div> - - <div class="blok"> - <h4>Follow Along</h4> - {% chunk "follow_sidebar" %} - </div> -</div><!-- sidebar --> + <article> + <section id="featured-article"> + <h1><a href="{{featured.get_absolute_url}}">{{featured.title|widont|smartypants|safe}}</a></h1> + <span class="byline"><time datetime="{{featured.pub_date}}">{{featured.pub_date|date:"F j, Y"}}</time> • <span class="location">{% ifequal featured.location.state.country.name "United States" %}{{featured.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.location.state.name}}</a>{%else%}{{featured.location.name|smartypants|safe}}, <a href="/writing/{{featured.location.state.country.slug}}/1/" title="travel writing from {{featured.location.state.country.name}}">{{featured.location.state.country.name}}</a>{%endifequal%}</span></span> + {{featured.lede|smartypants|widont|safe}}</p> + <span><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More »</a></span> + </section> + <section id="writing-archive"> + <h2>Recently</h2> + {% include 'includes/recent_entries.html' %} + </section> + </article> {% endblock %}
\ No newline at end of file diff --git a/templates/archives/map.html b/templates/archives/map.html index 5deef0f..0a90df9 100644 --- a/templates/archives/map.html +++ b/templates/archives/map.html @@ -17,7 +17,7 @@ Google Maps code {% endblock %} -{%block bodyid%}id="location"{%endblock%} +{%block bodyid%}id="map" {%endblock%} {% block bodyevents %}onload="initialize()" onunload="GUnload()"{% endblock %} @@ -25,19 +25,14 @@ Google Maps code {% block primary %} - <div id="map-canvas"> - -</div> - {% endblock %} - -{% block titleoverride %} {% endblock %} - -{% block sidebar %} -<div id="sidebar"> -{% include 'includes/map_sidebar.html' %} -</div><!-- sidebar --> - + <article> + <div id="map-canvas"> + </div> + <aside>{% include 'includes/map_sidebar.html' %} + </aside> + </article> {% endblock %} + {% block js %} {% include 'includes/map_entry_list.html' %} {%endblock%}
\ No newline at end of file diff --git a/templates/archives/photos.html b/templates/archives/photos.html index d1db79c..f44265d 100644 --- a/templates/archives/photos.html +++ b/templates/archives/photos.html @@ -1,5 +1,4 @@ {% extends 'base.html' %} -{% load chunks %} {% load typogrify %} {% load pagination_tags %} @@ -7,61 +6,22 @@ {% block metadescription %}Photo Archive, Luxagraf{% endblock %} -{%block bodyid%}id="writing-archive"{%endblock%} - -{% block title %}Photos from {% endblock %} - -{% block date %}{% endblock %} - -{% block primaryoverride %}<h2>{% if region %}Photos from {{region.name|title|smartypants|safe}}{%else%}Photos {%endif%}</h2>{% endblock %} -{% block extrabody %} -<div class="photo-archives"> - <ul> - {% autopaginate object_list 20 %} - {% for object in object_list %} - <li> - <dl> - <dt> - <span class="post-image"><a href="{%comment%}{{object.get_absolute_url}}{%endcomment%}http://www.flickr.com/photos/luxagraf/sets/{{object.set_id}}/show/"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a></span> - </dt> - <dd> - <span class="date">{{object.set_title}} {%comment%}{% 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%}{%endcomment%}</span> - {{object.set_desc|truncatewords:30|smartypants|safe}} - </dd> - </dl> - </li> - {% endfor %} - </ul> - - <div class="pagination-wrapper">{% paginate %}</div> -</div> - -{% endblock %} - - - -{% block sidebar %} -<div id="sidebar"> - <div class="blok"> - <h4 class="first">Regions</h4> - {% include 'includes/regions_sidebar.html' %} - </div> - <div class="blok"> - <h4>Countries</h4> - {% include 'includes/country_sidebar.html' %} - - </div> - - <div class="blok"> - <h4>About Luxagraf</h4> - {% chunk "about_sidebar" %} - - </div> - - <div class="blok"> - <h4>Follow Along</h4> - {% chunk "follow_sidebar" %} - </div> -</div><!-- sidebar --> - +{%block bodyid%}id="photo-archive"{%endblock%} + +{% block primary %} + <article> + <h1>{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1> + <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %} + <li> + <a href="{%comment%}{{object.get_absolute_url}}{%endcomment%}http://www.flickr.com/photos/luxagraf/sets/{{object.set_id}}/show/"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a> + <h3>{{object.set_title}}</h3> + <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p> + </li>{% endfor %} + </ul> + + <section id="pagination"> + <ul>{% paginate %} + </ul> + </section> + </article> {% endblock %}
\ No newline at end of file diff --git a/templates/archives/writing.html b/templates/archives/writing.html index 7071a4e..f6cc33e 100644 --- a/templates/archives/writing.html +++ b/templates/archives/writing.html @@ -1,71 +1,39 @@ -{% extends 'base.html' %} -{% load chunks %} +{% extends 'base_single_col.html' %} {% load typogrify %} {% load pagination_tags %} {% block pagetitle %}Luxagraf | {% if region %}Writings from {{region.name|title|smartypants|safe}}{%else%}Writing Archive {%endif%}{% endblock %} {% block metadescription %}Writing Archive, Luxagraf{% endblock %} +{%block bodyid%}id="writing"{%endblock%} -{%block bodyid%}id="writing-archive"{%endblock%} - -{% block title %}Writing Archive{% endblock %} - -{% block date %}{% endblock %} - -{% block primaryoverride %}<h2>{% if region %}Writings from {{region.name|title|smartypants|safe}}{%else%}Writing Archive {%endif%}</h2>{% endblock %} -{% block extrabody %} -<div class="archives"> - <ul> +{% block primary %} + <article> + <h1>{% if region %}Writings from {%ifequal region.name 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Writing Archive {%endif%}</h1> + {% if region %}<span class="all-link"><a href="/writing/1/" title="see all writing">{ View All Writing }</a></span>{%endif%} + <ul id="writing-archive"> {% autopaginate object_list 10 %} {% for object in object_list %} <li> - <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="{%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> - {{object.dek|safe}} - <span class="more"><a href="{{object.get_absolute_url}}" title="{{object.title}}">Read it »</a></span> - </dd> - </dl> + <h3 class="title"><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> + + {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%} + + <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> • <span class="location">{% 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> + + <p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read it »</a></p> + + </li> {% endfor %} </ul> - <div class="pagination-wrapper">{% paginate %}</div> -</div> - + <section id="pagination"> + <ul>{% paginate %} + </ul> + </section> + </article> {% endblock %} -{% block sidebar %} -<div id="sidebar"> - <div class="blok"> - <h4 class="first">Regions</h4> - <ul> - {% include 'includes/regions_sidebar.html' %} - </ul> - </div> - <div class="blok"> - <h4>Countries</h4> - {% include 'includes/country_sidebar.html' %} - - </div> - - <div class="blok"> - <h4>About Luxagraf</h4> - {% chunk "about_sidebar" %} - - </div> - - <div class="blok"> - <h4>Follow Along</h4> - {% chunk "follow_sidebar" %} - </div> -</div><!-- sidebar --> - -{% endblock %}
\ No newline at end of file |