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

5 files changed, 18 insertions, 13 deletions

diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html
index 7003943..2436795 100644
--- a/templates/archives/homepage.html
+++ b/templates/archives/homepage.html
@@ -12,12 +12,12 @@
                         <h3><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h3>
              
                         <p>
-                            <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> &nbsp;
+                            <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> &nbsp;
                             <time datetime="{{featured.pub_date}}">{{featured.pub_date|date:"m/d/y"}}</time>
                         </p>
                                 
-                        <p>{{featured.dek|safe}}</p>
-                         <span><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More &raquo;</a></span>
+                        <p class="hyphenate">{{featured.dek|safe}}</p>
+                        <span class="button"><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More &raquo;</a></span>
                     </div>
                     <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>
@@ -42,4 +42,6 @@
     </article>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block js %}<script src="/media/js/hyphenate.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file
diff --git a/templates/archives/photos.html b/templates/archives/photos.html
index e4dfe5f..84cbf01 100644
--- a/templates/archives/photos.html
+++ b/templates/archives/photos.html
@@ -14,8 +14,8 @@
             
             <ul id="breadcrumbs">
                <li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
-               {% if region %}{%ifequal region.name 'United States'%} <li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li>
-               <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Photos </li>{%endif%}
+               {% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li>
+               <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}Photos </li>{%endif%}
             </ul>
     
             <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %}
diff --git a/templates/archives/projects.html b/templates/archives/projects.html
index 52edbb7..8efe6aa 100644
--- a/templates/archives/projects.html
+++ b/templates/archives/projects.html
@@ -22,7 +22,8 @@
             <div class="tease">
                 <h4><a href="{{project.get_absolute_url}}">{{project.title|safe}}{{project.subtitle|safe}}</a></h4> 
              
-                <div class="lede">{{project.lede|smartypants|safe}}</div>
+                <div class="lede hyphenate">{{project.lede|smartypants|safe}}</div>
+                <span class="button"><a href="{{project.get_absolute_url}}">More&nbsp;&raquo;</a></span>
             </div>
             <div class="img"><img src="{{project.image.url}}"  /></div>
         </li>
@@ -32,3 +33,4 @@
 </article>
 {% endblock %}
 
+{% block js %}<script src="/media/js/hyphenate.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file
diff --git a/templates/archives/topics.html b/templates/archives/topics.html
index 2e4802e..008ab6f 100644
--- a/templates/archives/topics.html
+++ b/templates/archives/topics.html
@@ -19,7 +19,7 @@
             
             {%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> &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>
+            <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> &bull; <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>
                     
             <p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read&nbsp;it&nbsp;&raquo;</a></p>
                     
diff --git a/templates/archives/writing.html b/templates/archives/writing.html
index 5b5f93d..7628272 100644
--- a/templates/archives/writing.html
+++ b/templates/archives/writing.html
@@ -9,12 +9,12 @@
 
 {% block primary %}
     <article>
-    <h1 class="hide">{% if region %}Writings from {%ifequal region.name 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Writing {%endif%}</h1>
+    <h1 class="hide">{% if region %}Writings from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing {%endif%}</h1>
     
     <ul id="breadcrumbs">
         <li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
-        {% if region %}{%ifequal region.name 'United States'%} <li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li>
-        <li>the United States</li>{%else%}<li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Writing </li>{%endif%}
+        {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li>
+        <li>the United States</li>{%else%}<li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing </li>{%endif%}
     </ul>
     
     <ul id="writing-archive">
@@ -25,11 +25,11 @@
                 <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>
      
                 <p>
-                    <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> &nbsp;
+                    <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> &nbsp;
                     <time datetime="{{object.pub_date}}">{{object.pub_date|date:"m/d/y"}}</time>
                 </p>
                         
-                <p>{{object.dek|safe}}</p>
+                <p class="hyphenate">{{object.dek|safe}}</p>
             </div>
             <div class="img">
                 <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="post-image" /></a>
@@ -48,3 +48,4 @@
 
 
 
+{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.js" type="text/javascript"></script>{% endblock%}
\ No newline at end of file