added hyphenation support and changed to justified text for homepage and writing archives. Also eliminated ifequal and ifnotequal template tags

1 files changed, 15 insertions, 15 deletions

diff --git a/templates/details/entry.html b/templates/details/entry.html
index 9bd8535..db378a7 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -1,16 +1,16 @@
 {% extends 'base.html' %}
 {% load typogrify %}
 
-{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% 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%}){% endblock %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if 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}}{%endif%}){% endblock %}
 
-{%block stylesheet%}{%ifequal object.template_name 2%}<link rel="stylesheet" 
-          href="{{media_url}}css/dark.css" 
+{%block stylesheet%}{%if object.template_name == 2%}<link rel="stylesheet" 
+          href="{{MEDIA_URL}}css/dark.css" 
           type="text/css" 
-          media="screen">{%endifequal%}
-          {%ifequal object.template_name 3%}<link rel="stylesheet" 
-          href="{{media_url}}css/dark.css" 
+          media="screen">{%endif%}
+          {%if object.template_name == 3%}<link rel="stylesheet" 
+          href="{{MEDIA_URL}}css/dark.css" 
           type="text/css" 
-          media="screen">{%endifequal%}{%endblock%}
+          media="screen">{%endif%}{%endblock%}
 
 
 {% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
@@ -18,11 +18,11 @@
      <link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
      <meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
      <meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
-     <meta name="geo.placename" content="{% 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%}"> 
-     <meta name="geo.region" content="{% ifequal object.location.state.country.name "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endifequal%}">
+     <meta name="geo.placename" content="{% if 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}}{%endif%}"> 
+     <meta name="geo.region" content="{% if object.location.state.country.name == "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endif%}">
 {%endblock%}
 
-{%block bodyid%}id="writing-detail" class="{%ifequal object.template_name 0%}single"{%endifequal%}{%ifequal object.template_name 2%}single"{%endifequal%}{%ifequal object.template_name 1%}double"{%endifequal%}{%ifequal object.template_name 3%}double"{%endifequal%}{%endblock%}
+{%block bodyid%}id="writing-detail" 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 primary %}		
@@ -30,21 +30,21 @@
             <header>
                 <h1>{{object.title|smartypants|widont|safe}}</h1>
                 <aside class="meta">
-                    <section class="geo">{% 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 class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
+                    <section class="geo">{% 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 class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
                     
                     
                     {%comment%}<span class="topics">Topics: {%for topic in object.topics.all%}<a href="{{topic.get_absolute_url}}" title="view more {{topic.name}} posts">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{% endfor %}</span>{%endcomment%}
 
                 </aside>
             </header>
-            <div id="post-body">
+            <div id="post-body" class="hyphenate">
                 {{object.body_html|smartypants|widont|safe}}
             </div>
-            {%ifequal object.template_name 1%}<div class="clearfix"></div>{%endifequal%}
-            {%ifequal object.template_name 3%}<div class="clearfix"></div>{%endifequal%}
+            {%if object.template_name == 1 %}<div class="clearfix"></div>{%endif%}
+            {%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
             <section id="post-metadata">
                 <h4 class="hide">About {{object.title|smartypants|safe}}</h4>
-                <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%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>{% else %}{{object.location.state.country.name}}{%endifequal%}.
+                <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%if 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>{% else %}{{object.location.state.country.name}}{%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>
             </section>
             <section id="page-navigation">