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

13 files changed, 63 insertions, 58 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
diff --git a/templates/base.html b/templates/base.html
index 351df30..320b114 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     
     <!--[if IE]>
-    <script src="{{media_url}}js/html5.js"></script>
+    <script src="{{MEDIA_URL}}js/html5.js"></script>
     <![endif]-->
 
 
@@ -16,16 +16,16 @@
 
 
     <link rel="stylesheet" 
-          href="{{media_url}}css/base.css" 
+          href="{{MEDIA_URL}}css/base.css" 
           type="text/css" 
           media="screen">
     <link rel="stylesheet" 
-          href="{{media_url}}css/print.css" 
+          href="{{MEDIA_URL}}css/print.css" 
           type="text/css" 
           media="print">
     {%block stylesheet%}{%endblock%}
 
-    <!--[if lte IE 7]><link rel="stylesheet" href="http://luxagraf.net/media/css/ie.css" type="text/css" media="screen, projection"><![endif]-->
+    <!--[if lte IE 7]><link rel="stylesheet" href="{{MEDIA_URL}}css/ie.css" type="text/css" media="screen, projection"><![endif]-->
     
        
     <link rel="shortcut icon" 
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">
diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html
index 0ba0636..4e1084e 100644
--- a/templates/details/national-parks.html
+++ b/templates/details/national-parks.html
@@ -4,17 +4,13 @@
 {% block metadescription %}{% endblock %}
 
 {% block extrahead %}
-<script type="text/javascript" src="/media/js/jquery.js"></script>
-<script src="http://documentcloud.github.com/underscore/underscore-min.js" type="text/javascript"></script>
-<script src="/media/js/natparks.js" type="text/javascript"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/underscore-min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/natparks.js" ></script>
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 
-
-
-
-
 <link rel="stylesheet" 
-          href="{{media_url}}css/dark.css" 
+          href="{{MEDIA_URL}}css/dark.css" 
           type="text/css" 
           media="screen">
 
diff --git a/templates/details/photo.html b/templates/details/photo.html
index 22adeb9..200995f 100644
--- a/templates/details/photo.html
+++ b/templates/details/photo.html
@@ -1,8 +1,8 @@
 {% extends 'base.html' %}
 {% load typogrify %}
 {% block pagetitle %}Luxagraf | {{object.title|title|smartypants|safe}}{% endblock %}
-{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% 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}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}</span>{% endblock %}
+{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %}
+{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% 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%}</span>{% endblock %}
 
 
 				
@@ -12,9 +12,9 @@
                 {% block primary %}
 				
                 <a href="http://flickr.com/photos/luxagraf/{{object.flickr_id}}/" title="View {{object.flickr_title}} on Flickr.com"><img class="flickr-image" src="{{ object.get_medium_url }}" alt="{{object.title}}" title="{{object.title}}" /></a> 
-			{% ifnotequal object.description 'None' %}
+			{% if object.description != 'None' %}
 			<p>{{ object.description|smartypants|widont|safe }}</p>
-			{%endifnotequal %}
+			{%endif %}
 			<p>Other Sizes: <a href="{{object.get_large_url}}" title="see large image">Large</a> and
 			<a href="http://flickr.com/photo_zoom.gne?id={{object.flickr_id}}&size=o" title="see original image">Original</a></p>
 			
@@ -72,7 +72,7 @@
 	
                 <dl class="sidebar meta">
 				<dt>Camera:</dt>
-				<dd>{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
+				<dd>{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
 				<dt>Aperture:</dt>
 				<dd>{%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}</dd>
 				<dt>Shutter Speed:</dt>
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
index 8c1e097..04e1088 100644
--- a/templates/details/photo_galleries.html
+++ b/templates/details/photo_galleries.html
@@ -16,7 +16,7 @@
 
 
     <link rel="stylesheet" 
-          href="{{media_url}}css/photos.css" 
+          href="{{MEDIA_URL}}css/photos.css" 
           type="text/css" 
           media="screen">
           
@@ -81,9 +81,9 @@
                 <div class="meta" style="display: none;">
                         <dl>
                             <dt>Camera:</dt>
-                            <dd>{% ifequal photo.exif_make 'Canon'%}{{photo.exif_model}}{%endifequal%}{% ifequal photo.exif_model 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endifequal%}{%ifequal photo.exif_model 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endifequal%}</dd>
+                            <dd>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endif%}</dd>
                             <dt>Lens: </dt>
-                            <dd>{%ifequal photo.exif_lens 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens '' %}Built-in{%endifequal%}</dd>
+                            <dd>{%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens =='' %}Built-in{%endif%}</dd>
                             <dt>Exposure</dt>
                             <dd>{{photo.exif_exposure}}</dd>
                             <dt>Aperture</dt>
diff --git a/templates/includes/map_entry_list_template.html b/templates/includes/map_entry_list_template.html
index ed34d11..0705602 100644
--- a/templates/includes/map_entry_list_template.html
+++ b/templates/includes/map_entry_list_template.html
@@ -59,7 +59,7 @@
           markerOptions = { clickable:true, draggable:false, icon:tinyIcon};
           marker_{{entry.title|truncatewords:2|slugify_under}} = new GMarker(point_{{entry.title|truncatewords:2|slugify_under}}, markerOptions);
           map.addOverlay(marker_{{entry.title|truncatewords:2|slugify_under}});
-          marker_{{entry.title|truncatewords:2|slugify_under}}.info_window_content = '<div class="infowin"><h4>{{entry.title}}<\/h4><span class="date blok">{{entry.pub_date|date:"F j, Y"}} ({% ifequal entry.location.state.country.name "United States" %}{{entry.location.name|smartypants|safe}}, {{entry.location.state.name}}){%else%}{{entry.location.name|smartypants|safe}}, {{entry.location.state.country.name}}){%endifequal%}<\/span><p><img src="{{entry.get_thumbnail_url}}" height="100" alt="{{ entry.title }}"  style="float: left; border: #000 10px solid; margin-right: 8px; margin-bottom: 4px; height: 100px;" \/>{{entry.dek|escapejs}} <a href="{{entry.get_absolute_url}}">Read it &raquo;<\/a><\/p><\/div>'
+          marker_{{entry.title|truncatewords:2|slugify_under}}.info_window_content = '<div class="infowin"><h4>{{entry.title}}<\/h4><span class="date blok">{{entry.pub_date|date:"F j, Y"}} ({% if entry.location.state.country.name == "United States" %}{{entry.location.name|smartypants|safe}}, {{entry.location.state.name}}){%else%}{{entry.location.name|smartypants|safe}}, {{entry.location.state.country.name}}){%endif%}<\/span><p><img src="{{entry.get_thumbnail_url}}" height="100" alt="{{ entry.title }}"  style="float: left; border: #000 10px solid; margin-right: 8px; margin-bottom: 4px; height: 100px;" \/>{{entry.dek|escapejs}} <a href="{{entry.get_absolute_url}}">Read it &raquo;<\/a><\/p><\/div>'
           marker_{{entry|truncatewords:2|slugify_under}}.bindInfoWindowHtml(marker_{{entry|truncatewords:2|slugify_under}}.info_window_content, {maxWidth:400});
           GEvent.addListener(marker_{{entry.title|truncatewords:2|slugify_under}}, "click", function() {
             map.panTo(point_{{entry.title|truncatewords:2|slugify_under}}, 2);
diff --git a/templates/includes/recent_entries.html b/templates/includes/recent_entries.html
index 58b165b..4b5acba 100644
--- a/templates/includes/recent_entries.html
+++ b/templates/includes/recent_entries.html
@@ -2,32 +2,35 @@
             <ul>
                 <li class="col1">
                     <h3><a href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">(There&#8217;ll Be) Peace in the&nbsp;Valley</a></h3>
-                    <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/deathvalley.jpg" alt="(There&#39;ll Be) Peace in the Valley" class="post-image" />
                     <p>
                         <span class="location">Death Valley, <a href="/writing/united-states/1/" title="travel writing from the United States">California</a></span> &nbsp;
     
                         <time datetime="2010-04-24 10:45:59">04/24/10</time>
+                        <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/deathvalley.jpg" alt="(There&#39;ll Be) Peace in the Valley" class="post-image" />
                     </p>
-                    <p class="intro">Sometimes you ignore the places close to home because, well, there's always next weekend. Which is why I never made it Death Valley in the twenty-five years I lived in California. It took being all the way across the country to get me out to Death Valley. Which might explain why I actually got up before dawn just to watch the sunrise at Zabriskie Point.  <a class="permalink" href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">Read&nbsp;it&nbsp;&raquo;</a></p>
+                    <p class="intro hyphenate">Sometimes you ignore the places close to home because, well, there's always next weekend. Which is why I never made it Death Valley in the twenty-five years I lived in California. It took being all the way across the country to get me out to Death Valley. Which might explain why I actually got up before dawn just to watch the sunrise at Zabriskie Point. </p>
+                    <span class="button"><a class="permalink" href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">More&nbsp;&raquo;</a></span>
                 </li>
                 <li class="col2">
                     <h3><a href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">So Far, I Have Not Found The&nbsp;Science</a></h3>
-                    <img src="http://127.0.0.1:8000/images/post-thumbs/2010/okeefenokee.jpg" alt="So Far, I Have Not Found The Science" class="post-image" />
                     <p>
                         <span class="location">Okefenokee Swamp, <a href="/writing/united-states/1/" title="travel writing from the United States">Georgia</a></span> &nbsp;
     
                         <time datetime="2010-03-13 11:50:48">03/13/10</time>
+                        <img src="http://127.0.0.1:8000/images/post-thumbs/2010/okeefenokee.jpg" alt="So Far, I Have Not Found The Science" class="post-image" />
                     </p>
-                    <p class="intro">A canoe trip through the Okefenokee Swamp down in the southern most corner of Georgia. Paddling the strange reddish and incredibly still waters. Begging alligators, aching muscles and the kindly folks of Stintson's Barbecue all getting their due. <a class="permalink" href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">Read&nbsp;it&nbsp;&raquo;</a></p>
+                    <p class="intro hyphenate">A canoe trip through the Okefenokee Swamp down in the southern most corner of Georgia. Paddling the strange reddish and incredibly still waters. Begging alligators, aching muscles and the kindly folks of Stintson's Barbecue all getting their due.</p>
+                    <span class="button"><a class="permalink" href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">More&nbsp;&raquo;</a></span>
                 </li>
                 <li class="col1">
                     <h3><a href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">How to Get Off Your Butt and Travel the&nbsp;World</a></h3>
-                    <img src="http://127.0.0.1:8000/images/post-thumbs/2010/traveltheworld.jpg" alt="How to Get Off Your Butt and Travel the World" class="post-image" />
                     <p>
                         <span class="location">Athens, <a href="/writing/united-states/1/" title="travel writing from the United States">Georgia</a></span> &nbsp;
     
                         <time datetime="2009-05-03 18:39:16">05/03/09</time>
+                        <img src="http://127.0.0.1:8000/images/post-thumbs/2010/traveltheworld.jpg" alt="How to Get Off Your Butt and Travel the World" class="post-image" />
                     </p>
-                    <p class="intro">How do you make the leap from cubicle daydreams to life on to the road? You want to travel the world, but, like me, you have a million excuses stopping you. How do overcome the inertia that keeps you trapped in a life that isn't what you want it to be? Here's a few practical tips and how tos designed to motivate you to get off your butt and travel the world. <a class="permalink" href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">Read&nbsp;it&nbsp;&raquo;</a></p>
+                    <p class="intro hyphenate">How do you make the leap from cubicle daydreams to life on to the road? You want to travel the world, but, like me, you have a million excuses stopping you. How do overcome the inertia that keeps you trapped in a life that isn't what you want it to be? Here's a few practical tips and how tos designed to motivate you to get off your butt and travel the world.</p>
+                    <span class="button"><a class="permalink" href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">More&nbsp;&raquo;</a></span>
                 </li>
             </ul>
\ No newline at end of file
diff --git a/templates/includes/recent_entries_template.html b/templates/includes/recent_entries_template.html
index 29ed3d8..847dc47 100644
--- a/templates/includes/recent_entries_template.html
+++ b/templates/includes/recent_entries_template.html
@@ -2,12 +2,13 @@
             <ul>{% for object in object_list %}
                 <li class="{% cycle 'col1' 'col2' %}">
                     <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>
-                    {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
                     <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>
+                        {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
                     </p>
-                    <p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read&nbsp;it&nbsp;&raquo;</a></p>
+                    <p class="intro hyphenate">{{object.dek|safe}}</p>
+                    <span class="button"><a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">More&nbsp;&raquo;</a></span>
                 </li>{% endfor %}
             </ul>
\ No newline at end of file