site reorg

10 files changed, 0 insertions, 493 deletions

diff --git a/templates/details/5x5.html b/templates/details/5x5.html
deleted file mode 100644
index a9bdd63..0000000
--- a/templates/details/5x5.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% block pagetitle %}Luxagraf | Projects | 5x5 - Interviews from the road {% endblock %}
-{% block metadescription %}{% endblock %}
-
-{%block bodyid%}id="projects"{%endblock%}								
-				
-{% block primary %}
-<article>
-    <ul id="breadcrumbs">
-        <li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
-        <li><a href="/projects/" title="luxagraf projects page">Projects</a> &rarr;</li>
-        <li>5x5</li>
-    </ul>
-    
-    
-
-</article>
-{% endblock %}
diff --git a/templates/details/about.html b/templates/details/about.html
deleted file mode 100644
index 6dde0e9..0000000
--- a/templates/details/about.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% block pagetitle %}Luxagraf | About{% endblock %}
-{% block metadescription %}About: Luxagraf is written and published by Scott Gilbertson. Writing is done in BBEdit, published with GeoDjango. Photos taken with a Panasonic GF1.{% endblock %}
-{%block htmlclass%}class="single"{%endblock%}
-{%block bodyid%}id="about"{%endblock%}								
-				
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-        <li>About</li>
-    </ul>
-    <article role="main">
-        <h1 class="hide">About Luxagraf</h1>
-        <div class="post-body-single">
-            <p>Luxagraf is written and published by Scott Gilbertson.</p>
-            <p><img src="{{MEDIA_URL}}img/bio.jpg" alt="Scott Gilbertson" />
-            <small>Photo by <a href="http://twitter.com/lagsolo" title="@lagsolo on Twitter" >@lagsolo</a></small></p>
-            <h2>Colophon</h2>
-            <p>Luxagraf is published using a custom content management system written with the <a href="http://docs.djangoproject.com/en/dev/ref/contrib/gis/">GeoDjango framework</a>. The site validates as HTML5 and uses @media rules to handle phones, iPads and the like. It should work in any modern web browser. If you have trouble, let me know.</p>
-            <p>I write in long hand because I am an old man and that's we roll. I make the clackity noise in BBEdit, the best text editor ever.</p>
-            <p>Currently photos are taken with a Panasonic GF1. In the past I have used a Panasonic LX2 and a Canon S45. Minimal processing is done with Adobe Lightroom and Photoshop. The photo gallery layout was inspired by the lovely <a href="http://www.pictorymag.com/" title="Pictory Mag">Pictory</a> photo showcase. Also note that while the writing is copyrighted to me, the photos are licensed under a Creative Commons <a href="http://creativecommons.org/licenses/by-sa/3.0/">attribution, share-alike license</a>, which means you're free to use them so long as you attribute them to me.</p>
-        </div>  
-    </article>
-{% endblock %}
diff --git a/templates/details/code.html b/templates/details/code.html
deleted file mode 100644
index 1697844..0000000
--- a/templates/details/code.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% block pagetitle %}Luxagraf | Projects | Code and Other Experiments {% endblock %}
-{%block htmlclass%}class="single"{%endblock%}
-{% block metadescription %}Browser extentsions to block comments on onlineathens.com{% endblock %}
-{% block extrahead %}
-<style>
-article[role="main"] a { color: #b53a04;}
-#ffext, #chrext, #bkmklt { 
-    display: block;
-    margin: 20px 0;
-}
-#ffext a, #chrext a, #bkmklt a {
-    padding: 10px 8px 10px 35px;
-    -moz-border-radius: 8px;
-    -webkit-border-radius: 8px;
-    border-radius: 8px;
-    border: #d7d7d7 1px solid;
-    background: #f2f2f2;
-    width: auto;
-    font: 11px normal Helvetica, Verdana, sans-serif;
-    text-transform: uppercase;
-}
-#ffext a {
-    background: #f2f2f2 url("{{MEDIA_URL}}img/fficon.jpg") 2px 50% no-repeat;
-}
-#chrext a {
-    background: #f2f2f2 url("{{MEDIA_URL}}img/chricon.jpg") 2px 50% no-repeat;
-}
-#ffext a:hover, #chrext a:hover, #bkmklt a:hover { background-color: #e2e2e2;}
-#bkmklt a {
-    padding: 10px 8px;
-}
-</style>
-{% endblock %}
-{%block bodyid%}id="code"{%endblock%}								
-				
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr;</li>
-        <li><a href="/projects/" title="luxagraf projects page" itemprop="url"><span itemprop="title">Projects</span></a> &rarr;</li>
-        <li>Code</li>
-    </ul>
-    <article role="main">{% for object in object_list %}
-        <h1>{{object.name}}</h1>
-        <div class="post-body-single"> 
-            {{object.body_html|smartypants|widont|safe}}
-        </div>{% endfor %}
-    </article>
-    
-
-
-{% endblock %}
diff --git a/templates/details/contact.html b/templates/details/contact.html
deleted file mode 100644
index ec47c34..0000000
--- a/templates/details/contact.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{%block htmlclass%}class="single"{%endblock%}
-{% block pagetitle %}Luxagraf: Email{% endblock %}
-{% block metadescription %}{% endblock %}
-{%block bodyid%}id="contact"{%endblock%}
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-        <li>Contact</li>
-    </ul>
-    <article role="main">
-        <h1>Contact Information</h1>
-        <div id="post">
-            <p>I'd love to hear what you think about the posts on luxagraf. If you use Twitter, send me a message: <a href="http://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">@luxagraf</a>.</p>
-            <p>Then there's email. I'm not a big fan. Or rather I don't have the time to respond the way I would like to, which makes me like it less. So if you email me and don't hear back, or you do but it's five months later and you've entirely forgotten that you even emailed me in the first place, please don't take it personally.</p>
-            
-            <p>Please send your thoughts to:</p>
-            <p>
-            <script type="text/javascript">
-                //<![CDATA[
-                <!--
-                var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
-                "=69){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
-                ".substr(0,ol);}f(\")811,\\\"Zofr{i4|m;(%g!$1&^ENUwFG_J@FFD330\\\\100\\\\}zp" +
-                ";u~t~T/b771\\\\)lfjm=^&E320\\\\030\\\\600\\\\130\\\\230\\\\LH4220\\\\100\\\\"+
-                "410\\\\N8=(?7,'<610\\\\?>&#)//]600\\\\ULZ]S]410\\\\p720\\\\NCVJ000\\\\771\\" +
-                "\\ 80xxwdg~}&rjgm010\\\\030\\\\620\\\\320\\\\\\\"(f};o nruter};))++y(^)i(tA" +
-                "edoCrahc.x(edoCrahCmorf.gnirtS=+o;721=%y;++y)811<i(fi{)++i;l<i;0=i(rof;htgn" +
-                "el.x=l,\\\"\\\"=o,i rav{)y,x(f noitcnuf\")"                                  ;
-                while(x=eval(x));
-                //-->
-                //]]>
-            </script>
-            </p>
-        </div>
-    </article>
-{% endblock %}
-
diff --git a/templates/details/entry.html b/templates/details/entry.html
deleted file mode 100644
index c5dc80f..0000000
--- a/templates/details/entry.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-
-{% 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 metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
-{%block extrahead%}
-     <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="{% 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 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>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-            <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>
-                {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
-            </aside>
-            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-        </header>
-        <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%}
-        {%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 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%}
-        
-        {%comment%}
-        <section id="comments">
-            <h4><a class="disqus-link-count" href="{{object.get_absolute_url}}#disqus_thread">Comments</a></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>
-        {%endcomment%}
-    </article>
-{% endblock %}
-{% block js %}
-{% 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%}{%endwith%}{%endblock%}
diff --git a/templates/details/fck_digg.html b/templates/details/fck_digg.html
deleted file mode 100644
index 4a4be88..0000000
--- a/templates/details/fck_digg.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-                      "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-    <title>{% block pagetitle %}Luxagraf - Topografical Writings{% endblock %}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <style>
-    body { text-align: center; }
-    </style>
-</head>
-<body>
-
-<p>Dear Digg,</p>
-
-<p><b>PISS OFF</b></p>
-
-<p>&mdash;your friend, luxagraf</p>
-
-<p style="font-size: 80%; width: 100px;">Framing breaks bookmarking, it breaks copy-and-paste from the location field, it breaks your browser history, it breaks bookmarklets. There&#8217;s nothing OK about it.</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/details/guide.html b/templates/details/guide.html
deleted file mode 100644
index c5dc80f..0000000
--- a/templates/details/guide.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-
-{% 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 metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
-{%block extrahead%}
-     <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="{% 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 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>{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-            <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>
-                {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
-            </aside>
-            <time datetime="{{object.pub_date|date:'c'}}" pubdate>{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-        </header>
-        <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%}
-        {%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 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%}
-        
-        {%comment%}
-        <section id="comments">
-            <h4><a class="disqus-link-count" href="{{object.get_absolute_url}}#disqus_thread">Comments</a></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>
-        {%endcomment%}
-    </article>
-{% endblock %}
-{% block js %}
-{% 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%}{%endwith%}{%endblock%}
diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html
deleted file mode 100644
index dc3f7fb..0000000
--- a/templates/details/national-parks.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% block pagetitle %}Luxagraf | Projects | National Parks {% endblock %}
-{% block metadescription %}{% endblock %}
-
-
-{%block bodyid%}id="projects-detail"{%endblock%}	
-
-{% block htmlclass %}class="dark"{% endblock %}
-				
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr;</li>
-        <li><a href="/projects/" title="luxagraf projects page" itemprop="url"><span itemprop="title">Projects</span></a> &rarr;</li>
-        <li>National Parks</li>
-    </ul>
-    <section>
-        <h1 class="hide">The National Parks Project</h1>{% for object in object_list %}    
-        <article id="park-{{forloop.counter}}" class="park">
-            <h1>{{object.name}}</h1>
-            <div class="figure">
-                <img src="{{object.image.url}}" alt="{{object.name}}" width="{{object.image_width}}" height="{{object.image_height}}" />
-            </div>
-            <div class="legend">
-                <h2>{{object.tag_line}}</h2>
-                <ul class="buttons">
-                    <li><a href="{{object.post.get_absolute_url}}" title="{{object.post.title}}">Read Journal</a></li>
-                    {%if object.gallery%}<li><a href="{{object.gallery.get_absolute_url}}" title="Photos of {{object.unit_name}}">View Photos</a></li>{%endif%}
-                    <li><a href="#" class="map-link" title="{{object.mpoly.centroid.y}},{{object.mpoly.centroid.x}},{{object.zoom}},{{object.id}}">Map</a></li>
-                    <li><a href="#" id="more-{{forloop.counter}}"class="more-link" title="More about {{object.unit_name}}">More</a></li>
-                </ul>
-                <dl class="meta" style="visibility: hidden;">
-                    <dt>Visited:</dt>
-                    <dd>{{object.date_visited_begin|date:"m/d/y"}} - {{object.date_visited_end|date:"m/d/y"}}</dd>
-                    <dt>State:</dt>
-                    <dd>{{object.state}}</dd>
-                    <dt>Size:</dt>
-                    <dd>{{object.size}} sq miles</dd>
-                    <dt>Cost:</dt>
-                    <dd>${{object.fee}} / ${{object.camping_fee}} (entry/camping)</dd>
-                    <dt>Link:</dt>
-                    <dd>{{object.url|urlize}}</dd>
-                </dl>
-            </div>
-        </article>{% endfor %}
-    </section>
-{% endblock %}
-{% block js %}
-    <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.min.js" ></script>
-    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-
-{% endblock %}
diff --git a/templates/details/photo.html b/templates/details/photo.html
deleted file mode 100644
index 200995f..0000000
--- a/templates/details/photo.html
+++ /dev/null
@@ -1,85 +0,0 @@
-{% 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%}{%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 %}
-
-
-				
-				{% block title %}{{object.title|smartypants|safe}}{% endblock %}
-								
-				
-                {% 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> 
-			{% if object.description != 'None' %}
-			<p>{{ object.description|smartypants|widont|safe }}</p>
-			{%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>
-			
-                
-                
-				<div id="extra">
-                    
-                
-                
-                    <p>If you enjoy this photo, you can follow along on <a href="http://flickr.com/photos/luxagraf/" title="Flickr" rel="me">Flickr</a>, <a href="http://www.facebook.com/profile.php?id=730956404" title="Facebook" rel="me">Facebook</a>, <a href="http://friendfeed.com/luxagraf" title="friendfeed" rel="me">FriendFeed</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>
-                
-                <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%}
-                    </ul>
-                </div>
-                 <h4 id="comment-header">comments</h4>
-                 <p>If you'd like to leave a comment, you may do so on <a href="http://flickr.com/photos/luxagraf/{{object.flickr_id}}/" title="leave a comment on Flickr">Flickr</a>.</p>
-
-			{% 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%}
-                    </ul>
-                </div>
-                 
-    <div class="blok">
-    <h4>Image Data</h4>
-	
-                <dl class="sidebar meta">
-				<dt>Camera:</dt>
-				<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>
-				<dd>{%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}</dd>
-				<dt>Film Speed:</dt>
-				<dd>{%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}</dd>
-			</dl>
-		</div>
-            </div>
-{% endblock %}
\ No newline at end of file
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
deleted file mode 100644
index e61c9b7..0000000
--- a/templates/details/photo_galleries.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends 'base.html' %}
-{% load typogrify %}
-{% load number_to_word  %}
-
-{% block pagetitle %}{{object.set_title}} - Luxagraf, Photos{% endblock %}
-{%block htmlclass%}class="black"{%endblock%}
-
-
-{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
-
-{%block bodyid%}class="image_gallery"{%endblock%}	
-
-{% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-        <li><a href="/photos/" title="See all Photos" itemprop="url"><span>Photos</span></a> &rarr;</li> 
-        <li>{{object.set_title}}</li>
-    </ul>
-    <p class="directions">Use left/right arrow keys to navigate through photos</p>
-    <section id="slides">
-        <h1 class="hide">Photos from {{object.set_title}}</h1>{%for photo in object.photos.all reversed %}
-        <article id="image-{{forloop.counter}}"> 
-            <h6><a href="#image-{{forloop.counter}}" class="permalink" title="link to this image">&#8734; {{forloop.counter|number_to_word}} &#8734;</a></h6>
-            <div class="fig"><img src="{{photo.get_local_slideshow_url}}" alt="{{photo.title}}" title="{{photo.title}}" {%if photo.is_portait %}class="v"{%endif%} height="{{photo.slideshowimage_height}}" width="{{photo.slideshowimage_width}}" /></div>
-            <div class="figcaption">
-                <div class="caption" id="id-{{photo.id}}">
-                    <h3>{{photo.title}} &nbsp;&nbsp;<time datetime="{{photo.exif_date|date:'c'}}" pubdate>{{photo.exif_date|date:"M j, Y"}}</time></h3>
-                    <a class="map-link" href="#" title="{{photo.lat}},{{photo.lon}},id-{{photo.id}}">Map</a>
-                    {%if photo.description %}<p>{{photo.description|safe}}</p> {%endif%}  
-                </div>
-                <div class="photo-options">
-                    <p>{% 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' %}Panasonic GF1 w/{%endif%} {%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">Lumix 14-45mm 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">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == 'OLYMPUS M.9-18mm F4.0-5.6' %}<a href="http://amzn.to/mGNVkl" title="buy the {{photo.exif_lens}} on Amazon">Olympus 9-18mm lens</a>{%endif%}{%if photo.exif_lens == None %}{%endif%}</p>
-                    <p>{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p>
-                    <!--<p><a href="{{photo.flickr_link}}" title="View this Photo on Flickr.com">View on Flickr</a></p>-->
-                    <!--<a href="#" class="exif-link" title="{{photo.id}}">Camera</a>-->
-                </div>
-                
-                {%comment%}
-                <div class="meta" style="display: none;">
-                        <dl>
-                            <dt>Camera:</dt>
-                            <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>{%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 == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens == None %}Built-in{%endif%}</dd>
-                            <dt>Exposure</dt>
-                            <dd>{{photo.exif_exposure}}</dd>
-                            <dt>Aperture</dt>
-                            <dd>{{photo.exif_aperture}}</dd>
-                            <dt>Focal Length: </dt>
-                            <dd>{{photo.exif_focal_length}}</dd>
-                            <dt>ISO: </dt>
-                            <dd>{{photo.exif_iso}}</dd>
-                            <dt>Comments: </dt>
-                            <dd><a href="{{photo.flickr_link}}" title="View this Photo on Flickr.com">View on Flickr</a></dd>
-                        </dl>
-                 </div>
-                {%endcomment%}
-            </div>
-        </article>
-        {% endfor %}
-    </section>
-{%endblock%}
-
-{% block js %}
-    <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
-    <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.scrollTo-1.4.2-min.js"></script>
-    <script type="text/javascript" src="{{MEDIA_URL}}js/photos.min.js" ></script>
-    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-{% endblock%}
-
-