updated styles and templates for revamped design

1 files changed, 13 insertions, 51 deletions

diff --git a/templates/details/entry.html b/templates/details/entry.html
index c94485d..9454a41 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -3,12 +3,6 @@
 
 {% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}){% endblock %}
 
-{%block stylesheet%}{%if object.template_name == 2 or object.template_name == 3 %}<link rel="stylesheet" 
-          href="{{MEDIA_URL}}css/dark.css" 
-          type="text/css" 
-          media="screen">{%else%}{{block.super}}{%endif%}{%endblock%}
-
-
 {% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
 {%block extrahead%}
      <link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
@@ -17,15 +11,15 @@
      <meta name="geo.placename" content="{% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, {{object.state_name}}{%else%}{{object.location_name|smartypants|safe}}, {{object.country_name}}{%endif%}"> 
      <meta name="geo.region" content="{{object.country_iso}}{%if object.state_iso != None %}-{{object.state_iso}}{%endif%}">
 {%endblock%}
-
-{%block bodyid%}class="{%if object.template_name == 0 %}single"{%endif%}{%if object.template_name == 2%}single"{%endif%}{%if object.template_name == 1 %}double"{%endif%}{%if object.template_name == 3 %}double"{%endif%}{%endblock%}
+{%block htmlclass%}{% with object.template_name as t %}
+class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}"{%endwith%}{%endblock%}
 								
 				
 {% block primary %}		
     <article role="main">
         <header>
             <h1>{{object.title|smartypants|widont|safe}}</h1>
-            <aside class="geo">
+            <aside class="geo bl">
                 <span class="location" 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/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.country_name|slugify}}/1/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}
                 <meta itemprop="latitude" content="{{object.latitude}}" />
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span>
@@ -33,44 +27,29 @@
             </aside>
             <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
         </header>
-        <div id="post-body">
+        <div class="post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}">
             {{object.body_html|smartypants|widont|safe}}
         </div>{%if object.template_name == 1 %}
         <div class="clearfix"></div>{%endif%}{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
-        {% with object.get_next_published as next %}
-        {% with object.get_previous_published as prev %}
-        <nav id="page-navigation">
-            <table>{% if prev%}
-                <tr>
-                    <td><strong>Previous:</strong></td>
-                    <td><a href="{{ prev.get_absolute_url }}" title="{{prev.title}}">{{prev.title}}</a></td>
-                </tr>{%endif%}
-                <tr>{% if next%}
-                    <td><strong>Next:</strong></td>
-                    <td><a href="{{ next.get_absolute_url }}" title="{{next.title}}">{{next.title}}</a></td>
-                </tr>{%endif%}
-            </table> {%endwith%}{%endwith%}
-        </div>
         {%comment%}
         <footer id="post-metadata">
             <h4 class="hide">About {{object.title|smartypants|safe}}</h4>
             <p>Posted <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F j, Y"}}</time>, from {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.country_name|slugify}}/1/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}.
             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 me, 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>
         </footer>
-        
+        {% endcomment %}
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}
         <nav id="page-navigation">
-            <ul>{% if next%}
-                <li id="prev"><span>Next:</span> 
-                    <a href="{{ next.get_absolute_url }}" title=" {{next.title}}">{{next.title}}</a>
-                </li>{%endif%}
-                {% if prev%}<li id="next"><span>Previous:</span> 
-                    <a href="{{ prev.get_absolute_url }}" title=" {{prev.title}}">{{prev.title}}</a>
+            <ul>{% if prev%}<li id="next"><span class="bl">Previous:</span> 
+                    <a href="{{ prev.get_absolute_url }}" title=" {{prev.title}}">{{prev.title|safe}}</a>
+                </li>{%endif%}{% if next%}
+                <li id="prev"><span class="bl">Next:</span> 
+                    <a href="{{ next.get_absolute_url }}" title=" {{next.title}}">{{next.title|safe}}</a>
                 </li>{%endif%}
             </ul>
         </nav>{%endwith%}{%endwith%}
-        {% endcomment %}
+        
         {%comment%}
         <section id="comments">
             <h4><a class="disqus-link-count" href="{{object.get_absolute_url}}#disqus_thread">Comments</a></h4>
@@ -80,23 +59,6 @@
     </article>
 {% endblock %}
 {% block js %}
-{%comment%}
-<script type="text/javascript">
-//<![CDATA[
-(function() {
-	var links = document.getElementsByTagName('a');
-	var query = '?';
-	for(var i = 0; i < links.length; i++) {
-	if(links[i].href.indexOf('#disqus_thread') >= 0) {
-		query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
-	}
-	}
-	document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/luxagraf/get_num_replies.js' + query + '"></' + 'script>');
-})();
-//]]>
-</script>
-{%endcomment%}
-{%if object.template_name == 1 or object.template_name == 3 %}
+{% with object.template_name as t %}{%if t == 1 or t == 3 %}
 <script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>
-{%endif%}
-{% endblock%}
\ No newline at end of file
+{%endif%}{%endwith%}{%endblock%}