redesign tentatively complete

1 files changed, 28 insertions, 52 deletions

diff --git a/templates/details/entry.html b/templates/details/entry.html
index ebf001d..29570b5 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -1,66 +1,42 @@
 {% 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 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}}, <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 %}
 
+{% block metadescription %}Luxagraf: {{object.dek|striptags|safe}}{% endblock %}
 
-				
-				{% block title %}{{object.title|smartypants|safe}}{% endblock %}
+{%block bodyid%}class="writing-detail"{%endblock%}
 								
 				
-                {% block primary %}
-				
-                {{object.body_html|smartypants|widont|safe}}
-                
-                
-                
-				<div id="extra">
-                    <p><span>{{object.title|title|smartypants|safe}}</span> was posted {{ object.pub_date|timesince }} ago from <!--<a href="{{object.location.get_absolute_url}}" title="see other entries from {{object.location.name}}">-->{{object.location.name|smartypants|safe}}<!--</a>-->, which is in {%ifequal object.location.state.country.name 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>,{%endifequal%} <a href="/writing/{{object.location.state.country.slug}}/1/" title="see other entries from {{object.location.state.country.name}}">{{object.location.state.country.name|smartypants|safe}}</a>. You can find nearby entries by browsing the <a href="/map/">Map</a>.
-                
-                
-                    <p>If you enjoyed reading this, you can follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about luxagraf, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
-                </div>
+{% block primary %}		
+    <article>
+            <section id="post">
+                <h1>{{object.title|smartypants|safe}}</h1>
+    
+                <span class="byline"><time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> &bull; <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></span>
                 
-                <div id="nav">
-                    <ul>
-                        {% if object.get_previous_published%}
+                {{object.body_html|smartypants|widont|safe}}
+            </section>
+            <section id="post-metadata">
+                <h4>About {{object.title|title|smartypants|safe}}</h4>
+                <p><span>{{object.title|title|smartypants|safe}}</span> was posted {{ object.pub_date|timesince }} ago from <!--<a href="{{object.location.get_absolute_url}}" title="see other entries from {{object.location.name}}">-->{{object.location.name|smartypants|safe}}<!--</a>-->, which is in {%ifequal object.location.state.country.name 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>,{%endifequal%} <a href="/writing/{{object.location.state.country.slug}}/1/" title="see other entries from {{object.location.state.country.name}}">{{object.location.state.country.name|smartypants|safe}}</a>. You can find nearby entries by browsing the <a href="/map/">Map</a>.
+                <p>If you enjoyed reading this, you can follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about luxagraf, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
+            </section>
+            <section id="page-navigation">
+                <nav>
+                    <ul>{% if object.get_previous_published%}
                         <li>
                             <a href="{{ object.get_previous_published.get_absolute_url }}" title=" {{object.get_previous_published.title}}">&laquo;previous</a>
-                        </li>
-                        {%endif%}
-                        {% if object.get_next_published%}
+                        </li>{%endif%}{% if object.get_next_published%}
                         <li class="next">
                             <a href="{{ object.get_next_published.get_absolute_url }}" title=" {{object.get_next_published.title}}">next&raquo;</a>
-        
-                        </li>
-                        {%endif%}
-                    </ul>
-                </div>
-                 <h4 id="comment-header">comments</h4>
-                 {# Load and display comments #}
-                 <div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/luxagraf/embed.js"></script><noscript><a href="http://luxagraf.disqus.com/?url=ref">View the discussion thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-
-			{% endblock %}
-
-			
-    
-{% block sidebar %}
-            <div id="sidebar">
-                <div id="nav">
-                    <ul>
-                        {% if object.get_previous_published%}
-                        <li>
-                            <a href="{{ object.get_previous_published.get_absolute_url }}" title=" {{object.get_previous_published.title}}">&laquo; previous</a>
-                        </li>
-                        {%endif%}
-                        {% if object.get_next_published%}
-                        <li class="next">
-                            <a href="{{ object.get_next_published.get_absolute_url }}" title=" {{object.get_next_published.title}}">next &raquo;</a>
-        
-                        </li>
-                        {%endif%}
+                        </li>{%endif%}
                     </ul>
-                </div>
-            </div>
+                </nav>
+            </section>
+            <section id="comments">
+                <h4>Comments on <span>{{object.title|title|smartypants|safe}}</span></h4>
+                <div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/luxagraf/embed.js"></script><noscript><a href="http://luxagraf.disqus.com/?url=ref">View the discussion thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+            </section>
+    </article>
 {% endblock %}
\ No newline at end of file