diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/archives/homepage.html | 18 | ||||
| -rw-r--r-- | templates/base.html | 18 | ||||
| -rw-r--r-- | templates/includes/recent_entries.html | 6 | ||||
| -rw-r--r-- | templates/includes/recent_entries_template.html | 19 |
4 files changed, 29 insertions, 32 deletions
diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html index a84563c..6540ca6 100644 --- a/templates/archives/homepage.html +++ b/templates/archives/homepage.html @@ -9,19 +9,17 @@ {%block bodyid%}id="home"{%endblock%} {% block primary %}<section id="featured"> - <article> - <div id="featured-intro"> - <h1><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h1> - <p> - <span class="location">{% if 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>{%endif%}</span> - <time datetime="{{featured.pub_date|date:'c'}}">{{featured.pub_date|date:"m/d/y"}}</time> - </p> - <p class="hyphenate">{{featured.dek|safe}}</p> - <span class="button"><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More »</a></span> - </div> + <article id="featured-intro"> + <h1><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h1> + <p class="dateline"> + <span class="location">{% if 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>{%endif%}</span> + <time datetime="{{featured.pub_date|date:'c'}}">{{featured.pub_date|date:"m/d/y"}}</time> + </p> <div id="featured-image"> <a href="{{featured.get_absolute_url}}" title="{{featured.title}}"><img src="{{featured.get_image_url}}" alt="{{ featured.title }}" class="post-image" /></a> </div> + <p class="hyphenate">{{featured.dek|safe}}</p> + <span class="button"><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More »</a></span> </article> </section> {%comment%}<section id="currently"> diff --git a/templates/base.html b/templates/base.html index ecf2a5c..2ad4583 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,10 +37,12 @@ <body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}> <header> - <hgroup> - <h1><a id="logo" href="/" title="home">Luxagraf</a></h1> - <h2><a href="/about/" title="About Luxagraf">{a travelogue}</a></h2> - </hgroup> + <a id="logo" href="/" title="home"> + <hgroup> + <h1>Luxagraf</h1> + <h2>{a travelogue}</h2> + </hgroup> + </a> <nav> <ul> <li id="stories"><a href="/writing/1/" title="An archive of writings from around the world">Writing</a>,</li> @@ -57,12 +59,7 @@ </article> {% endblock %} {% block extrabody %} {% endblock %} - - <div class="clearfix"></div> <footer> - <section id="license"> - <p>All content licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" title="read the Attribution-Noncommercial-Share Alike 3.0 deed">details</a>). <span>Built with <a href="http://geodjango.org/" title="a GeoDjango joint">GeoDjango</a> and hosted on <a href="http://www.webfaction.com/" title="webfaction">Webfaction</a>.</span></p> - </section> <nav> <ul> <li><a href="http://feeds2.feedburner.com/luxagraf/blog" title="RSS feed">RSS</a></li> @@ -71,6 +68,9 @@ <li><a href="/contact/" title="contact luxagraf">Contact</a></li> </ul> </nav> + <p id="license"> + All content licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" title="read the Attribution-Noncommercial-Share Alike 3.0 deed">details</a>). <span>Built with <a href="http://geodjango.org/" title="a GeoDjango joint">GeoDjango</a> and hosted on <a href="http://www.webfaction.com/" title="webfaction">Webfaction</a>.</span> + </p> </footer> {% block js %}{% endblock%} <script type="text/javascript"> diff --git a/templates/includes/recent_entries.html b/templates/includes/recent_entries.html index fd9c7ef..48c0b21 100644 --- a/templates/includes/recent_entries.html +++ b/templates/includes/recent_entries.html @@ -1,6 +1,6 @@ <article class="col1"> <h1><a href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">Dinosaur National Monument, Part One: Echo Park</a></h1> - <p> + <p class="dateline"> <span class="location">Dinosaur National Monument, <a href="/writing/united-states/1/" title="travel writing from the United States">Colorado</a></span> <time datetime="2010-07-28T16:00:00">07/28/10</time> @@ -10,7 +10,7 @@ <span class="button"><a class="permalink" href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">More »</a></span> </article><article class="col2"> <h1><a href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">The Endless Crowds of Yellowstone</a></h1> - <p> + <p class="dateline"> <span class="location">Yellowstone National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> <time datetime="2010-07-25T13:00:00">07/25/10</time> @@ -20,7 +20,7 @@ <span class="button"><a class="permalink" href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">More »</a></span> </article><article class="col1"> <h1><a href="/2010/jul/22/backpacking-grand-tetons/" title="Backpacking in the Grand Tetons">Backpacking in the Grand Tetons</a></h1> - <p> + <p class="dateline"> <span class="location">Grand Teton National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> <time datetime="2010-07-22T16:00:00">07/22/10</time> diff --git a/templates/includes/recent_entries_template.html b/templates/includes/recent_entries_template.html index 97c05f9..a743ecf 100644 --- a/templates/includes/recent_entries_template.html +++ b/templates/includes/recent_entries_template.html @@ -1,11 +1,10 @@ {% load typogrify %}{% for object in object_list %}<article class="{% cycle 'col1' 'col2' %}"> - <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> - <p> - <span class="location">{% if 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>{%endif%}</span> - - <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time> - {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%} - </p> - <p class="intro hyphenate">{{object.dek|safe}}</p> - <span class="button"><a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">More »</a></span> - </article>{% endfor %} + <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> + <p class="dateline"> + <span class="location">{% if 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>{%endif%}</span> + <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time> + {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%} + </p> + <p class="hyphenate">{{object.dek|safe}}</p> + <span class="button"><a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">More »</a></span> + </article>{% endfor %} |