summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pagination/templates/pagination/pagination.html40
-rw-r--r--media/css/base.css2
-rw-r--r--media/css/dark.css2
-rw-r--r--media/css/photos.css2
-rw-r--r--media/sass/_about.sass4
-rw-r--r--media/sass/_globals.sass15
-rw-r--r--media/sass/_maps.sass6
-rw-r--r--media/sass/_mixins.sass2
-rw-r--r--media/sass/_photos.sass1
-rw-r--r--media/sass/_projects.sass6
-rw-r--r--media/sass/_writing.sass57
-rw-r--r--media/sass/base.sass37
-rw-r--r--media/sass/dark.sass3
-rw-r--r--templates/archives/homepage.html65
-rw-r--r--templates/archives/map.html14
-rw-r--r--templates/archives/photos.html44
-rw-r--r--templates/archives/writing.html46
-rw-r--r--templates/base.html44
-rw-r--r--templates/details/about.html54
-rw-r--r--templates/details/entry.html65
-rw-r--r--templates/details/national-parks.html88
-rw-r--r--templates/includes/recent_entries.html65
-rw-r--r--templates/includes/recent_entries_template.html25
23 files changed, 316 insertions, 371 deletions
diff --git a/lib/pagination/templates/pagination/pagination.html b/lib/pagination/templates/pagination/pagination.html
index 2ecffb4..1afb3d7 100644
--- a/lib/pagination/templates/pagination/pagination.html
+++ b/lib/pagination/templates/pagination/pagination.html
@@ -1,30 +1,10 @@
-{% load pagination_tags %}
-{% if is_paginated %}
-<div class="pagination">
- {% if page_obj.has_previous %}
- <a href="{% if use_page_path %}{% page_path prev_page %}{% else %}?page={{ page_obj.previous_page_number }}{{ getvars }}{% endif %}" class="prev">&lsaquo;&lsaquo; previous</a>
- {% else %}
- <span class="disabled prev"></span>
- {% endif %}
- {% for page in pages %}
- {% if page %}
- {% ifequal page page_obj.number %}
- <span class="current page">{{ page }}</span>
- {% else %}
- {% if use_page_path %}
- <a href="{% page_path page %}" class="page">{{ page }}</a>
- {% else %}
- <a href="?page={{ page }}{{ getvars }}" class="page">{{ page }}</a>
- {% endif %}
- {% endifequal %}
- {% else %}
- ...
- {% endif %}
- {% endfor %}
- {% if page_obj.has_next %}
- <a href="{% if use_page_path %}{% page_path next_page %}{% else %}?page={{ page_obj.next_page_number }}{{ getvars }}{% endif %}" class="next">next &rsaquo;&rsaquo;</a>
- {% else %}
- <span class="disabled next">next &rsaquo;&rsaquo;</span>
- {% endif %}
-</div>
-{% endif %}
+{% load pagination_tags %}{% if is_paginated %}
+ <ul class="pages">{% if page_obj.has_previous %}
+ <li><a href="{% page_path prev_page %}" class="prev">&lsaquo;&lsaquo; previous</a></li>{% else %}
+ <li class="disabled prev"></li>{% endif %}{% for page in pages %}{% if page %}{% if page == page_obj.number %}
+ <li class="current page">{{ page }}</li>{% else %}
+ <li><a href="{% page_path page %}" class="page">{{ page }}</a></li>{% endif %}{% else %}
+ <li>...</li>{% endif %}{% endfor %}{% if page_obj.has_next %}
+ <li><a href="{% if use_page_path %}{% page_path next_page %}{% else %}?page={{ page_obj.next_page_number }}{{ getvars }}{% endif %}" class="next">next &rsaquo;&rsaquo;</a></li>{% else %}
+ <li class="disabled next">next &rsaquo;&rsaquo;</li>{% endif %}
+ </ul>{% endif %} \ No newline at end of file
diff --git a/media/css/base.css b/media/css/base.css
index 76b068c..d6de921 100644
--- a/media/css/base.css
+++ b/media/css/base.css
@@ -1 +1 @@
-ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}*:focus{outline:#b53a04 dotted thin}html{height:100%}body{background:#fff;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:62.5%;line-height:23px;color:#201a11;position:relative;min-height:100%;width:980px;height:100%;text-align:center;margin:0 auto}p{margin:0.8em 0 0 0}a{text-decoration:none;color:#201a11}a:visited{color:#201a11;text-decoration:none}a:hover{color:#b53a04;text-decoration:none}header{border-bottom:#201a11 2px solid;height:160px;margin-bottom:40px;font-size:1.1em;letter-spacing:1px;line-height:1.2em}header nav{text-transform:uppercase;float:left;margin-top:113px;margin-left:40px}header li{display:inline;font-size:12px;margin-left:4px;letter-spacing:1px}header li a:hover{color:#b53a04}#logo{background:url("../img/logo.png") no-repeat left bottom;height:158px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}footer{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;background:#201a11;height:36px;color:#888;font-size:1.2em;margin:80px auto 0}footer li{float:left;text-transform:uppercase;line-height:36px;margin-left:8px}footer a{color:#888 !important}footer a:hover{color:#b53a04 !important}footer nav{float:right;margin-right:8px}footer p{float:left;padding-left:8px;line-height:36px;margin:0}article ul{font-size:1.5em}#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:110%}#breadcrumbs li{display:inline}.hide{display:none}.postpic,.postpicright{display:block;margin:0.3em 0.6em;border:#201a11 10px solid;clear:both}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{border:#201a11 10px solid;margin-top:20px}.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.pull-quote{font-size:14px !important;font-style:italic !important}sup{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:0.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}.numeral{font-family:Helvetica, Verdana, sans-serif;font-size:22px;font-weight:bold;display:block;margin-top:60px;margin-bottom:0}.nfirst{margin-top:0px !important}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:9px;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}.button{display:block;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin:10px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}.hide,.dsq-brlink,img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png'],.terms-of-use-link,#dsq-comments-count{display:"none"}div[dir='ltr'] span{width:0;visibility:collapse}#writing-archive{margin-top:72px;margin-bottom:36px}#writing-archive li{clear:both}#writing-archive h3{font-family:Helvetica, Verdana, sans-serif;font-size:1.6em;line-height:1.3em;font-weight:normal;margin:0;text-align:"left"}#writing-archive div{width:400px;margin-right:20px;float:left;text-align:"justify"}#writing-archive .img{width:520px;margin-left:20px;margin-bottom:36px}#writing-archive p{margin:0;font-size:1.1em}#writing-archive .location,#writing-archive time{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;line-height:3em;font-size:0.7em}#writing-archive img{border:#201a11 10px solid}#pagination{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;width:980px;clear:both;margin:0;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;text-align:center}#pagination .pagination{margin:8px 0}#pagination .current{color:#b53a04}#writing-detail{font-size:1.7em;line-height:1.5em}#writing-detail header{border:none;height:auto;width:auto;margin:0 0 0 0}#writing-detail h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:30px;line-height:1.2em;margin:0;letter-spacing:0.5px}#writing-detail aside{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:12px;line-height:2.3em}#writing-detail aside a{color:#201a11}#writing-detail aside a:hover{color:#b53a04}#writing-detail dl{font-size:100%}#writing-detail dl dt{font-style:italic;margin:9px}#writing-detail a{color:#b53a04}#writing-detail h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.6em;line-height:1.2em}#post-metadata{width:540px;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;margin:24px 0 24px 200px;font-size:0.8em;padding-bottom:8px;clear:both}#page-navigation{width:980px;clear:both;margin:24px 0 0 0;text-transform:uppercase;font-size:0.5em}#page-navigation li#next{float:right;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-right:140px}#page-navigation li#prev{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-left:120px}#comments{clear:both;width:520px;margin:24px 0 24px 200px;font-size:0.8em}#comments h4{margin-top:96px;font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;text-transform:uppercase;font-size:1.3em}h4 a.disqus-link-count{color:#201a11 !important}ul#dsq-comments{font-size:1.2em}.dsq-comment-cite{font-family:"Helvetica", "Verdana", "sans-serif";font-size:0.9em !important;font-weight:normal;text-transform:uppercase}.dsq-comment-header-time,.dsq-comment-footer{font-family:"Helvetica", "Verdana", "sans-serif"}.dsq-comment-footer{font-size:0.8em}#dsq-comments-title{display:none !important}.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}blockquote{font-size:0.8em}.footnote{margin:18px 0;width:540px}.footnote li{margin:12px 0;line-height:0.8em}.footnote p{line-height:18px !important;font-size:14px}.footnote a,.footnote span{font-size:14px}#writing-detail .figure{margin-top:24px}#writing-detail .figure img{border:#201a11 10px solid}#writing-detail .figure .legend{width:552px;padding:8px 0 12px 16px;font-family:"Helvetica", "Verdana", "sans-serif"}h4.notes{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-weight:bold;text-transform:uppercase}.addendum dt{font-style:italic;margin:0.8em 0 0 0;margin-left:-30px !important;text-indent:-30px;padding-left:30px}.addendum dd{margin:0.8em 0 0 0}.single article header,.single article #post-body{margin-left:200px !important;width:560px !important}.single article header p:nth-of-type(1),.single article #post-body p:nth-of-type(1){font-size:20px;line-height:28px}.double article header{float:left;width:180px !important;text-align:right !important;margin-top:20px !important}.double article aside section{text-align:right !important;font-size:1em;line-height:18px}#post-body{width:780px;margin-left:20px}#post-body .col{width:350px;float:left;margin:0 40px 0 0}#post-body .narrow{width:520px}.double #post-body{float:left}#photo-archive article{width:980px}#photo-archive article h1{display:none}#photo-galleries{margin-left:-10px;width:1000px}#photo-galleries li{float:left;margin:8px;position:relative;display:block;height:350px;width:291px;border:10px #201a11 solid}#photo-galleries .figure{height:362px;width:291px;margin:0}#photo-galleries .legend{color:#888;width:285px;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;margin:0;line-height:18px}#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase}#photo-galleries p{margin:0}.map-legend{width:160px;margin-top:24px;float:left}.map-legend h4{font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:1.4em;margin:8px 0}.map-legend li{font-size:90%;margin:0;line-height:20px}.clearfix{clear:both}#map-canvas{float:left;width:760px;height:500px;border:#201a11 10px solid;margin-left:40px;margin-top:24px}section#location #map-canvas{width:295px;height:350px;border:#201a11 10px solid;margin:10px 0 0 5px}.infowin{line-height:18px;margin-bottom:16px}.infowin p{font-size:1.4em;line-height:1.4em}.infowin h4{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:2.4em;margin:6px 0 0 0}.infowin a{color:#b53a04 !important;border-bottom:1px dotted #b53a04}.infowin .date{color:#888;text-align:center;text-transform:uppercase;display:block;text-align:left;margin:6px 0 0;font-size:1.2em}#about section{clear:both;margin-top:24px}#about section ul{font-size:1em;margin:18px}#about section li{margin:9px}#about section li a{font-weight:bold}.image{float:left;width:180px;margin-top:48px}.image img{border:#201a11 10px solid}.content{float:left;margin-left:20px;width:540px;font-size:1.6em}.content h3{font-family:Helvetica, Verdana, sans-serif;font-size:1.6em;line-height:1.3em;font-weight:normal;margin:0}section#post{margin-left:200px}section#post h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal}.contact-form li{clear:both;width:440px;padding:4px 0}.contact-form dt{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1.6em;line-height:1.3em;font-weight:normal;text-align:right;font-size:0.9em}.contact-form dt label{font-style:normal;text-align:right}.contact-form dd{text-align:right;margin-top:4px}.contact-form dd input#id_name,.contact-form dd input#id_email,.contact-form dd input#id_subject_line{width:298px}.top{margin:36px 0 36px 0;clear:both;width:940px}.top a{color:#b53a04}p.col{width:360px;float:left;margin:0 40px 0 0;font-size:14px}p.two{margin:0;margin-left:40px;width:450px}.break{border-bottom:#e3e3e3 1px solid;width:980px;height:2px;padding-top:36px;clear:both;margin:0}.project-tease{margin-top:65px}.project-tease li{margin-top:36px;clear:both}.project-tease li h3{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:24px;line-height:24px;margin:0;width:380px;font-weight:bold}.project-tease .tease{float:left}.project-tease .img{float:right;width:540px;margin-bottom:72px}.project-tease .img img{border:#201a11 10px solid}.project-tease .lede{clear:both;margin:0;padding-top:12px;width:380px}.project-tease .lede p{font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:16px;line-height:23px;text-align:justify}.project-tease .proj{font-size:64px;line-height:50px;float:left;margin:2px 2px 0 0}.project-tease .proj span{font-size:36px}.project-tease dt a{display:block;width:175px;float:left}.map-container{width:469px;height:392px;position:absolute;right:20px;bottom:60px;z-index:2000;margin:0;padding:0;background:url("../img/mapbg-dark.png") no-repeat top left}.more-container{width:405px;height:260px;position:absolute;right:-30px;bottom:40px;z-index:2000;background:url("../img/parkbg.png") no-repeat top left}.more-container dl{margin-top:45px;margin-left:45px}.more-container dl dt,.more-container dl dd{font-size:0.9em;line-height:25px;margin:4px 0;font-family:Helvetica, Verdana, sans-serif;color:#fff}.more-container dl dt{clear:left;float:left;width:65px;font-weight:bold;line-height:25px;font-size:0.7em;text-transform:uppercase}.more-container dl dd{float:left;width:250px;overflow:hidden}.more-container dl dd a:hover{color:#b53a04}.map-wrapper{width:400px;height:328px;margin:37px 0 0 44px}#parks{margin-top:36px}#parks li{width:980px;position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}#parks .figure img{border:none}#parks h4{display:block;color:#888;padding:10px 10px 10px 15px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;top:0;width:960px;color:#fff;font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;margin:0}#parks .legend{display:block;padding:10px 10px 10px 15px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:0;height:45px;width:980px;font-size:10px;line-height:16px;color:#fff}#parks .legend h5{font-family:Helvetica, Verdana, sans-serif;font-size:1.6em;line-height:1.3em;font-weight:normal;line-height:36px;font-size:18px;margin:0;padding:0;float:left}#parks .legend p{margin:6px 0 10px 0}#parks .legend .buttons{padding-top:6px;float:right;margin-right:20px}#parks .legend .buttons li{float:left;clear:none;margin:0px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}#parks .legend .buttons li a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#463215;color:#fff;-moz-border-radius:25px;-webkit-border-radius:25px;-o-border-radius:25px;border-radius:25px}#parks .legend .buttons li a:hover{background:#b53a04}#parks .map{width:280px;margin-top:42px;height:130px;float:left;margin-left:6px}#parks .map a{display:none}#parks .map div div span{display:none}#parks .entry-foot{clear:both;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:12px;background:#f3f;width:980px;margin-top:4px}img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png']{display:none !important}#featured-image img{margin-left:20px;margin-bottom:78px}.hyphenate{text-align:justify}#writing-tease,#currently{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-transform:uppercase;font-size:0.8em;clear:both;width:980px;padding-top:20px;border-top:#b9b9b9 1px dotted}#currently{padding:0;margin-bottom:0px;margin-top:36px;border-top:#201a11 1px solid}#writing-tease h2{margin:24px 0 24px 0}#fromthearc{clear:both}#fromthearc li{float:left;width:300px;margin-bottom:20px}#fromthearc h2{font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:2em;margin:0}#fromthearc .col2{margin-left:40px;margin-right:40px}#fromthearc h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.2em;margin:0}#fromthearc p{margin:0}#fromthearc p.hyphenate{margin-top:3px;text-align:justify}#fromthearc img{margin-top:4px}#fromthearc .location,#fromthearc time{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;line-height:3em;margin:0;padding:0;font-size:0.7em;text-align:left}.ie #photo-galleries a img,.ie #photo-galleries img{outline:none;border:none !important}.ie #photo-galleries li{width:291px;height:350px}.ie #photo-galleries .legend{margin:0;bottom:0;margin-bottom:8px}.ie .button a{background:none;padding:0}.ie .button a:hover{background:none;color:#b53a04 !important}.ie .drop{padding:28px 10px 5px 0}.ie .figure .legend{bottom:5px;padding:8px 0 8px 8px}.ie8 body{outline:none;border:none}.ie8 *:focus{border:none}
+ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}*:focus{outline:#b53a04 dotted thin}html{height:100%}body{background:#fff;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:15px;line-height:23px;color:#201a11;position:relative;min-height:100%;width:980px;height:100%;text-align:center;margin:0 auto}p{margin:0.8em 0 0 0}a{text-decoration:none;color:#201a11}a:visited{color:#201a11;text-decoration:none}a:hover{color:#b53a04;text-decoration:none}header{border-bottom:#201a11 2px solid;height:150px;margin-bottom:40px;font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:12px}header nav{text-transform:uppercase;float:left;margin-top:102px;margin-left:40px}header li{display:inline;font-size:12px;margin-left:4px;letter-spacing:1px}header li a:hover{color:#b53a04}#logo{background:url("../img/logo.png") no-repeat left bottom;height:148px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}footer{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;background:#201a11;height:36px;color:#888;font-size:12px;margin:80px auto 0}footer li{float:left;text-transform:uppercase;line-height:36px;margin-left:8px}footer a{color:#888 !important}footer a:hover{color:#b53a04 !important}footer nav{float:right;margin-right:8px}footer p{float:left;padding-left:8px;line-height:36px;margin:0}article ul{font-size:1.5em}#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:11px}#breadcrumbs li{display:inline}.hide{display:none}.postpic,.postpicright{display:block;margin:0.3em 0.6em;border:#201a11 10px solid;clear:both}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{border:#201a11 10px solid;margin-top:20px}.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.pull-quote{font-size:14px !important;font-style:italic !important}sup{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:0.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}.numeral{font-family:Helvetica, Verdana, sans-serif;font-size:22px;font-weight:bold;display:block;margin-top:60px;margin-bottom:0}.nfirst{margin-top:0px !important}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:9px;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}.button{display:block;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin:10px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}.hide,.dsq-brlink,img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png'],.terms-of-use-link,#dsq-comments-count{display:none}div[dir='ltr'] span{width:0;visibility:collapse}#writing-archive,#featured{margin-top:72px;margin-bottom:36px}#writing-archive li,#featured li{clear:both}#writing-archive h3,#writing-archive h1,#featured h3,#featured h1{font-family:Helvetica, Verdana, sans-serif;font-size:24px;line-height:1.3em;font-weight:normal;margin:0;text-align:left}#writing-archive div,#featured div{width:400px;margin-right:20px;float:left;text-align:justify}#writing-archive div h1,#featured div h1{margin-top:3px}#writing-archive .img,#featured .img{width:520px;margin-left:20px;margin-bottom:36px}#writing-archive p,#featured p{margin:0;font-size:16px}#writing-archive .location,#writing-archive time,#featured .location,#featured time{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;line-height:3em;font-size:11px}#writing-archive img,#featured img{border:#201a11 10px solid}#pagination{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:13px;width:980px;clear:both;margin:0;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;text-align:center}#pagination .pages{margin:8px 0;clear:both}#pagination li{display:inline;margin:2px}#pagination .current{color:#b53a04}#writing-detail{font-size:1.7em;line-height:1.5em}#writing-detail header{border:none;height:auto;width:auto;margin:0 0 0 0}#writing-detail h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:30px;line-height:1.2em;margin:0;letter-spacing:0.5px}#writing-detail aside{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:12px;line-height:2.3em}#writing-detail aside a{color:#201a11}#writing-detail aside a:hover{color:#b53a04}#writing-detail dl{font-size:100%}#writing-detail dl dt{font-style:italic;margin:9px}#writing-detail a{color:#b53a04}#writing-detail h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.6em;line-height:1.2em}#post-metadata{width:560px;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;margin:24px 0 24px 200px;padding-bottom:8px;clear:both;background:none;height:auto;float:none}#post-metadata p{font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;color:#201a11;line-height:25px;float:none;padding:8px 0;font-size:14px}#post-metadata p a{color:#b53a04 !important}#page-navigation{width:980px;clear:both;margin:24px 0 0 0;text-transform:uppercase;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal}#page-navigation li#next{float:right;margin-right:140px;font-size:13px !important}#page-navigation li#prev{float:left;margin-left:120px;font-size:13px !important}#comments{clear:both;width:520px;margin:24px 0 24px 200px;font-size:13px}#comments h4{margin-top:96px;font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;text-transform:uppercase;font-size:18px}h4 a.disqus-link-count{color:#201a11 !important}ul#dsq-comments{font-size:1.2em}.dsq-comment-cite{font-family:Helvetica, Arial, sans-serif;font-size:0.9em !important;font-weight:normal;text-transform:uppercase}.dsq-comment-header-time,.dsq-comment-footer{font-family:Helvetica, Arial, Verdana, sans-serif}.dsq-comment-footer{font-size:0.8em}#dsq-comments-title{display:none !important}.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}blockquote{font-size:0.8em}.footnote{margin:18px 0;width:540px}.footnote li{margin:12px 0;line-height:0.8em}.footnote p{line-height:18px !important;font-size:14px}.footnote a,.footnote span{font-size:14px}#writing-detail .figure{margin-top:24px}#writing-detail .figure img{border:#201a11 10px solid}#writing-detail .figure .legend{width:552px;padding:8px 0 12px 16px;font-family:Helvetica, Arial, Verdana, sans-serif}h4.notes{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-weight:bold;text-transform:uppercase}.addendum dt{font-style:italic;margin:0.8em 0 0 0;margin-left:-30px !important;text-indent:-30px;padding-left:30px}.addendum dd{margin:0.8em 0 0 0}.single article header,.single article #post-body{margin-left:200px !important;width:560px !important}.single article header p:nth-of-type(1),.single article #post-body p:nth-of-type(1){font-size:20px;line-height:28px}.double article header{float:left;width:180px !important;text-align:right !important;margin-top:20px !important}.double article aside section{text-align:right !important;font-size:1em;line-height:18px}#post-body{width:780px;margin-left:20px;font-size:17px;line-height:25px}#post-body .col{width:350px;float:left;margin:0 40px 0 0}#post-body .narrow{width:520px}.double #post-body{float:left}#photo-archive article{width:980px}#photo-archive article h1{display:none}#photo-galleries{margin-left:-10px;width:1000px}#photo-galleries li{float:left;margin:8px;position:relative;display:block;height:350px;width:291px;border:10px #201a11 solid}#photo-galleries .figure{height:362px;width:291px;margin:0}#photo-galleries .legend{color:#888;width:285px;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;margin:0;line-height:18px;text-align:left}#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase}#photo-galleries p{margin:0}.map-legend{width:160px;margin-top:24px;float:left}.map-legend h4{font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:14px;margin:8px 0}.map-legend li{font-size:13px;margin:0;line-height:20px}.clearfix{clear:both}#map-canvas{float:right;width:760px;height:500px;border:#201a11 10px solid;margin-left:40px;margin-top:24px}section#location #map-canvas{width:295px;height:350px;border:#201a11 10px solid;margin:10px 0 0 5px}.infowin{line-height:18px;margin-bottom:16px}.infowin p{font-size:1.4em;line-height:1.4em}.infowin h4{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:2.4em;margin:6px 0 0 0}.infowin a{color:#b53a04 !important;border-bottom:1px dotted #b53a04}.infowin .date{color:#888;text-align:center;text-transform:uppercase;display:block;text-align:left;margin:6px 0 0;font-size:1.2em}#about article section{clear:both;margin-top:24px}#about article section ul{font-size:1em;margin:18px}#about article section li{margin:9px}#about article section li a{font-weight:bold}.image{float:left;width:180px;margin-top:48px}.image img{border:#201a11 10px solid}.content{float:left;margin-left:20px;width:540px;font-size:16px}.content h3{font-family:Helvetica, Verdana, sans-serif;font-size:24px;line-height:1.3em;font-weight:normal;margin:0}section#post{margin-left:200px}section#post h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal}.contact-form li{clear:both;width:440px;padding:4px 0}.contact-form dt{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:24px;line-height:1.3em;font-weight:normal;text-align:right;font-size:0.9em}.contact-form dt label{font-style:normal;text-align:right}.contact-form dd{text-align:right;margin-top:4px}.contact-form dd input#id_name,.contact-form dd input#id_email,.contact-form dd input#id_subject_line{width:298px}.top{margin:36px 0 36px 0;clear:both;width:940px}.top a{color:#b53a04}p.col{width:360px;float:left;margin:0 40px 0 0;font-size:14px}p.two{margin:0;margin-left:40px;width:450px}.break{border-bottom:#e3e3e3 1px solid;width:980px;height:2px;padding-top:36px;clear:both;margin:0}.project-tease{margin-top:65px}.project-tease li{margin-top:36px;clear:both}.project-tease li h3{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:24px;line-height:24px;margin:0;width:380px;font-weight:bold}.project-tease .tease{float:left}.project-tease .img{float:right;width:540px;margin-bottom:72px}.project-tease .img img{border:#201a11 10px solid}.project-tease .lede{clear:both;margin:0;padding-top:12px;width:380px}.project-tease .lede p{font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:16px;line-height:23px;text-align:justify}.project-tease .proj{font-size:64px;line-height:50px;float:left;margin:2px 2px 0 0}.project-tease .proj span{font-size:36px}.project-tease dt a{display:block;width:175px;float:left}.map-container{width:469px;height:392px;position:absolute;right:20px;bottom:60px;z-index:2000;margin:0;padding:0;background:url("../img/mapbg-dark.png") no-repeat top left}.more-container{width:405px;height:260px;position:absolute;right:-30px;bottom:40px;z-index:2000;background:url("../img/parkbg.png") no-repeat top left}.more-container dl{margin-top:45px;margin-left:45px}.more-container dl dt,.more-container dl dd{font-size:0.9em;line-height:25px;margin:4px 0;font-family:Helvetica, Verdana, sans-serif;color:#fff}.more-container dl dt{clear:left;float:left;width:65px;font-weight:bold;line-height:25px;font-size:0.7em;text-transform:uppercase}.more-container dl dd{float:left;width:250px;overflow:hidden}.more-container dl dd a:hover{color:#b53a04}.map-wrapper{width:400px;height:328px;margin:37px 0 0 44px}#parks{margin-top:36px}#parks article{width:980px;position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}#parks .figure img{border:none}#parks h1{display:block;color:#888;padding:10px 10px 10px 15px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;top:0;width:960px;color:#fff;font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;margin:0}#parks .legend{display:block;padding:10px 10px 10px 15px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:0;height:45px;width:980px;font-size:10px;line-height:16px;color:#fff}#parks .legend h2{font-family:Helvetica, Verdana, sans-serif;font-size:24px;line-height:1.3em;font-weight:normal;line-height:36px;font-size:18px;margin:0;padding:0;float:left}#parks .legend p{margin:6px 0 10px 0}#parks .legend .buttons{padding-top:6px;float:right;margin-right:20px}#parks .legend .buttons li{float:left;clear:none;margin:0px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}#parks .legend .buttons li a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#463215;color:#fff;-moz-border-radius:25px;-webkit-border-radius:25px;-o-border-radius:25px;border-radius:25px}#parks .legend .buttons li a:hover{background:#b53a04}#parks .map{width:280px;margin-top:42px;height:130px;float:left;margin-left:6px}#parks .map a{display:none}#parks .map div div span{display:none}#parks .entry-foot{clear:both;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:12px;background:#f3f;width:980px;margin-top:4px}img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png']{display:none !important}#featured-image img{margin-left:20px;margin-bottom:78px}.hyphenate{text-align:justify}#currently{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-transform:uppercase;font-size:12px;clear:both;width:980px;padding-top:20px;border-top:#b9b9b9 1px dotted}#currently{padding:0;margin-bottom:0px;margin-top:36px;border-top:#201a11 1px solid}#featured-intro h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:24px;line-height:1.2em;margin:0}#writing-tease h2{margin:24px 0 24px 0;font-size:12px}#archive:after{clear:both}#archive{border-top:#b9b9b9 1px dotted;clear:both}#archive h1{margin:36px 0 24px 0;text-transform:uppercase;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:12px;font-weight:bold}#archive article{float:left;width:300px;margin-bottom:20px}#archive article h1{font-size:18px;margin:0;text-transform:none;font-weight:400}#archive h2{font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:12px;margin:0}#archive .col2{margin-left:40px;margin-right:40px}#archive p{margin:0}#archive p.hyphenate{margin-top:3px;text-align:justify}#archive img{margin-top:4px}#archive .location,#archive time{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;line-height:3em;margin:0;padding:0;font-size:0.7em;text-align:left}.ie #photo-galleries a img,.ie #photo-galleries img{outline:none;border:none !important}.ie #photo-galleries li{width:291px;height:350px}.ie #photo-galleries .legend{margin:0;bottom:0;margin-bottom:8px}.ie .button a{background:none;padding:0}.ie .button a:hover{background:none;color:#b53a04 !important}.ie .drop{padding:28px 10px 5px 0}.ie .figure .legend{bottom:5px;padding:8px 0 8px 8px}.ie8 body{outline:none;border:none}.ie8 *:focus{border:none}
diff --git a/media/css/dark.css b/media/css/dark.css
index 3b08977..eea3606 100644
--- a/media/css/dark.css
+++ b/media/css/dark.css
@@ -1 +1 @@
-*:focus{outline:#b53a04 dotted thin}body{background:#201a11}a{text-decoration:none;color:#b53a04}a:visited{color:#fff;text-decoration:none}a:hover{color:#fff;text-decoration:none}header{border-bottom:#ccc 1px solid}header a{color:#fff !important}header a:hover{color:#b53a04 !important}header #logo{background:url("../img/logo-dark.gif") no-repeat left bottom}#breadcrumbs{color:#fff}#breadcrumbs a{color:#fff}#breadcrumbs a:hover{color:#b53a04}footer{color:#ccc}footer a{color:#ccc !important}footer a:hover{color:#b53a04 !important}img.postpic,img.postpicright{border:none}img.picfull{border:none}#post-body{color:#ccc}aside,header{color:#ccc}aside section a{color:#ccc !important}aside section a:hover{color:#b53a04 !important}#post-metadata{border-top:#555 1px dotted;border-bottom:#555 1px dotted;color:#ccc}.addendum dt{margin-left:-30px !important}h4 a.disqus-link-count{color:#ccc !important}#writing-detail img{border:none}#writing-detail .legend{padding:8px}
+*:focus{outline:#b53a04 dotted thin}body{background:#201a11}a{text-decoration:none;color:#b53a04}a:visited{color:#fff;text-decoration:none}a:hover{color:#fff;text-decoration:none}header{border-bottom:#ccc 1px solid}header a{color:#fff !important}header a:hover{color:#b53a04 !important}header #logo{background:url("../img/logo-dark.gif") no-repeat left bottom}#breadcrumbs{color:#fff}#breadcrumbs a{color:#fff}#breadcrumbs a:hover{color:#b53a04}footer{color:#ccc}footer a{color:#ccc !important}footer a:hover{color:#b53a04 !important}img.postpic,img.postpicright{border:none}img.picfull{border:none}#post-body{color:#ccc}aside,header{color:#ccc}aside section a{color:#ccc !important}aside section a:hover{color:#b53a04 !important}#post-metadata{border-top:#555 1px dotted;border-bottom:#555 1px dotted}#post-metadata p{color:#ccc}.addendum dt{margin-left:-30px !important}h4 a.disqus-link-count{color:#ccc !important}#writing-detail img{border:none}#writing-detail .legend{padding:8px}
diff --git a/media/css/photos.css b/media/css/photos.css
index 0c1e717..e1778a0 100644
--- a/media/css/photos.css
+++ b/media/css/photos.css
@@ -1 +1 @@
-ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}*:focus{outline:#b53a04 dotted thin}html{height:100%}body{background:#fff;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:62.5%;line-height:23px;color:#201a11;position:relative;min-height:100%;width:980px;height:100%;text-align:center;margin:0 auto}p{margin:0.8em 0 0 0}a{text-decoration:none;color:#201a11}a:visited{color:#201a11;text-decoration:none}a:hover{color:#b53a04;text-decoration:none}header{border-bottom:#201a11 2px solid;height:160px;margin-bottom:40px;font-size:1.1em;letter-spacing:1px;line-height:1.2em}header nav{text-transform:uppercase;float:left;margin-top:113px;margin-left:40px}header li{display:inline;font-size:12px;margin-left:4px;letter-spacing:1px}header li a:hover{color:#b53a04}#logo{background:url("../img/logo.png") no-repeat left bottom;height:158px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}footer{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;background:#201a11;height:36px;color:#888;font-size:1.2em;margin:80px auto 0}footer li{float:left;text-transform:uppercase;line-height:36px;margin-left:8px}footer a{color:#888 !important}footer a:hover{color:#b53a04 !important}footer nav{float:right;margin-right:8px}footer p{float:left;padding-left:8px;line-height:36px;margin:0}article ul{font-size:1.5em}#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:110%}#breadcrumbs li{display:inline}.hide{display:none}.postpic,.postpicright{display:block;margin:0.3em 0.6em;border:#201a11 10px solid;clear:both}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{border:#201a11 10px solid;margin-top:20px}.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.pull-quote{font-size:14px !important;font-style:italic !important}sup{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:0.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}.numeral{font-family:Helvetica, Verdana, sans-serif;font-size:22px;font-weight:bold;display:block;margin-top:60px;margin-bottom:0}.nfirst{margin-top:0px !important}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:9px;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}.button{display:block;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin:10px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}.hide,.dsq-brlink,img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png'],.terms-of-use-link,#dsq-comments-count{display:"none"}div[dir='ltr'] span{width:0;visibility:collapse}*:focus{outline:none}#breadcrumbs{font-family:"Hoefler Text", Georgia, "Times New Roman", Times, serif;font-size:10px;color:#fff;float:left;margin-top:5px}#breadcrumbs a{color:#fff}.meta{margin:43px 0 0 37px;color:#000}.meta dl{font-size:13px}.meta dt{clear:left;float:left;line-height:16px;margin:4px 0;width:100px}.meta dd{float:left;width:125px;margin:4px 0 4px 4px;line-height:16px}.meta dd a{color:#000 !important}.meta dd a:hover{color:#b53a04 !important}body{background:#000}.hide{display:none}.clear{clear:both}li.activeSlide a img.thumb{border:#b53a04 3px solid !important}li.jcarousel-item a img.thumb{border:#666 3px solid}.jcarousel-container{bottom:0;margin:0 auto;padding:0 40px 0 40px;width:940px}.jcarousel-clip{z-index:2;padding:0;margin:0;overflow:hidden;position:relative}.jcarousel-list{z-index:1;overflow:hidden;position:relative;top:0;left:0;margin:0;padding:0;height:80px}.jcarousel-item{float:left;list-style:none;width:80px;height:80px}.jcarousel-next-horizontal{position:absolute;top:5px;right:3px;width:20px;height:53px;margin-top:695px;background:transparent url("../img/slideshow-arrow-right.png") no-repeat 0 0}.jcarousel-next-horizontal:hover{background-position:-20px 0}.jcarousel-next-horizontal:active{background-position:-64px 0}.jcarousel-next-disabled-horizontal,.jcarousel-next-disabled-horizontal:hover,.jcarousel-next-disabled-horizontal:active{cursor:default;background-position:-96px 0}.jcarousel-prev-horizontal{position:absolute;top:5px;left:-6px;width:20px;height:53px;margin-left:7px;margin-top:695px;background:transparent url("../img/slideshow-arrow-left.png") no-repeat 0 0}.jcarousel-prev-horizontal:hover{background-position:-20px 0}.jcarousel-prev-horizontal:active{background-position:-64px 0}.jcarousel-prev-disabled-horizontal,.jcarousel-prev-disabled-horizontal:hover,.jcarousel-prev-disabled-horizontal:active{cursor:default;background-position:-96px 0}ul#feature_gallery_pager{display:block;margin:auto;overflow:hidden;height:85px;margin-top:680px}ul#feature_gallery_pager li a{overflow:hidden;width:80px;height:80px;padding:2px;float:left;display:block}ul#feature_gallery_pager li{margin:0 2px;padding:0}#slides img.thumb{width:65px;height:65px}#map-container{width:469px;height:392px;position:absolute;right:10px;bottom:35px;z-index:2000;margin:0;padding:0;background:url("../img/mapbg.png") no-repeat top left}#exif-container{width:320px;height:270px;position:absolute;right:0px;bottom:26px;z-index:2000;background:url("../img/exifbg.png") no-repeat top left}#map-wrapper{width:400px;height:328px;margin:37px 0 0 44px}#wrapper{width:1010px;margin:0 auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-align:left;font-size:16px;color:#fff}#wrapper ul#slides li{margin-top:10px}#wrapper a{color:#fff}#wrapper li.bigimg{width:1000px;position:relative;display:block;clear:both;margin:0px;margin-top:36px;clear:both;margin-bottom:72px}#wrapper div.figure{margin:0;padding:0}#wrapper div.figure img{border:none}#wrapper div.legend{display:block;margin:0;background:#000;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=65)";filter:alpha(opacity=65);-moz-opacity:0.65;-khtml-opacity:0.65;opacity:0.65;position:absolute;bottom:0;clear:both;width:100%}#wrapper div.caption{float:left;padding:0 8px;line-height:36px}#wrapper div.caption p{line-height:14px;font-size:12px;margin-top:0;margin-bottom:12px}#wrapper div.caption h5{display:inline;text-transform:uppercase}#wrapper div.caption h5 span{font-weight:normal;color:#999}#wrapper div.photo-options{float:right;margin:0}#wrapper div.photo-options a{text-transform:uppercase;font-size:13px;margin:0 8px;line-height:36px;color:#fff}#wrapper div.photo-options a:hover{color:#b53a04}#slideshow-controls{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:12px;line-height:18px;text-align:center;width:200px;margin:0 auto;position:relative;left:-5px;top:2px}#slideshow-controls li{display:inline;margin:0}#slideshow-controls li a{padding:4px 6px;background:#3b3b3b;border-color:#111 #020202 #000 #111;color:#ddd;text-shadow:1px 1px 0 #161616}#slideshow-controls li a:hover{background:#303030}#slideshow-controls li a#prev{border-right:#111 1px solid;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px;-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;border-top-left-radius:6px}#slideshow-controls li a#next{border-left:#111 1px solid;-moz-border-radius-bottomright:6px;-moz-border-radius-topright:6px;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;border-top-right-radius:6px}#slideshow-controls li a#play{border-left:#484848 1px solid;border-right:#484848 1px solid;text-align:center}.ie7 #slideshow-controls{left:-160px}.ie #breadcrumbs li{display:inline}
+ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}*:focus{outline:#b53a04 dotted thin}html{height:100%}body{background:#fff;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:15px;line-height:23px;color:#201a11;position:relative;min-height:100%;width:980px;height:100%;text-align:center;margin:0 auto}p{margin:0.8em 0 0 0}a{text-decoration:none;color:#201a11}a:visited{color:#201a11;text-decoration:none}a:hover{color:#b53a04;text-decoration:none}header{border-bottom:#201a11 2px solid;height:150px;margin-bottom:40px;font-size:1.1em;letter-spacing:1px;line-height:1.2em;font-size:12px}header nav{text-transform:uppercase;float:left;margin-top:102px;margin-left:40px}header li{display:inline;font-size:12px;margin-left:4px;letter-spacing:1px}header li a:hover{color:#b53a04}#logo{background:url("../img/logo.png") no-repeat left bottom;height:148px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}footer{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;background:#201a11;height:36px;color:#888;font-size:12px;margin:80px auto 0}footer li{float:left;text-transform:uppercase;line-height:36px;margin-left:8px}footer a{color:#888 !important}footer a:hover{color:#b53a04 !important}footer nav{float:right;margin-right:8px}footer p{float:left;padding-left:8px;line-height:36px;margin:0}article ul{font-size:1.5em}#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:11px}#breadcrumbs li{display:inline}.hide{display:none}.postpic,.postpicright{display:block;margin:0.3em 0.6em;border:#201a11 10px solid;clear:both}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{border:#201a11 10px solid;margin-top:20px}.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.pull-quote{font-size:14px !important;font-style:italic !important}sup{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:0.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}.numeral{font-family:Helvetica, Verdana, sans-serif;font-size:22px;font-weight:bold;display:block;margin-top:60px;margin-bottom:0}.nfirst{margin-top:0px !important}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:alpha(opacity=85);-moz-opacity:0.85;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:9px;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}.button{display:block;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin:10px 10px 0 0;width:auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}.hide,.dsq-brlink,img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png'],.terms-of-use-link,#dsq-comments-count{display:none}div[dir='ltr'] span{width:0;visibility:collapse}*:focus{outline:none}#breadcrumbs{font-family:"Hoefler Text", Georgia, "Times New Roman", Times, serif;font-size:10px;color:#fff;float:left;margin-top:5px}#breadcrumbs a{color:#fff}.meta{margin:43px 0 0 37px;color:#000}.meta dl{font-size:13px}.meta dt{clear:left;float:left;line-height:16px;margin:4px 0;width:100px}.meta dd{float:left;width:125px;margin:4px 0 4px 4px;line-height:16px}.meta dd a{color:#000 !important}.meta dd a:hover{color:#b53a04 !important}body{background:#000}.hide{display:none}.clear{clear:both}li.activeSlide a img.thumb{border:#b53a04 3px solid !important}li.jcarousel-item a img.thumb{border:#666 3px solid}.jcarousel-container{bottom:0;margin:0 auto;padding:0 40px 0 40px;width:940px}.jcarousel-clip{z-index:2;padding:0;margin:0;overflow:hidden;position:relative}.jcarousel-list{z-index:1;overflow:hidden;position:relative;top:0;left:0;margin:0;padding:0;height:80px}.jcarousel-item{float:left;list-style:none;width:80px;height:80px}.jcarousel-next-horizontal{position:absolute;top:5px;right:3px;width:20px;height:53px;margin-top:695px;background:transparent url("../img/slideshow-arrow-right.png") no-repeat 0 0}.jcarousel-next-horizontal:hover{background-position:-20px 0}.jcarousel-next-horizontal:active{background-position:-64px 0}.jcarousel-next-disabled-horizontal,.jcarousel-next-disabled-horizontal:hover,.jcarousel-next-disabled-horizontal:active{cursor:default;background-position:-96px 0}.jcarousel-prev-horizontal{position:absolute;top:5px;left:-6px;width:20px;height:53px;margin-left:7px;margin-top:695px;background:transparent url("../img/slideshow-arrow-left.png") no-repeat 0 0}.jcarousel-prev-horizontal:hover{background-position:-20px 0}.jcarousel-prev-horizontal:active{background-position:-64px 0}.jcarousel-prev-disabled-horizontal,.jcarousel-prev-disabled-horizontal:hover,.jcarousel-prev-disabled-horizontal:active{cursor:default;background-position:-96px 0}ul#feature_gallery_pager{display:block;margin:auto;overflow:hidden;height:85px;margin-top:680px}ul#feature_gallery_pager li a{overflow:hidden;width:80px;height:80px;padding:2px;float:left;display:block}ul#feature_gallery_pager li{margin:0 2px;padding:0}#slides img.thumb{width:65px;height:65px}#map-container{width:469px;height:392px;position:absolute;right:10px;bottom:35px;z-index:2000;margin:0;padding:0;background:url("../img/mapbg.png") no-repeat top left}#exif-container{width:320px;height:270px;position:absolute;right:0px;bottom:26px;z-index:2000;background:url("../img/exifbg.png") no-repeat top left}#map-wrapper{width:400px;height:328px;margin:37px 0 0 44px}#wrapper{width:1010px;margin:0 auto;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-align:left;font-size:16px;color:#fff}#wrapper ul#slides li{margin-top:10px}#wrapper a{color:#fff}#wrapper li.bigimg{width:1000px;position:relative;display:block;clear:both;margin:0px;margin-top:36px;clear:both;margin-bottom:72px}#wrapper div.figure{margin:0;padding:0}#wrapper div.figure img{border:none}#wrapper div.legend{display:block;margin:0;background:#000;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=65)";filter:alpha(opacity=65);-moz-opacity:0.65;-khtml-opacity:0.65;opacity:0.65;position:absolute;bottom:0;clear:both;width:100%}#wrapper div.caption{float:left;padding:0 8px;line-height:36px}#wrapper div.caption p{line-height:14px;font-size:12px;margin-top:0;margin-bottom:12px}#wrapper div.caption h5{display:inline;text-transform:uppercase}#wrapper div.caption h5 span{font-weight:normal;color:#999}#wrapper div.photo-options{float:right;margin:0}#wrapper div.photo-options a{text-transform:uppercase;font-size:13px;margin:0 8px;line-height:36px;color:#fff}#wrapper div.photo-options a:hover{color:#b53a04}#slideshow-controls{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:12px;line-height:18px;text-align:center;width:200px;margin:0 auto;position:relative;left:-5px;top:2px}#slideshow-controls li{display:inline;margin:0}#slideshow-controls li a{padding:4px 6px;background:#3b3b3b;border-color:#111 #020202 #000 #111;color:#ddd;text-shadow:1px 1px 0 #161616}#slideshow-controls li a:hover{background:#303030}#slideshow-controls li a#prev{border-right:#111 1px solid;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px;-webkit-border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;border-top-left-radius:6px}#slideshow-controls li a#next{border-left:#111 1px solid;-moz-border-radius-bottomright:6px;-moz-border-radius-topright:6px;-webkit-border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;border-top-right-radius:6px}#slideshow-controls li a#play{border-left:#484848 1px solid;border-right:#484848 1px solid;text-align:center}.ie7 #slideshow-controls{left:-160px}.ie #breadcrumbs li{display:inline}
diff --git a/media/sass/_about.sass b/media/sass/_about.sass
index 724108f..dc25bdb 100644
--- a/media/sass/_about.sass
+++ b/media/sass/_about.sass
@@ -1,6 +1,6 @@
//About page
-#about
+#about article
section
clear: both
margin-top: 24px
@@ -23,7 +23,7 @@
float: left
margin-left: $pad
width: $col9 + $pad
- font-size: 1.6em
+ font-size: 16px
h3
+sm-headline-sans
margin: 0
diff --git a/media/sass/_globals.sass b/media/sass/_globals.sass
index 708a394..9fb7ffd 100644
--- a/media/sass/_globals.sass
+++ b/media/sass/_globals.sass
@@ -13,7 +13,7 @@ body
background: white
font-family: unquote("Hoefler Text"), Georgia, unquote("Times New Roman"), Times, serif
/* font-size 15px
- font-size: 62.5%
+ font-size: 15px
/* line height of 24 px
line-height: 23px
color: $luxagraf_brown
@@ -42,13 +42,14 @@ a
header
border-bottom: $luxagraf_brown 2px solid
- height: 160px
+ height: 150px
margin-bottom: 40px
+small-serif
+ font-size: 12px
nav
text-transform: uppercase
float: left
- margin-top: 113px
+ margin-top: 102px
margin-left: $col
li
display: inline
@@ -61,7 +62,7 @@ header
//logo link
#logo
background: url("../img/logo.png") no-repeat left bottom
- height: 158px
+ height: 148px
width: $col7
float: left
text-indent: -1000px
@@ -76,7 +77,7 @@ footer
background: $luxagraf_brown
height: 36px
color: #888888
- font-size: 1.2em
+ font-size: 12px
margin: 80px auto 0
li
float: left
@@ -102,7 +103,7 @@ article ul
#breadcrumbs
font-weight: normal
+tiny-serif
- font-size: 110%
+ font-size: 11px
li
display: inline
@@ -206,7 +207,7 @@ sup
// shit to hide ------------------------------
.hide, .dsq-brlink, img[src='http://maps.gstatic.com/intl/en_us/mapfiles/poweredby.png'], .terms-of-use-link, #dsq-comments-count
- display: "none"
+ display: none
div[dir='ltr'] span
width: 0
diff --git a/media/sass/_maps.sass b/media/sass/_maps.sass
index c1c4b57..76ffb54 100644
--- a/media/sass/_maps.sass
+++ b/media/sass/_maps.sass
@@ -6,10 +6,10 @@
float: left
h4
+small-serif
- font-size: 1.4em
+ font-size: 14px
margin: 8px 0
li
- font-size: 90%
+ font-size: 13px
margin: 0
line-height: 20px
@@ -17,7 +17,7 @@
clear: both
#map-canvas
- float: left
+ float: right
width: $col13
height: 500px
border: $luxagraf_brown 10px solid
diff --git a/media/sass/_mixins.sass b/media/sass/_mixins.sass
index 5689f66..b6b1ca1 100644
--- a/media/sass/_mixins.sass
+++ b/media/sass/_mixins.sass
@@ -11,7 +11,7 @@
=sm-headline-sans
font-family: Helvetica, Verdana, sans-serif
- font-size: 1.6em
+ font-size: 24px
line-height: 1.3em
font-weight: normal
diff --git a/media/sass/_photos.sass b/media/sass/_photos.sass
index b1865eb..fd2ecee 100644
--- a/media/sass/_photos.sass
+++ b/media/sass/_photos.sass
@@ -25,6 +25,7 @@
+transparent_class
margin: 0
line-height: 18px
+ text-align: left
h3
color: white
padding: 0
diff --git a/media/sass/_projects.sass b/media/sass/_projects.sass
index fb66c99..7ec179b 100644
--- a/media/sass/_projects.sass
+++ b/media/sass/_projects.sass
@@ -120,7 +120,7 @@ p.two
#parks
margin-top: 36px
- li
+ article
width: $col16 + $pad * 2
position: relative
display: block
@@ -130,7 +130,7 @@ p.two
.figure
img
border: none
- h4
+ h1
display: block
color: #888888
padding: 10px 10px 10px 15px
@@ -154,7 +154,7 @@ p.two
font-size: 10px
line-height: 16px
color: white
- h5
+ h2
+sm-headline-sans
line-height: 36px
font-size: 18px
diff --git a/media/sass/_writing.sass b/media/sass/_writing.sass
index e0d09c5..4ee6934 100644
--- a/media/sass/_writing.sass
+++ b/media/sass/_writing.sass
@@ -1,43 +1,50 @@
//Writing Archive pages
-#writing-archive
+#writing-archive,#featured
margin-top: 72px
margin-bottom: 36px
li
clear: both
- h3
+ h3,h1
+sm-headline-sans
margin: 0
- text-align: "left"
+ text-align: left
div
width: $col7
margin-right: $pad
float: left
- text-align: "justify"
+ text-align: justify
+ h1
+ margin-top: 3px
.img
width: $col9
margin-left: $pad
margin-bottom: 36px
p
margin: 0
- font-size: 1.1em
+ font-size: 16px
.location,time
+tiny-serif
line-height: 3em
- font-size: 0.7em
+ font-size: 11px
img
border: $luxagraf_brown 10px solid
#pagination
+sm-sans
+ font-size: 13px
width: $full
clear: both
margin: 0
border-top: $luxagraf_brown 1px dotted
border-bottom: $luxagraf_brown 1px dotted
text-align: center
- .pagination
+ .pages
margin: 8px 0
+ clear: both
+ li
+ display: inline
+ margin: 2px
.current
color: $luxagraf_orange
@@ -78,39 +85,51 @@
line-height: 1.2em
#post-metadata
- width: $col9 + $pad
+ width: $col10 - !pad
border-top: $luxagraf_brown 1px dotted
border-bottom: $luxagraf_brown 1px dotted
margin: 24px 0 24px $col4 - $pad
- font-size: 0.8em
padding-bottom: 8px
clear: both
+ background: none
+ p
+ font-family: unquote("Hoefler Text"), Georgia, unquote("Times New Roman"), Times, serif
+ color: #201A11
+ line-height: 25px
+ float: none
+ padding: 8px 0
+ font-size: 14px
+ a
+ color: $luxagraf_orange !important
+ height: auto
+ float: none
+
+
#page-navigation
width: $full
clear: both
margin: 24px 0 0 0
text-transform: uppercase
- font-size: 0.5em
+ +sm-sans
li#next
float: right
- +sm-sans
margin-right: $col3 - $pad
+ font-size: 13px !important
li#prev
float: left
- +sm-sans
margin-left: $col2 + $pad
-
+ font-size: 13px !important
#comments
clear: both
width: $col9
margin: 24px 0 24px $col4 - $pad
- font-size: 0.8em
+ font-size: 13px
h4
margin-top: 96px
+headline-sans
text-transform: uppercase
- font-size: 1.3em
+ font-size: 18px
h4 a.disqus-link-count
color: $luxagraf_brown !important
@@ -119,13 +138,13 @@ ul#dsq-comments
font-size: 1.2em
.dsq-comment-cite
- font-family: "Helvetica", "Verdana", "sans-serif"
+ font-family: unquote("Helvetica"), unquote("Arial"), unquote("sans-serif")
font-size: 0.9em !important
font-weight: normal
text-transform: uppercase
.dsq-comment-header-time, .dsq-comment-footer
- font-family: "Helvetica", "Verdana", "sans-serif"
+ font-family: unquote("Helvetica"), unquote("Arial"), unquote("Verdana"), unquote("sans-serif")
.dsq-comment-footer
font-size: 0.8em
@@ -169,7 +188,7 @@ blockquote
.legend
width: 552px
padding: 8px 0 12px 16px
- font-family: "Helvetica", "Verdana", "sans-serif"
+ font-family: unquote("Helvetica"), unquote("Arial"), unquote("Verdana"), unquote("sans-serif")
h4.notes
+sm-sans
@@ -213,6 +232,8 @@ h4.notes
#post-body
width: $col13 + $pad
margin-left: $pad
+ font-size: 17px
+ line-height: 25px
.col
width: 350px
float: left
diff --git a/media/sass/base.sass b/media/sass/base.sass
index 0862e95..8401c8f 100644
--- a/media/sass/base.sass
+++ b/media/sass/base.sass
@@ -16,10 +16,10 @@
.hyphenate
text-align: justify
-#writing-tease, #currently
+#currently
+sm-sans
text-transform: uppercase
- font-size: 0.8em
+ font-size: 12px
clear: both
width: $full
padding-top: 20px
@@ -32,28 +32,45 @@
margin-top: 36px
border-top: $luxagraf_brown 1px solid
+#featured-intro h1
+ +headline-sans
+ font-size: 24px
+ line-height: 1.2em
+ margin: 0
#writing-tease
h2
margin: 24px 0 24px 0
+ font-size: 12px
-#fromthearc
+#archive:after
clear: both
- li
+#archive
+ border-top: #b9b9b9 1px dotted
+ clear: both
+ h1
+ margin: 36px 0 24px 0
+ text-transform: uppercase
+ +sm-sans
+ font-size: 12px
+ font-weight: bold
+ article
float: left
width: $col5 + $pad
margin-bottom: $pad
+ h1
+ font-size: 18px
+ //min-height: 50px
+ margin: 0
+ text-transform: none
+ font-weight: 400
+
h2
+small-serif
- font-size: 2em
+ font-size: 12px
margin: 0
.col2
margin-left: $pad * 2
margin-right: $pad * 2
- h3
- +headline-sans
- font-size: 1.2em
- //min-height: 50px
- margin: 0
p
margin: 0
p.hyphenate
diff --git a/media/sass/dark.sass b/media/sass/dark.sass
index cc4ff25..29ac968 100644
--- a/media/sass/dark.sass
+++ b/media/sass/dark.sass
@@ -63,7 +63,8 @@ aside section
#post-metadata
border-top: #555555 1px dotted
border-bottom: #555555 1px dotted
- color: #cccccc
+ p
+ color: #cccccc
.addendum dt
margin-left: -30px !important
diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html
index 7cb371e..a84563c 100644
--- a/templates/archives/homepage.html
+++ b/templates/archives/homepage.html
@@ -1,47 +1,36 @@
{% extends 'base.html' %}
{% load typogrify %}
+{%block extrahead%}<link rel="openid.server"
+ href="http://www.myopenid.com/server" >
+ <link rel="openid.delegate"
+ href="http://luxagraf.myopenid.com/" >
+ <meta name="verify-v1" content="ZCZSYGNdjeLCPx5trSQELyhY9kq9N7CznTcv5JFkpnM=">{%endblock%}
{%block bodyid%}id="home"{%endblock%}
-{% block primary %}
- <article>
- <section>
- <ul id="writing-archive">
- <li>
- <div id="featured-article">
- <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">{% 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 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>
- </div>
-
- </li>
- </ul>
-
- </section>
- <!--<section id="currently">
+{% block primary %}<section id="featured">
+ <article>
+ <div id="featured-intro">
+ <h1><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h1>
+ <p>
+ <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|date:'c'}}">{{featured.pub_date|date:"m/d/y"}}</time>
+ </p>
+ <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>
+ </div>
+ </article>
+ </section>
+ {%comment%}<section id="currently">
<div class="project-tease"><a href="/projects/5x5/"><h4 id="proj">5<span>x</span>5</h4> Interviews From The Road</a><p>Lorem sit amet, consectetur adipiscing elit. Duis cursus sodales eros <cite>&ndash; William Brandon III</cite></p></div>
- </section>-->
-
- <section id="writing-tease">
- <h2>From the Archive</h2>
-
- </section>
- <section id="fromthearc">
- {% include 'includes/recent_entries.html' %}
- </section>
-
- </article>
-
-
+ </section>{%endcomment%}
+ <section id="archive">
+ <h1>From the Archive</h1>
+ {% include 'includes/recent_entries.html' %}
+ </section>
{% endblock %}
{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.min.js" type="text/javascript"></script>{% endblock%} \ No newline at end of file
diff --git a/templates/archives/map.html b/templates/archives/map.html
index f47b84d..0a002b9 100644
--- a/templates/archives/map.html
+++ b/templates/archives/map.html
@@ -23,16 +23,18 @@ Google Maps code
-{% block primary %}
- <article>
+{% block primary %}<section id="page-header">
+ <nav id="page-nav">
<ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<li><a href="/" itemprop="url" title="luxagraf homepage"><span itemprop="title">Home</span></a> &rarr;</li>
<li>Map</li>
</ul>
-
- <aside>{% include 'includes/map_sidebar.html' %}
- </aside>
+ </nav>
+ </section>
+ <article>
<div id="map-canvas">
</div>
- </article>
+ <aside>{% include 'includes/map_sidebar.html' %}
+ </aside>
+ </article>
{% endblock %} \ No newline at end of file
diff --git a/templates/archives/photos.html b/templates/archives/photos.html
index 1eacf3c..eeb6451 100644
--- a/templates/archives/photos.html
+++ b/templates/archives/photos.html
@@ -8,33 +8,27 @@
{%block bodyid%}id="photo-archive"{%endblock%}
-{% block primary %}
- <article>
- <h1>{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1>
-
+{% block primary %}<section id="page-header">
+ <h1 class="hide">{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1>
+ <nav>
<ul 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>
{% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> &rarr;</li>
- <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}Photos </li>{%endif%}
+ <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}<li>Photos </li>{%endif%}
</ul>
-
- <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %}
- <li>
- <div class="figure">
- <a href="{{object.get_absolute_url}}"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a>
- <span class="legend">
- <h3>{{object.set_title}}</h3>
- <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p>
- </span>
- </div>
- </li>{% endfor %}
- </ul>
-
-
-
- <section id="pagination">
- <ul>{% paginate %}
- </ul>
- </section>
- </article>
+ </nav>
+ </section>
+ <ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %}
+ <li>
+ <div class="figure">
+ <a href="{{object.get_absolute_url}}"><img src="{{object.get_main_image}}" alt="{{ object.set_title }}"/></a>
+ <div class="legend">
+ <h3>{{object.set_title}}</h3>
+ <p>{{object.set_desc|truncatewords:30|smartypants|safe}}</p>
+ </div>
+ </div>
+ </li>{% endfor %}
+ </ul>
+ <nav id="pagination">{% paginate %}
+ </nav>
{% endblock %} \ No newline at end of file
diff --git a/templates/archives/writing.html b/templates/archives/writing.html
index f05b34c..877ff58 100644
--- a/templates/archives/writing.html
+++ b/templates/archives/writing.html
@@ -7,44 +7,34 @@
{%block bodyid%}id="writing"{%endblock%}
-{% block primary %}
- <article>
- <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" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
- <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
- {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing" itemprop="url"><span itemprop="title">Writing</span></a> &rarr;</li>
- <li itemprop="title">the United States</li>{%else%}<li><a href="/writing/" title="See all Writing" itemprop="url"><span>Writing</span></a> &rarr;</li>
- <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}Writing </li>{%endif%}
- </ul>
-
- <ul id="writing-archive">
- {% autopaginate object_list 10 %}
- {% for object in object_list %}
- <li>
+{% block primary %}<section id="page-header">
+ <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>
+ <nav id="page-nav">
+ <ul 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>
+ {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing" itemprop="url"><span itemprop="title">Writing</span></a> &rarr;</li>
+ <li itemprop="title">the United States</li>{%else%}<li><a href="/writing/" title="See all Writing" itemprop="url"><span>Writing</span></a> &rarr;</li>
+ <li>{{region.name|title|smartypants|safe}}</li>{%endif%}{%else%}<li>Writing </li>{%endif%}
+ </ul>
+ </nav>
+ </section>
+ <section id="writing-archive"> {% autopaginate object_list 10 %} {% for object in object_list %}
+ <article>
<div>
- <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>
-
+ <h1><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1>
<p>
<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>
+ <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time>
</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>
</div>
-
- </li>
- {% endfor %}
- </ul>
-
- <section id="pagination">
- <ul>{% paginate %}
- </ul>
+ </article> {% endfor %}
</section>
- </article>
+ <nav id="pagination">{% paginate %}
+ </nav>
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 3bff0fc..ecf2a5c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,23 +1,12 @@
-
<!DOCTYPE html>
-<!--[if gte IE 6]>
- <![if IE 6]>
- <html lang="en" class="ie ie6">
- <![endif]>
- <![if IE 7]>
- <html lang="en" class="ie ie7">
- <![endif]>
- <![if gt IE 7]>
- <html lang="en" class="ie ie8">
- <![endif]>
-<![endif]-->
-<!--[if !IE]> <-->
-<html lang="en">
-<!--> <![endif]-->
- <head>
+<!--[if lt IE 7 ]> <html lang="en" class="ie ie6"> <![endif]-->
+<!--[if IE 7 ]> <html lang="en" class="ie ie7"> <![endif]-->
+<!--[if IE 8 ]> <html lang="en" class="ie ie8"> <![endif]-->
+<!--[if IE 9 ]> <html lang="en" class="ie9"> <![endif]-->
+<!--[if (gt IE 9)|!(IE)]><!--> <html lang="en"> <!--<![endif]-->
+<head>
<title>{% block pagetitle %}Luxagraf - Topografical Writings{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
<!--[if IE]>
<script src="{{MEDIA_URL}}js/html5.js"></script>
<![endif]-->
@@ -27,22 +16,15 @@
href="http://feeds2.feedburner.com/luxagraf/blog">
<link rel="stylesheet"
href="{{MEDIA_URL}}css/base.css"
- type="text/css"
media="screen">
<link rel="stylesheet"
href="{{MEDIA_URL}}css/print.css"
- type="text/css"
- media="print">
- {%block stylesheet%}{%endblock%}
-
-
+ media="print">{%block stylesheet%}{%endblock%}
<link rel="shortcut icon"
href="http://media.luxagraf.net/img/favicon.ico"
type="image/vnd.microsoft.icon">
-
<link rel="apple-touch-icon"
href="http://media.luxagraf.net/img/luxagrafiphoneicon.png">
-
<meta name="author" content="luxagraf">
<meta name="description"
content="{% block metadescription %}Luxagraf: a travelogue of sorts, Recording journeys around the world and just next door.{% endblock %}">
@@ -50,16 +32,7 @@
content="luxagraf writing travel authors philosophy ramblings">
<meta name="copyright"
content="Licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License">
-
-
- <link rel="openid.server"
- href="http://www.myopenid.com/server" >
-
- <link rel="openid.delegate"
- href="http://luxagraf.myopenid.com/" >
-
-<meta name="verify-v1" content="ZCZSYGNdjeLCPx5trSQELyhY9kq9N7CznTcv5JFkpnM=">
-{%block extrahead%}{%endblock%}
+ {%block extrahead%}{%endblock%}
</head>
<body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}>
@@ -78,7 +51,6 @@
</ul>
</nav>
</header>
-
{% block primary %}
<article>
diff --git a/templates/details/about.html b/templates/details/about.html
index 0c62d4d..7a25c0e 100644
--- a/templates/details/about.html
+++ b/templates/details/about.html
@@ -5,33 +5,35 @@
{%block bodyid%}id="about"{%endblock%}
-{% block primary %}
-<article>
- <ul id="breadcrumbs">
- <li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
- <li>About</li>
- </ul>
-
- <section>
- <div class="image"><img src="{{IMAGES_URL}}bio.jpg" alt="me" /></div>
- <div class="content">
- {{top.content|smartypants|safe}}
- </div>
+{% block primary %}<section id="page-header">
+ <nav id="page-nav">
+ <ul id="breadcrumbs">
+ <li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
+ <li>About</li>
+ </ul>
+ </nav>
</section>
+ <article>
+ <h1 class="hide">About Luxagraf</h1>
+ <section>
+ <div class="image"><img src="{{IMAGES_URL}}bio.jpg" alt="me" /></div>
+ <div class="content">
+ {{top.content|smartypants|safe}}
+ </div>
+ </section>
<div class="clearfix"></div>
- <section>
- <div class="image"><img src="{{IMAGES_URL}}site.jpg" alt="me" /></div>
- <div class="content">
- {{middle.content|smartypants|safe}}
- </div>
- </section>
+ <section>
+ <div class="image"><img src="{{IMAGES_URL}}site.jpg" alt="me" /></div>
+ <div class="content">
+ {{middle.content|smartypants|safe}}
+ </div>
+ </section>
<div class="clearfix"></div>
- <section>
- <div class="image"><img src="{{IMAGES_URL}}colo.jpg" alt="me" /></div>
- <div class="content">
- {{bottom.content|smartypants|safe}}
- </div>
- </section>
-
-</article>
+ <section>
+ <div class="image"><img src="{{IMAGES_URL}}colo.jpg" alt="me" /></div>
+ <div class="content">
+ {{bottom.content|smartypants|safe}}
+ </div>
+ </section>
+ </article>
{% endblock %}
diff --git a/templates/details/entry.html b/templates/details/entry.html
index 0f0bca5..cea00b1 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -27,42 +27,35 @@
{% block primary %}
<article id="writing-detail">
- <header>
- <h1>{{object.title|smartypants|widont|safe}}</h1>
- <aside class="meta">
- <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>{%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}</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">
- {{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%}
- <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}}, {%if object.location.state.country.name == 'United States'%}<a href="/map/#{{object.location.state.country.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}<a href="/map/#{{object.location.state.country.slug}}" title="view all entries from {{object.location.state.country.name}}">{{object.location.state.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>
- </section>
- <section id="page-navigation">
- <nav>
- <ul>{% if object.get_next_published%}
- <li id="prev">
- <a href="{{ object.get_next_published.get_absolute_url }}" title=" {{object.get_next_published.title}}">&larr; newer</a>
- </li>{%endif%}
- {% if object.get_previous_published%}<li id="next">
- <a href="{{ object.get_previous_published.get_absolute_url }}" title=" {{object.get_previous_published.title}}">older &rarr;</a>
- </li>{%endif%}
- </ul>
- </nav>
- </section>
- <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>
+ <header>
+ <h1>{{object.title|smartypants|widont|safe}}</h1>
+ <aside class="meta">
+ <section class="geo">{%spaceless%}{% 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>{%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}{%endspaceless%}</section>
+ </aside>
+ </header>
+ <div id="post-body">
+ {{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%}
+ <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 {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}<a href="/map/#{{object.location.state.country.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}<a href="/map/#{{object.location.state.country.slug}}" title="view all entries from {{object.location.state.country.name}}">{{object.location.state.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>
+ <nav id="page-navigation">
+ <ul>{% if object.get_next_published%}
+ <li id="prev">
+ <a href="{{ object.get_next_published.get_absolute_url }}" title=" {{object.get_next_published.title}}">&larr; newer</a>
+ </li>{%endif%}
+ {% if object.get_previous_published%}<li id="next">
+ <a href="{{ object.get_previous_published.get_absolute_url }}" title=" {{object.get_previous_published.title}}">older &rarr;</a>
+ </li>{%endif%}
+ </ul>
+ </nav>
+ <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>
</article>
{% endblock %}
{% block js %}
diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html
index c6099a8..63a2d8e 100644
--- a/templates/details/national-parks.html
+++ b/templates/details/national-parks.html
@@ -3,10 +3,8 @@
{% block pagetitle %}Luxagraf | Projects | National Parks {% endblock %}
{% block metadescription %}{% endblock %}
-{% block extrahead %}
-<link rel="stylesheet"
+{% block extrahead %}<link rel="stylesheet"
href="{{MEDIA_URL}}css/dark.css"
- type="text/css"
media="screen">
{% endblock %}
@@ -16,59 +14,51 @@
{% block bodyevents %}{% endblock %}
-{% block primary %}
-<article>
- <ul 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>
-
- <ul id="parks">
- {% for object in object_list %}
- <li id="park-{{forloop.counter}}">
+{% block primary %}<section id="page-header">
+ <h1 class="hide">The National Parks Project</h1>
+ <nav>
+ <ul 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>
+ </nav>
+ </section>
+ <section id="parks">{% for object in object_list %}
+ <article id="park-{{forloop.counter}}">
<div class="figure">
<img src="{{object.image.url}}" alt="{{object.title}}" />
</div>
- <h4>{{object.name}}</h4>
+ <h1>{{object.name}}</h1>
<div class="legend">
- <h5>{{object.tag_line}}</h5>
-
- <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>
-
-
+ <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>
-
- </li>
+ </article>
{% endfor %}
- </ul>
-
-</article>
-
+ </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.js" ></script>
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></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>
{% endblock %} \ No newline at end of file
diff --git a/templates/includes/recent_entries.html b/templates/includes/recent_entries.html
index 3bcae08..fd9c7ef 100644
--- a/templates/includes/recent_entries.html
+++ b/templates/includes/recent_entries.html
@@ -1,36 +1,31 @@
+<article class="col1">
+ <h1><a href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">Dinosaur National Monument, Part One: Echo&nbsp;Park</a></h1>
+ <p>
+ <span class="location">Dinosaur National Monument, <a href="/writing/united-states/1/" title="travel writing from the United States">Colorado</a></span> &nbsp;
- <ul>
- <li class="col1">
- <h3><a href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">Dinosaur National Monument, Part One: Echo&nbsp;Park</a></h3>
- <p>
- <span class="location">Dinosaur National Monument, <a href="/writing/united-states/1/" title="travel writing from the United States">Colorado</a></span> &nbsp;
-
- <time datetime="2010-07-28 16:00:00">07/28/10</time>
- <img src="http://images.luxagraf.net/post-thumbnail/2010/dinosaurv.jpg" alt="Dinosaur National Monument, Part One: Echo Park" class="post-image" />
- </p>
- <p class="intro hyphenate">Dinosaur National Monument was poorly named. The best parts of it are not the fossils in the quarry (which is closed for 2010 anyway) but the canyon country &mdash; some of the best, most remote canyon country you'll find in this part of the world.</p>
- <span class="button"><a class="permalink" href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">More&nbsp;&raquo;</a></span>
- </li>
- <li class="col2">
- <h3><a href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">The Endless Crowds of&nbsp;Yellowstone</a></h3>
- <p>
- <span class="location">Yellowstone National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> &nbsp;
-
- <time datetime="2010-07-25 13:00:00">07/25/10</time>
- <img src="http://images.luxagraf.net/post-thumbnail/2010/yellowstonev.jpg" alt="The Endless Crowds of Yellowstone" class="post-image" />
- </p>
- <p class="intro hyphenate">There is wilderness in Yellowstone, even if it's just inches from the boardwalks that transport thousands around the geothermal pools. It may not be wilderness on a grand scale &mdash; the sweeping mountain peaks or wild rivers of other parks &mdash but in some ways that makes it more enticing. As one Ranger told me, Yellowstone isn't about the big picture, the grand scenery, it's about the tiny details within each pool. To really see Yellowstone, he said, you have to take your time, move slowly and look closely. </p>
- <span class="button"><a class="permalink" href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">More&nbsp;&raquo;</a></span>
- </li>
- <li class="col1">
- <h3><a href="/2010/jul/22/backpacking-grand-tetons/" title="Backpacking in the Grand Tetons">Backpacking in the Grand&nbsp;Tetons</a></h3>
- <p>
- <span class="location">Grand Teton National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> &nbsp;
-
- <time datetime="2010-07-22 16:00:00">07/22/10</time>
- <img src="http://images.luxagraf.net/post-thumbnail/2010/grandtetonsv.jpg" alt="Backpacking in the Grand Tetons" class="post-image" />
- </p>
- <p class="intro hyphenate">Hiking into the wilderness empties your mind. You fall into the silence of the mountains and you can relax in a way that's very difficult to do in the midst of civilization. The white noise that surrounds us in our everyday lives, that noise we don't even notice as it adds thin layers of stress that build up over days, weeks, years, does not seem capable of following us into the mountains. </p>
- <span class="button"><a class="permalink" href="/2010/jul/22/backpacking-grand-tetons/" title="Backpacking in the Grand Tetons">More&nbsp;&raquo;</a></span>
- </li>
- </ul> \ No newline at end of file
+ <time datetime="2010-07-28T16:00:00">07/28/10</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/dinosaurv.jpg" alt="Dinosaur National Monument, Part One: Echo Park" class="post-image" />
+ </p>
+ <p class="intro hyphenate">Dinosaur National Monument was poorly named. The best parts of it are not the fossils in the quarry (which is closed for 2010 anyway) but the canyon country &mdash; some of the best, most remote canyon country you'll find in this part of the world.</p>
+ <span class="button"><a class="permalink" href="/2010/jul/28/dinosaur-national-monument-part-one-echo-park/" title="Dinosaur National Monument, Part One: Echo Park">More&nbsp;&raquo;</a></span>
+ </article><article class="col2">
+ <h1><a href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">The Endless Crowds of&nbsp;Yellowstone</a></h1>
+ <p>
+ <span class="location">Yellowstone National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> &nbsp;
+
+ <time datetime="2010-07-25T13:00:00">07/25/10</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/yellowstonev.jpg" alt="The Endless Crowds of Yellowstone" class="post-image" />
+ </p>
+ <p class="intro hyphenate">There is wilderness in Yellowstone, even if it's just inches from the boardwalks that transport thousands around the geothermal pools. It may not be wilderness on a grand scale &mdash; the sweeping mountain peaks or wild rivers of other parks &mdash; but in some ways that makes it more enticing. As one Ranger told me, Yellowstone isn't about the big picture, the grand scenery, it's about the tiny details within each pool. To really see Yellowstone, he said, you have to take your time, move slowly and look closely. </p>
+ <span class="button"><a class="permalink" href="/2010/jul/25/endless-crowds-yellowstone/" title="The Endless Crowds of Yellowstone">More&nbsp;&raquo;</a></span>
+ </article><article class="col1">
+ <h1><a href="/2010/jul/22/backpacking-grand-tetons/" title="Backpacking in the Grand Tetons">Backpacking in the Grand&nbsp;Tetons</a></h1>
+ <p>
+ <span class="location">Grand Teton National Park, <a href="/writing/united-states/1/" title="travel writing from the United States">Wyoming</a></span> &nbsp;
+
+ <time datetime="2010-07-22T16:00:00">07/22/10</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/grandtetonsv.jpg" alt="Backpacking in the Grand Tetons" class="post-image" />
+ </p>
+ <p class="intro hyphenate">Hiking into the wilderness empties your mind. You fall into the silence of the mountains and you can relax in a way that's very difficult to do in the midst of civilization. The white noise that surrounds us in our everyday lives, that noise we don't even notice as it adds thin layers of stress that build up over days, weeks, years, does not seem capable of following us into the mountains. </p>
+ <span class="button"><a class="permalink" href="/2010/jul/22/backpacking-grand-tetons/" title="Backpacking in the Grand Tetons">More&nbsp;&raquo;</a></span>
+ </article>
diff --git a/templates/includes/recent_entries_template.html b/templates/includes/recent_entries_template.html
index 847dc47..97c05f9 100644
--- a/templates/includes/recent_entries_template.html
+++ b/templates/includes/recent_entries_template.html
@@ -1,14 +1,11 @@
-{% load typogrify %}
- <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>
- <p>
- <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 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
+{% load typogrify %}{% for object in object_list %}<article class="{% cycle 'col1' 'col2' %}">
+ <h1><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1>
+ <p>
+ <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|date:'c'}}">{{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 hyphenate">{{object.dek|safe}}</p>
+ <span class="button"><a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">More&nbsp;&raquo;</a></span>
+ </article>{% endfor %}