summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/css/base.css2
-rw-r--r--media/img/map.gifbin547 -> 0 bytes
-rw-r--r--media/js/hyphenate.js21
-rw-r--r--media/js/underscore-min.js17
-rw-r--r--media/sass/_projects.sass1
-rw-r--r--media/sass/_writing.sass7
-rw-r--r--media/sass/base.sass50
-rw-r--r--templates/archives/homepage.html10
-rw-r--r--templates/archives/photos.html4
-rw-r--r--templates/archives/projects.html4
-rw-r--r--templates/archives/topics.html2
-rw-r--r--templates/archives/writing.html11
-rw-r--r--templates/base.html8
-rw-r--r--templates/details/entry.html30
-rw-r--r--templates/details/national-parks.html12
-rw-r--r--templates/details/photo.html10
-rw-r--r--templates/details/photo_galleries.html6
-rw-r--r--templates/includes/map_entry_list_template.html2
-rw-r--r--templates/includes/recent_entries.html15
-rw-r--r--templates/includes/recent_entries_template.html7
20 files changed, 148 insertions, 71 deletions
diff --git a/media/css/base.css b/media/css/base.css
index 905590b..1aec752 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}body{background:white;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:62.5%;line-height:23px;color:#201a11;text-align:center}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{width:980px;margin:0 auto 40px}header{border-bottom:#201a11 2px solid;height:160px}header h1 a{background:url('../img/logo.gif') no-repeat left bottom;height:158px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}header nav{float:left;margin-top:110px;margin-left:40px}header nav li{display:inline;font-size:1.1em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:1.2em;margin-left:4px}header nav a:hover{color:#b53a04}footer{width:980px;background:#201a11;height:36px;color:#888;font-size:1.2em;margin:80px auto 0}footer nav li{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;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;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;padding-left:8px;line-height:36px;margin:0}article{width:980px;margin:0 auto}article ul{font-size:1.5em}ul#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:110%}ul#breadcrumbs li{display:inline}.hide{display:none}img.postpic,img.postpicright{display:block;margin:.3em .6em;border:#201a11 10px solid;clear:both}img.postpic{float:left;margin-left:0;margin-top:.3em}img.postpicright{float:right;margin-right:0}img.postpicleft{float:left;margin:5px}img.picfull{border:#201a11 10px solid;margin-top:20px}img.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.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}p.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:.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}span.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}#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}#writing-archive div{width:420px;float:left}#writing-archive div.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:.7em}#writing-archive img{border:#201a11 10px solid}body#writing-detail article{font-size:1.7em;line-height:1.5em}body#writing-detail article header{border:none;height:auto;width:auto;margin:0 0 0 0}body#writing-detail article h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.8em;line-height:1.2em;margin:0}body#writing-detail article aside{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:0.7em;line-height:2.3em}body#writing-detail article aside a{color:#201a11}body#writing-detail article aside a:hover{color:#b53a04}body#writing-detail article dl{font-size:100%}body#writing-detail article dl dt{font-style:italic;margin:9px}body#writing-detail article a{color:#b53a04}body#writing-detail article 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}.single article header,.single article div#post-body{margin-left:200px !important;width:560px !important}.single article header p:nth-of-type(1),.single article div#post-body p:nth-of-type(1){font-size:1.2em;line-height:1.4em}.double article header{float:left;width:180px !important;text-align:right !important;margin-top:20px !important}.double article header aside section{text-align:right !important;font-size:1em;line-height:18px}.double article div#post-body{width:780px;float:left;margin-left:20px}.double article div#post-body div.col{width:350px;float:left;margin:0 40px 0 0}.double article div#post-body img.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.double article div#post-body div.narrow{width:520px}span.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}span.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}blockquote{font-size:.8em}ol.footnote{font-size:12px;margin:18px 0}ol.footnote li{margin:12px 0;line-height:.8em}ol.footnote li p{line-height:18px !important;font-size:12px !important}ol.footnote li a,ol.footnote li span{font-size:12px}section#post-metadata{width:560px;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;margin:24px 0 24px 200px;font-size:0.8em;padding-bottom:8px}section#page-navigation{width:980px;margin:24px 0 0 0;text-transform:uppercase;font-size:.5em}section#page-navigation li#next{float:right;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-right:140px}section#page-navigation li#prev{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-left:120px}section#comments{clear:both;width:520px;margin:24px 0 24px 200px;font-size:.8em}section#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}#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}body.dubcol footer nav li{font-size:0.6em}h4.notes{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-weight:bold;text-transform:uppercase}dl.addendum dt{font-style:italic;margin:0.8em 0 0 0;margin-left:-30px !important;text-indent:-30px;padding-left:30px}dl.addendum dd{margin:0.8em 0 0 0}ul#dsq-comments{font-size:1.2em}.dsq-comment-cite{font-family:Helvetica, Verdana, sans-serif;font-size:.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:.8em}#dsq-comments-title{display:none !important}#photo-archive article{width:980px}#photo-archive article h1{display:none}ul#photo-galleries{margin-left:-10px}ul#photo-galleries li{float:left;margin:10px;width:310px;position:relative;display:block}ul#photo-galleries div.figure{border:10px #201a11 solid;height:350px}ul#photo-galleries div.figure img{border:none}ul#photo-galleries span.legend{display:block;color:#888;padding:10px 10px 10px 15px;font-size:85%;line-height:18px;width:285px;background:#201a11;-khtml-opacity:0.9;opacity:0.9;position:absolute;bottom:0;left:0}ul#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase}ul#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;text-transform:uppercase;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}body#about section{clear:both;margin-top:24px}body#about section ul{font-size:1em;margin:18px}body#about section li{margin:9px}body#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:.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}div.top{margin:36px 0 36px 0;clear:both;width:940px}div.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}div.break{border-bottom:#e3e3e3 1px solid;width:980px;height:2px;padding-top:36px;clear:both;margin:0}ul.project-tease{margin-top:65px}ul.project-tease li{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:18px;line-height:16px;margin-top:36px;clear:both}ul.project-tease li .tease{float:left}ul.project-tease li .tease h4{font-size:24px;line-height:24px;margin:0;width:380px}ul.project-tease li .lede{clear:both;margin:0;padding-top:12px;width:380px}ul.project-tease li .lede p{font-family:Hoefler Text,Georgia,Times New Roman,Times,serif;font-size:.9em !important;line-height:23px}ul.project-tease li span.proj{font-size:64px;line-height:50px;float:left;margin:2px 2px 0 0}ul.project-tease li span.proj span{font-size:36px}ul.project-tease li dt a{display:block;width:175px;float:left}ul.project-tease li div.img{float:right;width:540px;margin-bottom:72px}ul.project-tease li div.img img{border:#201a11 10px solid}.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:.9em;line-height:25px;margin:4px 0;font-family:Helvetica, Verdana, sans-serif}.more-container dl dt{clear:left;float:left;width:65px;font-weight:bold;line-height:25px;font-size:.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}ul#parks{margin-top:36px}ul#parks li{width:980px;position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}ul#parks div.figure img{border:none}ul#parks h4{display:block;color:#888;padding:10px 10px 10px 15px;background:#201a11;-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}ul#parks div.legend{display:block;padding:10px 10px 10px 15px;background:#201a11;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:0;height:45px;width:980px;font-size:10px;line-height:16px}ul#parks div.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}ul#parks div.legend p{margin:6px 0 10px 0}ul#parks div.legend ul.buttons{padding-top:6px;float:right;margin-right:20px}ul#parks div.legend ul.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}ul#parks div.legend ul.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}ul#parks div.legend ul.buttons li a:hover{background:#b53a04}ul#parks div.map{width:280px;margin-top:42px;height:130px;float:left;margin-left:6px}ul#parks div.map a{display:none}ul#parks div.map div div span{display:none}ul#parks div.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}body#projects h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal}body#projects article p{font-size:1.4em}#featured-image img{margin-left:20px;margin-bottom:78px}section#writing-tease,section#currently{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-transform:uppercase;font-size:.8em;clear:both;width:980px;padding-top:20px;border-top:#b9b9b9 1px dotted}section#currently{padding:0;margin-bottom:0px;margin-top:36px;border-top:#201a11 1px solid}section#currently div.project-tease{font-size:18px;line-height:16px;margin-top:8px}section#currently div.project-tease h4{font-size:64px;line-height:50px;float:left;margin:0}section#currently div.project-tease h4 span{font-size:36px}section#currently div.project-tease a{display:block;width:220px;float:left}section#currently div.project-tease p{font-size:.7em;text-transform:none;line-height:50px;margin-left:440px;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif}section#currently div.project-tease p cite{padding-left:4px}section#fromthearc{clear:both}section#fromthearc li{float:left;width:300px;margin-bottom:20px}section#fromthearc h2{font-size:1.1em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:2em;margin:0}section#fromthearc .col2{margin-left:40px;margin-right:40px}section#fromthearc h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.2em;margin-bottom:12px;min-height:50px}section#fromthearc .location,section#fromthearc time{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;line-height:2em;font-size:.7em}section#fromthearc p{margin:0;text-align:justify}
+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}body{background:white;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif;font-size:62.5%;line-height:23px;color:#201a11;text-align:center}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{width:980px;margin:0 auto 40px}header{border-bottom:#201a11 2px solid;height:160px}header h1 a{background:url('../img/logo.gif') no-repeat left bottom;height:158px;width:400px;float:left;text-indent:-1000px}header h2{float:left;text-indent:-1000px;display:none}header nav{float:left;margin-top:110px;margin-left:40px}header nav li{display:inline;font-size:1.1em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:1.2em;margin-left:4px}header nav a:hover{color:#b53a04}footer{width:980px;background:#201a11;height:36px;color:#888;font-size:1.2em;margin:80px auto 0}footer nav li{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;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;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;padding-left:8px;line-height:36px;margin:0}article{width:980px;margin:0 auto}article ul{font-size:1.5em}ul#breadcrumbs{font-weight:normal;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:110%}ul#breadcrumbs li{display:inline}.hide{display:none}img.postpic,img.postpicright{display:block;margin:.3em .6em;border:#201a11 10px solid;clear:both}img.postpic{float:left;margin-left:0;margin-top:.3em}img.postpicright{float:right;margin-right:0}img.postpicleft{float:left;margin:5px}img.picfull{border:#201a11 10px solid;margin-top:20px}img.post-image{margin:0 10px 0 0;float:left;border:#201a11 10px solid !important}.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}p.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:.7em;line-height:0;padding:3px 0 3px 3px}sup a{line-height:0}span.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}#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 div.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:.7em}#writing-archive img{border:#201a11 10px solid}body#writing-detail article{font-size:1.7em;line-height:1.5em}body#writing-detail article header{border:none;height:auto;width:auto;margin:0 0 0 0}body#writing-detail article h1{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.8em;line-height:1.2em;margin:0}body#writing-detail article aside{font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:0.7em;line-height:2.3em}body#writing-detail article aside a{color:#201a11}body#writing-detail article aside a:hover{color:#b53a04}body#writing-detail article dl{font-size:100%}body#writing-detail article dl dt{font-style:italic;margin:9px}body#writing-detail article a{color:#b53a04}body#writing-detail article 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}.single article header,.single article div#post-body{margin-left:200px !important;width:560px !important}.single article header p:nth-of-type(1),.single article div#post-body p:nth-of-type(1){font-size:1.2em;line-height:1.4em}.double article header{float:left;width:180px !important;text-align:right !important;margin-top:20px !important}.double article header aside section{text-align:right !important;font-size:1em;line-height:18px}.double article div#post-body{width:780px;float:left;margin-left:20px}.double article div#post-body div.col{width:350px;float:left;margin:0 40px 0 0}.double article div#post-body img.picwide{clear:both;margin:30px 0 30px -200px;border:#201a11 10px solid}.double article div#post-body div.narrow{width:520px}span.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}span.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}blockquote{font-size:.8em}ol.footnote{font-size:12px;margin:18px 0}ol.footnote li{margin:12px 0;line-height:.8em}ol.footnote li p{line-height:18px !important;font-size:12px !important}ol.footnote li a,ol.footnote li span{font-size:12px}section#post-metadata{width:560px;border-top:#201a11 1px dotted;border-bottom:#201a11 1px dotted;margin:24px 0 24px 200px;font-size:0.8em;padding-bottom:8px}section#page-navigation{width:980px;margin:24px 0 0 0;text-transform:uppercase;font-size:.5em}section#page-navigation li#next{float:right;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-right:140px}section#page-navigation li#prev{float:left;font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;margin-left:120px}section#comments{clear:both;width:520px;margin:24px 0 24px 200px;font-size:.8em}section#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}#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}body.dubcol footer nav li{font-size:0.6em}h4.notes{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-weight:bold;text-transform:uppercase}dl.addendum dt{font-style:italic;margin:0.8em 0 0 0;margin-left:-30px !important;text-indent:-30px;padding-left:30px}dl.addendum dd{margin:0.8em 0 0 0}ul#dsq-comments{font-size:1.2em}.dsq-comment-cite{font-family:Helvetica, Verdana, sans-serif;font-size:.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:.8em}#dsq-comments-title{display:none !important}#photo-archive article{width:980px}#photo-archive article h1{display:none}ul#photo-galleries{margin-left:-10px}ul#photo-galleries li{float:left;margin:10px;width:310px;position:relative;display:block}ul#photo-galleries div.figure{border:10px #201a11 solid;height:350px}ul#photo-galleries div.figure img{border:none}ul#photo-galleries span.legend{display:block;color:#888;padding:10px 10px 10px 15px;font-size:85%;line-height:18px;width:285px;background:#201a11;-khtml-opacity:0.9;opacity:0.9;position:absolute;bottom:0;left:0}ul#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.8em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase}ul#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;text-transform:uppercase;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}body#about section{clear:both;margin-top:24px}body#about section ul{font-size:1em;margin:18px}body#about section li{margin:9px}body#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:.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}div.top{margin:36px 0 36px 0;clear:both;width:940px}div.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}div.break{border-bottom:#e3e3e3 1px solid;width:980px;height:2px;padding-top:36px;clear:both;margin:0}ul.project-tease{margin-top:65px}ul.project-tease li{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;font-size:18px;line-height:16px;margin-top:36px;clear:both}ul.project-tease li .tease{float:left}ul.project-tease li .tease h4{font-size:24px;line-height:24px;margin:0;width:380px}ul.project-tease li .lede{clear:both;margin:0;padding-top:12px;width:380px}ul.project-tease li .lede p{font-family:Hoefler Text,Georgia,Times New Roman,Times,serif;font-size:.9em !important;line-height:23px;text-align:justify}ul.project-tease li span.proj{font-size:64px;line-height:50px;float:left;margin:2px 2px 0 0}ul.project-tease li span.proj span{font-size:36px}ul.project-tease li dt a{display:block;width:175px;float:left}ul.project-tease li div.img{float:right;width:540px;margin-bottom:72px}ul.project-tease li div.img img{border:#201a11 10px solid}.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:.9em;line-height:25px;margin:4px 0;font-family:Helvetica, Verdana, sans-serif}.more-container dl dt{clear:left;float:left;width:65px;font-weight:bold;line-height:25px;font-size:.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}ul#parks{margin-top:36px}ul#parks li{width:980px;position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}ul#parks div.figure img{border:none}ul#parks h4{display:block;color:#888;padding:10px 10px 10px 15px;background:#201a11;-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}ul#parks div.legend{display:block;padding:10px 10px 10px 15px;background:#201a11;-khtml-opacity:0.85;opacity:0.85;position:absolute;bottom:0;height:45px;width:980px;font-size:10px;line-height:16px}ul#parks div.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}ul#parks div.legend p{margin:6px 0 10px 0}ul#parks div.legend ul.buttons{padding-top:6px;float:right;margin-right:20px}ul#parks div.legend ul.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}ul#parks div.legend ul.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}ul#parks div.legend ul.buttons li a:hover{background:#b53a04}ul#parks div.map{width:280px;margin-top:42px;height:130px;float:left;margin-left:6px}ul#parks div.map a{display:none}ul#parks div.map div div span{display:none}ul#parks div.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}body#projects h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal}body#projects article p{font-size:1.4em}#featured-image img{margin-left:20px;margin-bottom:78px}p.hyphenate{text-align:justify}section#writing-tease,section#currently{font-family:Helvetica, Verdana, sans-serif;font-size:1em;font-weight:normal;text-transform:uppercase;font-size:.8em;clear:both;width:980px;padding-top:20px;border-top:#b9b9b9 1px dotted}section#currently{padding:0;margin-bottom:0px;margin-top:36px;border-top:#201a11 1px solid}section#currently div.project-tease{font-size:18px;line-height:16px;margin-top:8px}section#currently div.project-tease h4{font-size:64px;line-height:50px;float:left;margin:0}section#currently div.project-tease h4 span{font-size:36px}section#currently div.project-tease a{display:block;width:220px;float:left}section#currently div.project-tease p{font-size:.7em;text-transform:none;line-height:50px;margin-left:440px;font-family:Hoefler Text, Georgia, Times New Roman, Times, serif}section#currently div.project-tease p cite{padding-left:4px}span.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}span.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}span.button a:hover{background:#b53a04;color:#fff}section#writing-tease h2{margin:24px 0 24px 0}section#fromthearc{clear:both}section#fromthearc li{float:left;width:300px;margin-bottom:20px}section#fromthearc h2{font-size:1.1em;letter-spacing:1px;line-height:1.2em;text-transform:uppercase;font-size:2em;margin:0}section#fromthearc .col2{margin-left:40px;margin-right:40px}section#fromthearc h3{font-family:Helvetica, Verdana, sans-serif;font-size:2em;line-height:1.5em;font-weight:normal;font-size:1.2em;margin:0}section#fromthearc p{margin:0}section#fromthearc p.hyphenate{margin-top:3px;text-align:justify}section#fromthearc img{margin-top:4px}section#fromthearc .location,section#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:.7em;text-align:left}
diff --git a/media/img/map.gif b/media/img/map.gif
deleted file mode 100644
index a89c9de..0000000
--- a/media/img/map.gif
+++ /dev/null
Binary files differ
diff --git a/media/js/hyphenate.js b/media/js/hyphenate.js
new file mode 100644
index 0000000..813cd44
--- /dev/null
+++ b/media/js/hyphenate.js
@@ -0,0 +1,21 @@
+/*!
+ * Hyphenator 2.5.0 - client side hyphenation for webbrowsers
+ * Copyright (C) 2010 Mathias Nater, Zürich (mathias at mnn dot ch)
+ * Project and Source hosted on http://code.google.com/p/hyphenator/
+ *
+ * This JavaScript code is free software: you can redistribute
+ * it and/or modify it under the terms of the GNU Lesser
+ * General Public License (GNU LGPL) as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option)
+ * any later version. The code is distributed WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
+ *
+ * As additional permission under GNU GPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ */
+
+var Hyphenator=(function(){var languageHint='cs, da, bn, de, en, es, fi, fr, gu, hi, hu, hy, it, kn, lt, ml, nl, or, pa, pl, pt, ru, sv, ta, te, tr, uk',supportedLang=(function(){var k,i=0,a=languageHint.split(', '),r={};while(!!(k=a[i++])){r[k]=true;}return r;}()),prompterStrings={'cs':'Jazyk této internetové stránky nebyl automaticky rozpoznán. Určete prosím její jazyk:','da':'Denne websides sprog kunne ikke bestemmes. Angiv venligst sprog:','de':'Die Sprache dieser Webseite konnte nicht automatisch bestimmt werden. Bitte Sprache angeben:','en':'The language of this website could not be determined automatically. Please indicate the main language:','es':'El idioma del sitio no pudo determinarse autom%E1ticamente. Por favor, indique el idioma principal:','fi':'Sivun kielt%E4 ei tunnistettu automaattisesti. M%E4%E4rit%E4 sivun p%E4%E4kieli:','fr':'La langue de ce site n%u2019a pas pu %EAtre d%E9termin%E9e automatiquement. Veuillez indiquer une langue, s.v.p.%A0:','hu':'A weboldal nyelvét nem sikerült automatikusan megállapítani. Kérem adja meg a nyelvet:','hy':'Չհաջողվեց հայտնաբերել այս կայքի լեզուն։ Խնդրում ենք նշեք հիմնական լեզուն՝','it':'Lingua del sito sconosciuta. Indicare una lingua, per favore:','lt':'Nepavyko automatiškai nustatyti šios svetainės kalbos. Prašome įvesti kalbą:','ml':'ഈ വെ%u0D2C%u0D4D%u200Cസൈറ്റിന്റെ ഭാഷ കണ്ടുപിടിയ്ക്കാ%u0D28%u0D4D%u200D കഴിഞ്ഞില്ല. ഭാഷ ഏതാണെന്നു തിരഞ്ഞെടുക്കുക:','nl':'De taal van deze website kan niet automatisch worden bepaald. Geef de hoofdtaal op:','pt':'A língua deste site não pôde ser determinada automaticamente. Por favor indique a língua principal:','ru':'Язык этого сайта не может быть определен автоматически. Пожалуйста укажите язык:','sv':'Spr%E5ket p%E5 den h%E4r webbplatsen kunde inte avg%F6ras automatiskt. V%E4nligen ange:','tr':'Bu web sitesinin dilini otomatik olarak tespit edilememiştir. Lütfen ana dili gösterir:','uk':'Мова цього веб-сайту не може бути визначена автоматично. Будь ласка, вкажіть головну мову:'},basePath=(function(){var s=document.getElementsByTagName('script'),i=0,p,src,t;while(!!(t=s[i++])){if(!t.src){continue;}src=t.src;p=src.indexOf('Hyphenator.js');if(p!==-1){return src.substring(0,p);}}return'http://hyphenator.googlecode.com/svn/trunk/';}()),isLocal=(function(){var re=false;if(window.location.href.indexOf(basePath)!==-1){re=true;}return re;}()),documentLoaded=false,dontHyphenate={'script':true,'code':true,'pre':true,'img':true,'br':true,'samp':true,'kbd':true,'var':true,'abbr':true,'acronym':true,'sub':true,'sup':true,'button':true,'option':true,'label':true,'textarea':true},enableCache=true,enableReducedPatternSet=false,enableRemoteLoading=true,displayToggleBox=false,hyphenateClass='hyphenate',dontHyphenateClass='donthyphenate',min=6,isBookmarklet=(function(){var loc=null,re=false,jsArray=document.getElementsByTagName('script'),i,l;for(i=0,l=jsArray.length;i<l;i++){if(!!jsArray[i].getAttribute('src')){loc=jsArray[i].getAttribute('src');}if(!loc){continue;}else if(loc.indexOf('Hyphenator.js?bm=true')!==-1){re=true;}}return re;}()),mainLanguage=null,elements=[],exceptions={},docLanguages={},state=0,url='(\\w*:\/\/)?((\\w*:)?(\\w*)@)?((([\\d]{1,3}\\.){3}([\\d]{1,3}))|((www\\.|[a-zA-Z]\\.)?[a-zA-Z0-9\\-\\.]+\\.([a-z]{2,4})))(:\\d*)?(\/[\\w#!:\\.?\\+=&%@!\\-]*)*',mail='[\\w-\\.]+@[\\w\\.]+',urlOrMailRE=new RegExp('('+url+')|('+mail+')','i'),zeroWidthSpace=(function(){var zws,ua=navigator.userAgent.toLowerCase();zws=String.fromCharCode(8203);if(ua.indexOf('msie 6')!==-1){zws='';}if(ua.indexOf('opera')!==-1&&ua.indexOf('version/10.00')!==-1){zws='';}return zws;}()),createElem=function(tagname){if(document.createElementNS){return document.createElementNS('http://www.w3.org/1999/xhtml',tagname);}else if(document.createElement){return document.createElement(tagname);}},onHyphenationDone=function(){},onError=function(e){window.alert("Hyphenator.js says:\n\nAn Error ocurred:\n"+e.message);},selectorFunction=function(){var tmp,el=[],i,l;if(document.getElementsByClassName){el=document.getElementsByClassName(hyphenateClass);}else{tmp=document.getElementsByTagName('*');l=tmp.length;for(i=0;i<l;i++){if(tmp[i].className.indexOf(hyphenateClass)!==-1&&tmp[i].className.indexOf(dontHyphenateClass)===-1){el.push(tmp[i]);}}}return el;},intermediateState='hidden',hyphen=String.fromCharCode(173),urlhyphen=zeroWidthSpace,Expando=(function(){var container={},name="HyphenatorExpando_"+Math.random(),uuid=0;return{getDataForElem:function(elem){return container[elem[name]];},setDataForElem:function(elem,data){var id;if(elem[name]&&elem[name]!==''){id=elem[name];}else{id=uuid++;elem[name]=id;}container[id]=data;},appendDataForElem:function(elem,data){var k;for(k in data){if(data.hasOwnProperty(k)){container[elem[name]][k]=data[k];}}},delDataOfElem:function(elem){delete container[elem[name]];}};}()),runOnContentLoaded=function(w,f){var DOMContentLoaded,toplevel;if(documentLoaded){f();return;}function init(){if(!documentLoaded){documentLoaded=true;f();}}function doScrollCheck(){try{document.documentElement.doScroll("left");}catch(error){setTimeout(doScrollCheck,1);return;}init();}if(document.addEventListener){DOMContentLoaded=function(){document.removeEventListener("DOMContentLoaded",DOMContentLoaded,false);init();};}else if(document.attachEvent){DOMContentLoaded=function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",DOMContentLoaded);init();}};}if(document.addEventListener){document.addEventListener("DOMContentLoaded",DOMContentLoaded,false);window.addEventListener("load",init,false);}else if(document.attachEvent){document.attachEvent("onreadystatechange",DOMContentLoaded);window.attachEvent("onload",init);toplevel=false;try{toplevel=window.frameElement===null;}catch(e){}if(document.documentElement.doScroll&&toplevel){doScrollCheck();}}},getLang=function(el,fallback){if(!!el.getAttribute('lang')){return el.getAttribute('lang').substring(0,2).toLowerCase();}try{if(!!el.getAttribute('xml:lang')){return el.getAttribute('xml:lang').substring(0,2).toLowerCase();}}catch(ex){}if(el.tagName!=='HTML'){return getLang(el.parentNode,true);}if(fallback){return mainLanguage;}return null;},autoSetMainLanguage=function(){var el=document.getElementsByTagName('html')[0],m=document.getElementsByTagName('meta'),i,text,lang,e,ul;mainLanguage=getLang(el);if(!mainLanguage){for(i=0;i<m.length;i++){if(!!m[i].getAttribute('http-equiv')&&(m[i].getAttribute('http-equiv')==='content-language')){mainLanguage=m[i].getAttribute('content').substring(0,2).toLowerCase();}if(!!m[i].getAttribute('name')&&(m[i].getAttribute('name')==='DC.language')){mainLanguage=m[i].getAttribute('content').substring(0,2).toLowerCase();}if(!!m[i].getAttribute('name')&&(m[i].getAttribute('name')==='language')){mainLanguage=m[i].getAttribute('content').substring(0,2).toLowerCase();}}}if(!mainLanguage){text='';ul=navigator.language?navigator.language:navigator.userLanguage;ul=ul.substring(0,2);if(prompterStrings.hasOwnProperty(ul)){text=prompterStrings[ul];}else{text=prompterStrings.en;}text+=' (ISO 639-1)\n\n'+languageHint;lang=window.prompt(unescape(text),ul).toLowerCase();if(supportedLang[lang]){mainLanguage=lang;}else{e=new Error('The language "'+lang+'" is not yet supported.');throw e;}}},gatherDocumentInfos=function(){var elToProcess,tmp,i=0,process=function(el,hide,lang){var n,i=0,hyphenatorSettings={};if(hide&&intermediateState==='hidden'){if(!!el.getAttribute('style')){hyphenatorSettings.hasOwnStyle=true;}else{hyphenatorSettings.hasOwnStyle=false;}hyphenatorSettings.isHidden=true;el.style.visibility='hidden';}if(el.lang&&typeof(el.lang)==='string'){hyphenatorSettings.language=el.lang.toLowerCase();}else if(lang){hyphenatorSettings.language=lang.toLowerCase();}else{hyphenatorSettings.language=getLang(el,true);}lang=hyphenatorSettings.language;if(supportedLang[lang]){docLanguages[lang]=true;}else{if(!Hyphenator.isBookmarklet()){onError(new Error('Language '+lang+' is not yet supported.'));}}Expando.setDataForElem(el,hyphenatorSettings);elements.push(el);while(!!(n=el.childNodes[i++])){if(n.nodeType===1&&!dontHyphenate[n.nodeName.toLowerCase()]&&n.className.indexOf(dontHyphenateClass)===-1&&!(n in elToProcess)){process(n,false,lang);}}};if(Hyphenator.isBookmarklet()){elToProcess=document.getElementsByTagName('body')[0];process(elToProcess,false,mainLanguage);}else{elToProcess=selectorFunction();while(!!(tmp=elToProcess[i++])){process(tmp,true);}}if(!Hyphenator.languages.hasOwnProperty(mainLanguage)){docLanguages[mainLanguage]=true;}else if(!Hyphenator.languages[mainLanguage].prepared){docLanguages[mainLanguage]=true;}if(elements.length>0){Expando.appendDataForElem(elements[elements.length-1],{isLast:true});}},convertPatterns=function(lang){var plen,anfang,pats,pat,key,tmp={};pats=Hyphenator.languages[lang].patterns;for(plen in pats){if(pats.hasOwnProperty(plen)){plen=parseInt(plen,10);anfang=0;while(!!(pat=pats[plen].substr(anfang,plen))){key=pat.replace(/\d/g,'');tmp[key]=pat;anfang+=plen;}}}Hyphenator.languages[lang].patterns=tmp;Hyphenator.languages[lang].patternsConverted=true;},convertExceptionsToObject=function(exc){var w=exc.split(', '),r={},i,l,key;for(i=0,l=w.length;i<l;i++){key=w[i].replace(/-/g,'');if(!r.hasOwnProperty(key)){r[key]=w[i];}}return r;},loadPatterns=function(lang){var url,xhr,head,script;if(supportedLang[lang]&&!Hyphenator.languages[lang]){url=basePath+'patterns/'+lang+'.js';}else{return;}if(isLocal&&!isBookmarklet){xhr=null;if(typeof XMLHttpRequest!=='undefined'){xhr=new XMLHttpRequest();}if(!xhr){try{xhr=new ActiveXObject("Msxml2.XMLHTTP");}catch(e){xhr=null;}}if(xhr){xhr.open('HEAD',url,false);xhr.setRequestHeader('Cache-Control','no-cache');xhr.send(null);if(xhr.status===404){onError(new Error('Could not load\n'+url));delete docLanguages[lang];return;}}}if(createElem){head=document.getElementsByTagName('head').item(0);script=createElem('script');script.src=url;script.type='text/javascript';head.appendChild(script);}},prepareLanguagesObj=function(lang){var lo=Hyphenator.languages[lang],wrd;if(!lo.prepared){if(enableCache){lo.cache={};}if(enableReducedPatternSet){lo.redPatSet={};}if(lo.hasOwnProperty('exceptions')){Hyphenator.addExceptions(lang,lo.exceptions);delete lo.exceptions;}if(exceptions.hasOwnProperty('global')){if(exceptions.hasOwnProperty(lang)){exceptions[lang]+=', '+exceptions.global;}else{exceptions[lang]=exceptions.global;}}if(exceptions.hasOwnProperty(lang)){lo.exceptions=convertExceptionsToObject(exceptions[lang]);delete exceptions[lang];}else{lo.exceptions={};}convertPatterns(lang);wrd='[\\w'+lo.specialChars+'@'+String.fromCharCode(173)+'-]{'+min+',}';lo.genRegExp=new RegExp('('+url+')|('+mail+')|('+wrd+')','gi');lo.prepared=true;}},prepare=function(callback){var lang,docLangEmpty=true,interval;if(!enableRemoteLoading){for(lang in Hyphenator.languages){if(Hyphenator.languages.hasOwnProperty(lang)){prepareLanguagesObj(lang);}}state=2;callback();return;}state=1;for(lang in docLanguages){if(docLanguages.hasOwnProperty(lang)){loadPatterns(lang);docLangEmpty=false;}}if(docLangEmpty){state=2;callback();return;}interval=window.setInterval(function(){var finishedLoading=false,lang;for(lang in docLanguages){if(docLanguages.hasOwnProperty(lang)){if(!Hyphenator.languages[lang]){finishedLoading=false;break;}else{finishedLoading=true;delete docLanguages[lang];prepareLanguagesObj(lang);}}}if(finishedLoading){window.clearInterval(interval);state=2;callback();}},100);},toggleBox=function(s){var myBox,bdy,myIdAttribute,myTextNode,myClassAttribute;if(!!(myBox=document.getElementById('HyphenatorToggleBox'))){if(s){myBox.firstChild.data='Hy-phe-na-ti-on';}else{myBox.firstChild.data='Hyphenation';}}else{bdy=document.getElementsByTagName('body')[0];myBox=createElem('div');myIdAttribute=document.createAttribute('id');myIdAttribute.nodeValue='HyphenatorToggleBox';myClassAttribute=document.createAttribute('class');myClassAttribute.nodeValue=dontHyphenateClass;myTextNode=document.createTextNode('Hy-phe-na-ti-on');myBox.appendChild(myTextNode);myBox.setAttributeNode(myIdAttribute);myBox.setAttributeNode(myClassAttribute);myBox.onclick=Hyphenator.toggleHyphenation;myBox.style.position='absolute';myBox.style.top='0px';myBox.style.right='0px';myBox.style.margin='0';myBox.style.backgroundColor='#AAAAAA';myBox.style.color='#FFFFFF';myBox.style.font='6pt Arial';myBox.style.letterSpacing='0.2em';myBox.style.padding='3px';myBox.style.cursor='pointer';myBox.style.WebkitBorderBottomLeftRadius='4px';myBox.style.MozBorderRadiusBottomleft='4px';bdy.appendChild(myBox);}},hyphenateWord=function(lang,word){var lo=Hyphenator.languages[lang],parts,i,l,w,wl,s,hypos,p,maxwins,win,pat=false,patk,patl,c,digits,z,numb3rs,n,inserted,hyphenatedword;if(word===''){return'';}if(word.indexOf(hyphen)!==-1){return word;}if(enableCache&&lo.cache.hasOwnProperty(word)){return lo.cache[word];}if(lo.exceptions.hasOwnProperty(word)){return lo.exceptions[word].replace(/-/g,hyphen);}if(word.indexOf('-')!==-1){parts=word.split('-');for(i=0,l=parts.length;i<l;i++){parts[i]=hyphenateWord(lang,parts[i]);}return parts.join('-');}w='_'+word+'_';wl=w.length;s=w.split('');w=w.toLowerCase();hypos=[];numb3rs={'0':true,'1':true,'2':true,'3':true,'4':true,'5':true,'6':true,'7':true,'8':true,'9':true};n=wl-lo.shortestPattern;for(p=0;p<=n;p++){maxwins=Math.min((wl-p),lo.longestPattern);for(win=lo.shortestPattern;win<=maxwins;win++){if(lo.patterns.hasOwnProperty(patk=w.substr(p,win))){pat=lo.patterns[patk];}else{continue;}if(enableReducedPatternSet){lo.redPatSet[patk]=pat;}digits=1;patl=pat.length;for(i=0;i<patl;i++){c=pat.charAt(i);if(numb3rs[c]){if(i===0){z=p-1;if(!hypos[z]||hypos[z]<c){hypos[z]=c;}}else{z=p+i-digits;if(!hypos[z]||hypos[z]<c){hypos[z]=c;}}digits++;}}}}inserted=0;for(i=lo.leftmin;i<=(word.length-lo.rightmin);i++){if(!!(hypos[i]&1)){s.splice(i+inserted+1,0,hyphen);inserted++;}}hyphenatedword=s.slice(1,-1).join('');if(enableCache){lo.cache[word]=hyphenatedword;}return hyphenatedword;},hyphenateURL=function(url){return url.replace(/([:\/\.\?#&_,;!@]+)/gi,'$&'+urlhyphen);},hyphenateElement=function(el){var hyphenatorSettings=Expando.getDataForElem(el),lang=hyphenatorSettings.language,hyphenate,n,i;if(Hyphenator.languages.hasOwnProperty(lang)){hyphenate=function(word){if(urlOrMailRE.test(word)){return hyphenateURL(word);}else{return hyphenateWord(lang,word);}};i=0;while(!!(n=el.childNodes[i++])){if(n.nodeType===3&&n.data.length>=min){n.data=n.data.replace(Hyphenator.languages[lang].genRegExp,hyphenate);}}}if(hyphenatorSettings.isHidden&&intermediateState==='hidden'){el.style.visibility='visible';if(!hyphenatorSettings.hasOwnStyle){el.setAttribute('style','');el.removeAttribute('style');}else{if(el.style.removeProperty){el.style.removeProperty('visibility');}else if(el.style.removeAttribute){el.style.removeAttribute('visibility');}}}if(hyphenatorSettings.isLast){state=3;onHyphenationDone();}},removeHyphenationFromElement=function(el){var h,i=0,n;switch(hyphen){case'|':h='\\|';break;case'+':h='\\+';break;case'*':h='\\*';break;default:h=hyphen;}while(!!(n=el.childNodes[i++])){if(n.nodeType===3){n.data=n.data.replace(new RegExp(h,'g'),'');n.data=n.data.replace(new RegExp(zeroWidthSpace,'g'),'');}else if(n.nodeType===1){removeHyphenationFromElement(n);}}},hyphenateDocument=function(){function bind(fun,arg){return function(){return fun(arg);};}var i=0,el;while(!!(el=elements[i++])){window.setTimeout(bind(hyphenateElement,el),0);}},removeHyphenationFromDocument=function(){var i=0,el;while(!!(el=elements[i++])){removeHyphenationFromElement(el);}state=4;};return{version:'2.5.0',languages:{},config:function(obj){var assert=function(name,type){if(typeof obj[name]===type){return true;}else{onError(new Error('Config onError: '+name+' must be of type '+type));return false;}},key;for(key in obj){if(obj.hasOwnProperty(key)){switch(key){case'classname':if(assert('classname','string')){hyphenateClass=obj.classname;}break;case'donthyphenateclassname':if(assert('donthyphenateclassname','string')){dontHyphenateClass=obj.donthyphenateclassname;}break;case'minwordlength':if(assert('minwordlength','number')){min=obj.minwordlength;}break;case'hyphenchar':if(assert('hyphenchar','string')){if(obj.hyphenchar==='&shy;'){obj.hyphenchar=String.fromCharCode(173);}hyphen=obj.hyphenchar;}break;case'urlhyphenchar':if(obj.hasOwnProperty('urlhyphenchar')){if(assert('urlhyphenchar','string')){urlhyphen=obj.urlhyphenchar;}}break;case'togglebox':if(assert('togglebox','function')){toggleBox=obj.togglebox;}break;case'displaytogglebox':if(assert('displaytogglebox','boolean')){displayToggleBox=obj.displaytogglebox;}break;case'remoteloading':if(assert('remoteloading','boolean')){enableRemoteLoading=obj.remoteloading;}break;case'enablecache':if(assert('enablecache','boolean')){enableCache=obj.enablecache;}break;case'enablereducedpatternset':if(assert('enablereducedpatternset','boolean')){enableReducedPatternSet=obj.enablereducedpatternset;}break;case'onhyphenationdonecallback':if(assert('onhyphenationdonecallback','function')){onHyphenationDone=obj.onhyphenationdonecallback;}break;case'onerrorhandler':if(assert('onerrorhandler','function')){onError=obj.onerrorhandler;}break;case'intermediatestate':if(assert('intermediatestate','string')){intermediateState=obj.intermediatestate;}break;case'selectorfunction':if(assert('selectorfunction','function')){selectorFunction=obj.selectorfunction;}break;default:onError(new Error('Hyphenator.config: property '+key+' not known.'));}}}},run:function(){var process=function(){try{autoSetMainLanguage();gatherDocumentInfos();prepare(hyphenateDocument);if(displayToggleBox){toggleBox(true);}}catch(e){onError(e);}};if(!documentLoaded){runOnContentLoaded(window,process);}if(Hyphenator.isBookmarklet()||documentLoaded){process();}},addExceptions:function(lang,words){if(lang===''){lang='global';}if(exceptions.hasOwnProperty[lang]){exceptions[lang]+=", "+words;}else{exceptions[lang]=words;}},hyphenate:function(target,lang){var hyphenate,n,i;if(Hyphenator.languages.hasOwnProperty(lang)){if(!Hyphenator.languages[lang].prepared){prepareLanguagesObj(lang);}hyphenate=function(word){if(urlOrMailRE.test(word)){return hyphenateURL(word);}else{return hyphenateWord(lang,word);}};if(typeof target==='string'||target.constructor===String){return target.replace(Hyphenator.languages[lang].genRegExp,hyphenate);}else if(typeof target==='object'){i=0;while(!!(n=target.childNodes[i++])){if(n.nodeType===3&&n.data.length>=min){n.data=n.data.replace(Hyphenator.languages[lang].genRegExp,hyphenate);}else if(n.nodeType===1){if(n.lang!==''){lang=n.lang;}Hyphenator.hyphenate(n,lang);}}}}else{onError(new Error('Language "'+lang+'" is not loaded.'));}},getRedPatternSet:function(lang){return Hyphenator.languages[lang].redPatSet;},isBookmarklet:function(){return isBookmarklet;},toggleHyphenation:function(){switch(state){case 3:removeHyphenationFromDocument();toggleBox(false);break;case 4:hyphenateDocument();toggleBox(true);break;}}};}());if(Hyphenator.isBookmarklet()){Hyphenator.config({displaytogglebox:true,intermediatestate:'visible'});Hyphenator.run();}Hyphenator.languages.en={leftmin:2,rightmin:2,shortestPattern:2,longestPattern:8,specialChars:'',patterns:{3:'a2da2fai2a1ja2n4ao2bfb1jbk44bp2btb1v1cac3c2ch1cick1c5n1coc1q1cyd1bd5cd1jd1m1dod1p1dr1dud1vd1wd2ye1fei2e1je1q4eu1fa4fd4fh1fi4fm4fn1fo2ft3fu1fy1gag3bgd4gl2g1m1gog3p1grgs2g3w1gyh1bh1fh1h4hkh1w2id2igi3hi3j4ik2io2ip4iri1u2iv4iy5ja1jek1bk3fkh4k1ikk4k1lk1mk5tk1w2ld2lf4ljl1l2lm2lp4lt1ly1ma2mh4mkm1m1mo4mt1mu4mw1nan3fn1jn5mn1qn1rn1t4nz4oaoi2o5j2oko2noo2o1qou21papd44pf4pgpr2p3wqu2r1br1cr1frg2rh4r3jr1lr1mr1pr1wsa2s2hsk21sos1r2ss1su4svsw2s4y1ta4tc2tl1to1tu4tvtw41ty4tzu5j4uk2usu3u1vav4yw1bwi2w4kw5p4wtwy4x1ax1ex1hx3ix3ox3px1uxx4y1by1cy1dy1iy1wza14zb2ze5zl4zm1zo',4:'_ch4_ci2_eb4_eg2_es3_eu3_ga2_ge2_he2_in1_le2_me2_od2_os3_sh2_si2_st4_sy2_ta4_te4_th2_ti2_up3_ye44ab_abe24abr2adi4aduae4raff4ag1iag1na2goa4gya3haa3heah4la3hoa5ia2aleal1i4alm4amaa2mo4and2angano4a2pla3pu2a2rar1iar2par3q4as_as4la2ta4atha1tra2tua2tyau4bau3ra2vaav1iaw3iaws4aye4ays45ba_1batba4z2b1bb2be4b1d4be_1bel3betbe3w4b3hbi2bbi4d3bie1bilbi2tb2l2b4lo4b1m4b3n3bodbo4e3boobt4lb4tob3trbu4n4b5w5by_bys42ce_3cei1cen3cepcet4cew44ch_che23ciaci5c4cii2cim2cin5cizck3icly4coe22cogcoi4cov1cri22c1tc2tec4twcud5c4ufc4ui3cun1cuscze41d2a5da_4daf2dag3dat5dayd1d42de_d4em1dende1pd3eqdes2de1tde1v4dey4d1fd4gadg1id2gyd1h25di_3didd1ifd1in1diodir2dis1d5k22dly3do_5doed4ogd4or3dosdo4v3doxdre44dryds4pd4swd4syd2thdu2cdu4gdu4n4dup5dynead1ea4lea2tea2v2e1be3bre1ceec2ie1cre1cu4edi4edoee2cee2fee2me5ex1effeg5n5egye1h4e5icei5deig2e1lael2fel2iem5be1mee3my4enn4enoe5ofeo2ge3ole1oreos4e4ote5owe2pae1poer1a2erber1her1i2eroer1s4erues2c4eshe1sie1sp2esses4w4etnet5ze5une3upeus4e1vie5vue1wae3wh1exp5eyceys44fag5far4f5b4fe_fe4b2fedfer1fev44f1ff2fyfi3a2finf4l25fonfo2rfos54f5pfri22f3sf4tof2ty4fuggaf42gam4gaz2ge_2ged1gen1geoge4vg2geggo45gi_g1icgil45gio3girgi4u5giv3gizgla41gle3glog4mygn4ag1nig1no3go_gob55goegon25googov1g4rogth3gu4a2gue3gun3gusha4m5hazh4edhe2nhep5h1eshe4theu4hi4phi2vh2lo4h1m2h1nho4g4h5p4hr4h4shh4tyhu4ghu4thy2s2i1ai2aliam4i2anibe4i1bli5boi1br4ich2iciid5di2dii4dri2du2ie4i3et4if_i3fl4ift4igii2goi1lail5fil1i4ilnil3vim1ii2mu2in_4ind2ine2ini4ink4inl2inn2insin1u4iny4io_i1olio4mi4osipe4ip3ii1rair1i2is_4ise3isfi2sois1pi2su2ite2ithi1ti4itt4i5wix4oizi4ja4pjew3jo4p3ka_k3abk5agkal4k2ed1keeke4gk1erkes45ki_k4imki4pkis44klyko5rk3ouk4scks4lk4sy4lav2l1blce4l3cil2deldi4l3drle2ales23leyl5frl5galgo32l3h3likl1itl1izlka3l2lell2ill4o3lo_4lof4lovl4pll5pr4l1rl4scl2sel1tel1trltu2lu5aluf4lu3o4lup1lut2l1w4lya4lyb2mab2mah4map4m1b4m5c4me_2medme2gme2m1men2mesme4v4m1f5mi_mi3amig4m2ism2iz4m1l4m1nmn4amn4o4mokmo2rmos2mo2v4m1pm2pim2py4m3rm4shm5si3mummun24mupmu4unak4n2ann4asn2atn2aun1crn1cun1de2ne_ne2bne2c2ned1nen3neone2qn1er1nesne4vne4wn1gun2gynha4nhe4ni4dnik4n1imn1inni4on2it4nk2n1kl4n1lnme4nne43noe4nogno4n4nop1noun1p4npi4nru4ns4cn2sen2slns3mnt2int4snu1anu4dn4umn3uon1v2n1w4nym4nyp4n3zaoad3o1bio3bro1ceoch4o4elo3ero3evo2fio1geo4gl1ogyo1h2oig4o1laol2dol2iol2tol2vo2lyo2meon1aon1c2ondon3soo4ko2pa2opho1prop1uopy5o1rao1ryos2cos4lo2so4othou4lou5vow1io4wooy1ap4adp4aip4alpa1ppav43pay4p1b4pe_pe2cp4eepek4pe2t4ph_ph2l4phsph3t5phu1phypi3ap4idpi2n4p1m2p3npo4cpo4p1posp4ot4p1pp2pep2seps4h2p1tp2tep2thp4twpub3pue4puf4pu4mpu2n5puspu2t2rabr2air2asrbi2rb4or2cerd2i2re_re1oreu2rev2rfu4r4fyr1glr3gu4rh_ri3ar4ibri1or4iqr2isrle4r2mer4myrno4r3nur2ocro4erok2rox5r3por1r44rs2r1sars4cr2ser1shr1sir1spr5swr1tiru3aru2nrv4er3vory4cry3t5sais1apsau45saw4s5bsch2s1cu4s5d4se_se4ase2g5sei5sev5sex4s3f2s3g2sh_sho44shwsi1b1siosi2r1sis5siu1siv5siz4skes1l2s2le2s1ms3mas1n43soms4op4sov2spas1sas1sis4sls4snss2tss5w2st_st2ist4rs2tys4ulsu2msu2nsu2r4swo4syc3syl3ta_2tabta2ltav42taw2t1bt4ch4t1d4te_1teeteg41teote4p3teu3tex4tey2t1f4t1g2th_th2e4thl2ths1tiatif22tig1tim1tio5tiqti4u1tiv1tizt5lat5lo4t1mtme4to3b2toftos24t1p1trat4sctsh4t4swt5tottu4tu1atud24tue3tum3tus4two4tya2tyltz4e4uabuac4u1atuav4ub4eu3cau3cru3cuu4cyud5du4du3ufau3fl2ui2ui4nuiv3u1laul4eul2i4ulsu3luul5vu1mium2pu2neu1niunu4un5yun5zu5osu1ouu1peu3plup3pu1raurc4ur1dur2lu3ruusc2us1pu2suuts4uu4mu1v2uxu3uz4e5va_vag43vat4ve_4vedveg3v3ifvik42vilv1invi4p3viv5vo_voi43vok4vv42wacwam4w1erw3evwhi4wil2wir4wiz5w4no1wo2wom1wra4wri4w3shws4lxam3x4apxas5x3c2x2edxhi2xhu4xi5axi5cx4obx1t2x3tixu3ay5acy5aty2cey3chy5eey1eryes4ye4ty5gi4y3hy3lay3loy5luyme4yn5dyn5g5ynxy1o4yo5dyom4y4osyp3iy3poy5puy3royr4rys4cy4soyss4ys1tzar2ze4nze4pz1erzet42z1iz4ilz4iszo4mzte4z4zy',5:'_ach4_af1t_al3t_an5c_ang4_ant4_ar5s_as3c_as1p_as1s_au1d_av4i_awn4_ba4g_ber4_bri2_ca4t_co3e_co4r_de3o_do4t_du4c_eer4_el5d_en3g_en3s_eye5_fes3_gi5a_gi4b_go4r_hes3_het3_hi3b_hov5_id4l_im3m_ine2_in2k_in3s_ir5r_is4i_ju3r_la4m_len4_lep5_lev1_li4g_li2n_li3o_li4t_mis1_ni4c_odd5_or3c_or1d_or3t_oth3_out3_pi4e_pi2t_ra4c_ree2_res2_ri4g_ro4q_ru4d_se2n_til4_to4p_un1a_un1e_un5k_un5o_un3u_ure3_us5aa5bala5banabi5aab3ula4carac1er4a2cia3cieac1ina3cioac3ulac4uma3diaa3dioa3dita5diuad4lead3owad4sua3ducad5uma4gabaga4nage4o4ageu4ag4l3agogag5ula3ic_ai5lya4i4nain5oak1enal5abal3ada4lar4aldiali4ea4ly_4alys5alyt3alyzam5abam3agam3icam5ifam1ina5mona3naran1dla5neea3nena3neuan1glan3ioa3nipan3ita3niuan5otan2saan4snan2span4st4antoan2tran4twan3uaan3ula5nurapar4ap5at4aphiap3inapoc5aque5ar3alara3par4ata5rauaraw4ar4dra3reear4fiar4flar4imar3ioar2izar2mia3rooarre4ar4saar2shas4abashi4a3siba3sicask3ia4socas5phas4shas1trat5acat5apate5cat5evat4ho4ati_a5tiaat1icat3ifa4toga2toma4topa4tosat4skat5teat4that5uaat5ueat3ulaugh3au3guau4l2aun5dau1thav3aga5vanav3igav5oca1vor3awayaw4lyax4icax4iday5alazz5iba4gebal1aban4eban3ib3berbeak4beat34be2dbe3dabe3debe3dibe3gibe5gube1libe3lo4be5mbe5nu4bes4be3spbe5trbe3twbe5yobi5enbi4er2b3ifbin4dbi5oubi3trb5itzb4le_blen4b3lisbne5gbod3ibon4a5bor_bor5d5bore5bori5bos4b5otaboth5bo4to4brit2b5s2bsor4bu4gabu3libumi4bu3re5bust4butab5utoca1blcach44cag42c5ah4calocan5dcan4ecany44casyca4thccha5cci4accon44ced_5cel_3cell3cenc4ceni3cent4cesaces5t4ched5chio3chitchi2z3cho2ch4ticia5r4cierci4la3cilic4inac1ing5cinocion44cipeci3ph2c1it1c4l44clarcle4m4clicclim4co5agco4grcol5i5colocon4ac4onecon3gcon5tco3paco4pl4corbcos4ecove4cow5acoz5eco5zi5credcre4vcri5fc4rincris4cru4d4c3s2cta4bc3terctu4r5culicu2mac3umecu4micu3picu5py3c4ut4cutrdach4da2m2dan3gdard5dark54dary4dato5dav4dav5edeaf52d1ed4dee_de5ifde5lo5dem_de3node3nude3padepi4de2pud4erh5dermder5sd2es_de1scde4sude2todia5bd4ice3dictdi3ge1dina5dinidio5gdi4pldi1re5disid2iti1di1v4d5la3dle_3dled2d3lo4d5lu4d1n4do5de2d5ofdo4ladoli4doni4doo3ddop4p4drai5drendri4bdril4dro4p4drow2d1s2d1u1ad1ucadu5eld3uledu4pedy4sedys5pe1a4be3actea4gee5andear3aear4cear5kear2tea5spe3asseast3eav5ieav5oe4bene4bite4cadecca5e4cibec3imeci4te2cole2corec4tee4cul2e2da4ed3dede4se3diaed3ibed3imed1itedi5ze4doledon2e4drie4duleed3ieel3iee4lyee4naee4p1ee2s4eest4ee4tye4ficefil43efit4egaleger4eg5ibeg4ice4go_e4goseg1ule5gureher4ei5gle3imbe3infe1ingeir4deit3eei3the5itye4judeki4nek4lae4la_e4lace4lawe3lea5elece4lede5lene1lese5lime3lioe2lis4ellaello4e5locel5ogel2shel4tae5ludel5uge4mace4mage5mane2mele4metemi4ee4misem3izemo4gem3pie4mulemu3ne5neae5neeen3eme3newe5niee5nile3nioen3ite5niu5enizeno4ge4nosen3oven4swen3uaen5ufe3ny_4en3ze4oi4eo3reeo4toe5oute3paie5pelephe4e4plie3proep4she4putera4ber3arer4bler3ch2ere_ere4qeret4e1rio4eriter4iueri4ver3m4er3noer5obe5rocero4rer1ou4ertler3tweru4te1s4ae2scae3scres5cue1s2ee2sece3shae2sice2sidesi4ues4mie2sole2son2estre2sureta4be3teoet1icetin4e5tire3trae3treet3uaet5ymeu3roeute4eu5tre2vase5veaev1erev3idevi4le4vinevi4ve5voce4wage5weeewil5e3wit5eye_fa3blfab3rfa4cefain4fa3ta4fatofeas44feca5fectfe3life4mofen2d5ferrf4fesf4fief4flyfic4i4ficsfi3cufil5i4fily5finafi2nefin4nflin4f2ly5fon4tfor4ifra4tf5reafril4frol5fu5elfu5nefu3rifusi4fus4s4futa5gal_3galiga3log5amo4ganogass4gath3geez44gely4geno4genyge3omg4ery5gesigeth54getoge4ty4g1g2g3gergglu5gh3ingh4to1gi4agia5rg4icogien5gir4lg3isl5glasgli4bg3ligglo3rg4na_g2ning4niog4nongo3isgo3ni5gos_g4raigran24graygre4n4gritgruf4g5ste4gu4tgy5rahach4hae4mhae4th5aguha3lahan4ghan4khap3lhap5thar2dhas5shaun4haz3a1head3hearh5elohem4phena4heo5rh4erah3ernh3eryhi5anhi4cohigh5h4il2h4inahir4lhi3rohir4phir4rhis4s4h1l4hlan4hmet4h5odshoge4ho4mahome3hon4aho5ny3hoodhoon4ho5ruhos4ehos1p1houshree54h1s2h4tarht1enht5eshun4thy3pehy3ph4iancian3iia5peiass4i4atuib5iaib3inib3lii5bun4icam5icap4icaricas5i4cayiccu44iceoi5cidi2cipi4cly4i1cr5icrai4cryic4teictu2ic4umic5uoi3curi4daiide4si5dieid3ioid1itid5iui3dlei4domid3owid5uoied4eield3ien4ei5enni1er_i3esci1estif4fri3fieiga5bi3gibig3ilig3inig3iti4g4lig3orig5oti5greigu5iig1ur4i5i4i3legil1erilev4il3iail2ibil3io2ilitil2izil3oqil4tyil5uri4mag4imet4imitim4nii3mon4inavi3nee4inga4inge4ingi4ingo4ingui5ni_i4niain3ioin1is2i1noino4si4notin3se2int_i5nusioge4io2grion3iio5phior3iio5thi5otiio4toi4ourip4icip3uli3quaira4bi4racird5ei4refi4resir5giir4isiro4gir5ulis5agis3arisas52is1cis3chis3eris3ibisi4di5sis4is4k4ismsis2piis4py4is1sis1teis1tiis5us4ita_i4tagi3tani3tatit4es4itiait3igi2tim2itio4itis4itonit5ryi5tudit3ul4itz_iv5ioiv1it4izarjac4qjer5s5judgkais4ke5like4ty5k2ick4illkilo5k4in_kin4gk5ish4kleyk5nes1k2nokosh4kro5n4k1s2l4abolaci4l4adela3dylag4nlam3o3landlar4glar3ilas4elbin44l1c2ld5isl4drile4bileft55leg_5legg4len_3lenc1lentle3phle4prler4e3lergl4ero5lesq3lessl3eva4leye4l1g4lgar3l4gesli4agli2amli4asli5bi4licsl4icul3icyl3ida3lidil4iffli4fl3lighlim3ili4mol4inalin3ili5og4l4iqlis4pl2it_l3kallka4tl4lawl5leal3lecl3legl3lell5lowl5metl4modlmon42l1n2lo4cil5ogo3logu5longlon4ilood5lop3il3opmlora45los_los4tlo4ta2loutlpa5bl3phal5phil3pit2l1s2l4sielt5aglten4lth3iltis4lu3brluch4lu3cilu3enlu5idlu4ma5lumiluo3rluss4l5venly5mely3no2lys4l5ysema2cama4cl5magnmaid54maldmar3vmas4emas1t5matemath3m5bilmbi4v4med_mel4tmen4a4menemen4imens43mentme5onme4tame1tem4etrmid4amid4gm4illmin4a3mindmin4tm4inumiot4mis5l4mithm4nin4mocrmo2d1mo4gomois2mo3memo3spmoth3m5ouf3mousm3petmpi4am5pirmp5ismpov5mp4tr4m1s25multn4abu4nac_na4can5actna4li4naltnank4nar3c4narenar3inar4ln5armnas4c3nautnav4e4n1b4ncar5n3chanc1innc4itn4dain5danndi4bn1ditn3dizn5ducndu4rnd2wen3earneb3u5neck5negene4lane5mine4mo4nenene4pon2erener4r2nes_4nesp2nest4neswn5even4gabn3gelng5han3gibng1inn5gitn4glangov4ng5shn4gum4n1h4nhab33n4iani3anni4apni3bani4blni5dini4erni2fin5igrnin4g5nis_n4ithni3trn3ketnk3innmet44n1n2nni4vnob4ln5oclnoge4no4mono3mynon5i4noscnos4enos5tno5ta3nounnowl32n1s2ns5abnsid1nsig4n4socns4pen5spinta4bn5tibnti2fnti4pnu5enn3uinnu1men5umi3nu4nnu3troard3oas4eoat5io5barobe4lo2binob3ulocif3o4cilo4codocre3od3icodi3oo2do4odor3o5engoe4tao5geoo4gero3gieog3ito4groogu5i2ogynohab5oiff4o3ingo5ismo3kenok5ieo4lanold1eol3ero3letol4fio3liao5lilo5lioo5livolo4rol5plol3ubol3uno5lusom5ahoma5lom2beom4blo4meto3miao5midom1ino4monom3pion4aco3nanon5doo3nenon4guon1ico3nioon1iso5niuonsu4on5umonva5ood5eood5ioop3io3ordoost5ope5dop1ero3pito5pono5ra_ore5aor3eiorew4or4guo5rilor1ino1rioo3riuor2miorn2eo5rofor5pe3orrhor4seorst4or4tyo5rumos3alos4ceo5scrosi4uos4paos4poos2tao4tano4teso3tifo3tisoto5sou3blou5etoun2dov4eno3visow3elown5ipa4capa4cepac4tpain4pan4apa3nypa4pu3parepa2te3pe4a2p2ed3pede3pedipee4dpe4lap4encpe5onp4erip4ernper3ope5ruper1vph4erph1ic5phie3phiz3phobpho4rpian4pi4cyp5idapi3de5pidi3piecpi3enpi3lop4in_pind4p4ino3pi1opion4p3ithpi2tu2p3k21p2l23planpli3a4pligpli4nploi4plu4m5pod_po5em5po4gpoin2po4ni1p4orpo4rypos1spo4ta5pounp4pedp5pelp3penp3perp3petpre3rpre3vpri4spro3lpro1t2p1s2p4sibpti3mptu4rpul3cpur4r5putepu3trqua5v2que_3quer3quetra3bir5aclraf4tra4lor2amir4anira5norar5crare4rau4tr4babr4bagrbi4fr2binrcen4r3charc4itrcum3r4dalrdi4ardin4re1alre3an5reavre4aw2r2edre1dere2fere3fire4fyre5itre1lire5lure1pur1er4r4erirero4re5rur4es_res2tre4whrg3err3getr3gicrgi4nr5gisr5gitrgo4n4rhalria4bri4agrib3ar4ice4ricir4icori1erri5et5rigirim5i3rimor2inarin4drin4erin4g5riphri2plr4is_ris4cr3ishris4pri2turiv3ir3ketrk4ler2ledr4ligr4lisr3lo4rma5cr3menr4mior3mitr4narr3nelr4nerr5netr3neyr5nicr3nitr3nivr4nourob3lro3crro1ferom4irom4pron4e1room5rootror3iro5roros4sro4tyro4var4pear3petrp4h4rre4crre4fr4reorri4orri4vrron4rros4rrys4r3secrs3esr5sharson3r4tagr3tebrte5ort5ibrti4dr3tigr4tivr3trirt4shru3enru4glru3inrunk5r5uscr3venr3veyr3vicrvi4v2s1ab5sacks3actsal4msa5losal4t3sancsa5tasat3usca4pscav5s4ced4sceis4cess4choscle5s4cliscof4seas4sea5w3sect4s4eds5edlseg3rse1le5self5selv4seme4sencsen4dsen5gs4erlser4os1e4sse5shses5tsew4ish1er5shevsh1insh3io3shipshiv5shon3shor4s5icc5sidisil4e4sily2s1ins2inas3ing5sionsir5as3kets3latsman3smel4s5menso4cesoft35solvsona4son4gsor5csor5dso5vi5spaispa4n2spers2phespho5spil44spios4plys4ponspor44spotssas3s2s5cs3sels5sets4siess4lis2tags2tals4tedste2ws3thes4ti_s5tias1tics4ties3tif5stirs1tles4top4stry4st3wsu1alsu4b3su2g3su5issuit3sum3isyn5o4tacita5do4taf4ta5latal3i4talkta5mota5pltar4a4tarc4taretas4eta5sytaun44teattece45tect2t1edte5dite5gi3tel_teli45tels3tenc3tend1tentte5peter3c1teriter5v4tes_4tessthan44thea3thet4thil4thooti4ab2ti2b4tickt4ico5tidi3tienti5fy5tigu4timp2t1int2ina3tiniti5octi3sa3tisetis4mti5sotis4pti3tltiv4ati3zatlan43tle_3tled2t1n24todoto2grto5icto2matom4bto3my4tono4tonyto2ra5tour4touttra3btras4tre5ftre4m5tria2trimtri4vtro3vtru5itrus44t1s24t3t2t4testu3artu4bi4tuf45tu3i3ture5turitur5otu5ry4t1watwis4type3ty5phua5nauan4iuar2duar3iuar3tu4belu3beru1b4iuci4buc4itucle3ud3erudev4u1dicud5isu5ditu4donud4siu4eneuens4ug5inu1inguir4muita4ula5bulch4u1lenul4giu5lia4ul3mu1l4oul1ti4ultuul5ulum5abum4biunat4un4erun4imu2ninuni3vun3s4un4swu4orsu5piauptu44ura_u4ragu4rasur4beur4fru3rifur1inu3riou1ritur3izur4nouros4ur4peur4piurti4u5sadu5sanus4apus3ciuse5au5siau3sicus5slus1trusur4uta4bu3tat4ute_4utel4utenu4tisu4t1lut5ofuto5gu5tonu4touvac3uva4geval5oval1uva5mova5piv3el_ve4lov4elyv4erdv4e2s4ves_ve4teve4ty5vian5vidivi5gnv2incvin5d4vingvio3lvi1ouvi5rovi3sovi3su4vitivit3r4vityvo4lav5ole5volt3volvvom5ivori4vo4ryvo4taw5ablwag5owait5w5al_war4twas4twa1tewed4nweet3wee5vwel4lwest3win4g3wisewith3wl4eswl3inws4pew5s4txac5ex4agoxer4ixe5roxhil5xi5dix4imexpe3d3yar4yc5erych4eycom4ycot4y4erfympa3yn5icy4o5gy4onsy4pedyper5y4pocyp2tayra5myr5iay3s2eys3io3ysisys3taysur4yt3icz5a2bze3rozo5ol4z1z2',6:'_am5at_ani5m_an3te_ar4ty_atom5_ba5na_bas4e_be5ra_be3sm_can5c_ce4la_cit5r_de3ra_de3ri_des4c_dumb5_eas3i_el3em_enam3_er4ri_ge5og_han5k_hi3er_hon3o_idol3_in3ci_la4cy_lath5_leg5e_lig5a_mal5o_man5a_mer3c_mon3e_mo3ro_mu5ta_of5te_os4tl_pe5te_pio5n_pre3m_ran4t_rit5u_ros5t_row5d_sci3e_self5_sell5_sing4_ting4_tin5k_ton4a_top5i_tou5s_un3ce_ve5ra_wil5iab5erdab5latab5rogac5ardac5aroa5ceoua5chetac5robact5ifad4dinad5er_ad3icaadi4erad5ranaeri4eag5ellag3onia5guerain5inait5enal3enda5le5oal4ia_al5lev4allica5log_ama5raam5ascam5eraam5ilyami4noamor5iamp5enan3age3analyan3arcanar4ia3natiande4san3disan4dowang5iea4n1ica3niesan3i3fan4imea5nimia5ninean3ishan4kli5annizanoth5an4scoans3poan4surantal4an4tieap5eroa3pherap3itaa3pituap5olaapor5iapos3taps5esar3acta5radearan4gar5av4arbal4ar5easar3enta5ressar5ialar3iana3rietar5o5da5ronias3anta5sia_as3tenasur5aat3ablat3aloat5echat3egoat3en_at3eraater5nat3estath5ema5thenath5omat5i5bat3ituat5ropat4tagat3uraau5sibaut5enave4noav3eraav5ernav5eryavi4erazi4erbarbi5bari4abas4sibbi4nabe5nigbe5strbet5izbi3lizbi5netbi3ogrblath55blespblun4tbol3icbom4bibon5at4b1orabound3broth3bunt4ibus5iebuss4e3butiocab3inca5denca3latcal4lacan4iccan5iscan3izcan4tyca5percar5om4cativcav5alccou3t4ceden2cen4ece5ram3cessic5e4ta4ch3abcheap3che5lo3chemich5enech3er_ch3ers4ch1in5chinici2a5b3cinatcin3emc5ing_4cipic4cista4cisticit3iz5clareco3inccol3orcom5ercop3iccoro3ncras5t5crat_cre3at5criticro4plcrop5ocros4ect5angc5tantc4ticuctim3icu5ity3cultucu5riacuss4icu4tie2d3a4b4dativdeb5itde4bondecan4de4cilde5comdeli4e3demicde5mildemor5de4narde2s5odes3tide3strdev3ild3ge4t1d4i3adi4cam5di3en3dine_di5nizdirt5id4is3t3dles_4dlessdo5lordom5izdo3nat4d5outdrea5rduc5er4duct_4ductsdum4beead5ieea5gereal5ereal3oueam3erear5esear4icear4ileart3eeat5eneath3ie5atife4a3tueav3ene4bel_e4belsecan5cec5ifye5citee4clame4cluse4comme4concec3oraeco5roe4cremec4tanec3ulae4d1ered3icaed5ulo5eficie3fineeg5inge5git5e5instej5udielan4delaxa4el3egae4l1ere3libeel3icae3lierel5ishe3liv3el4label3op_em5anaem3icaem1in2em5ineem5ishe5miss5emnizem5ulaen5amoe4nanten3dicen5eroen5esien5esten3etren5icsen3isheop3areo5rolep5ance3pente4prece4predep3rehe4probep5utaequi3l4erander4chee3realere5coere3iner5el_er3emoer5ena4ereneer3enter5esser3este1ria45ericke3rieneri4erer3inee4rivaer4nis4ernit5ernizer3setert3er5erwaues5canes5ecres5encesh5ene2s5imes4i4ne5skines3olues5onaes3peres4preestan4es3tiges5tim4es2toe3stone5stroes5urreten4dethod3e5tideeti4noet5onaet3ricet5rifet3roget5roseuti5leva2p5ev5astev3ellevel3oe5vengeven4ie5verbew3ingfall5e4fa4mafam5isfar5thfa3thefault5feath3fend5ef5fin_f2f5is2f3ic_f3icanf3icenfi3cer5ficia5ficiefi5delfight5fin2d5f1in3gfis4tif5lessflo3refon4defo5ratfor5ayfore5tfort5afres5cfu4minga5metgan5isga3nizgar5n44gativgel4inge5lisge5lizge4natge5nizgh5out5gicia5gies_g3imen3g4in_gin5ge5g4insglad5ignet4t3g4o4ggondo5go5rizgor5ou4grada3guard5gui5t2g5y3nh3ab4lhala3mhan4cihan4cy5hand_hang5ohan4teha3ranha5rashard3ehar4lehe4canh5ecathe5do5he3l4ihel4lyhen5athera3pher4bahere5ah5erouhe2s5phet4edhimer4hion4ehis3elhlo3rih5odizhol5ar3hol4ehor5atho5rishort3eho5senhouse3hov5elhro3pohu4minhun5kehus3t4h4wart4ian4ti4ativib3eraib5ertib5it_ib5itei2b5rii4car_i4caraic5inaic3ipai2c5ocic3ulaid5ancide3alid5ianidi4aridi5ou5ie5gaien5a4i3entiif5eroiff5en4ific_ig3eraight3iil3a4bi4ladei2l5amila5rail4istill5abim3ageima5ryim5idaimi5lei5miniim3ulai4n3auincel4in3ceri5nessin5genin3ityi4no4c2in4thion3atip4re4iq5uefiq3uidire4dei4rel4iri5deiri3tuir4min5iron_is5hanis3honish5opislan4is4salissen4is4sesis4ta_ist4lyita4bi4ita5mit3erai5teri4i2ticit3icait5illi4tismi4tramit3uativ3elliv3en_iv5il_i5vorei4v3ot5izont4jestyk3en4dk3est_kin4delab3iclan4dllan5etlan4tela5tan4lativla4v4ald4ereld4erile4mat5lene_lera5b3l4erile5sco5less_li4ato5licioli4cor4lict_lid5erlif3erli4gra4l4i4llim4bll4im4p1l4inelin3ealiv3erl3le4nl3le4tl2lin4l5linall5outlm3inglob5al3logiclom3er5lope_lo5rielor5oulos5etloun5dlp5ingltane5ltera4ltur3al5umn_lus3tel5vet4mag5inma3ligma5linmal4limal4ty5maniaman5isman3izma5rizmar4lyma5scema3tismba4t55mediame3diem5e5dymel5onmem1o3men5acmen4demensu5men4tem5ersa3mestimet3alme5thime3try3miliam5ineem4inglmis4timma5rymoi5semon5etmon5gemoni3amo3nizmonol4mo3ny_4mora_mo5seympara5mpar5imphas4mp5iesm4p1inmpo3rim4pousmulti32n1a2bna5liana5mitnanci4nan4itnas5tina3talnau3sen4ces_n5cheon5chiln3chisn5d2ifne4gatnel5iznera5bn4erarn4er5i3neticn5geren3gerini3miz5nine_nis4ta3nition3itorn5keronni3alno3ble4n3o2dnois5ino5l4i3nomicnon4agn5oniznor5abnpre4cnsati4n4s3esnter3snti4ern3tinentu3menuf4fe3nu3itoast5eob3a3bob5ingo3cheto4clamoc3rac5ocritoc3ulao5cureod5dedof5iteofit4to4gatoo5gene1o1giso5g2ly3ognizoic3esoi3deroi5letoi5sonoi3terolass4o3lesco3liceol5id_o3li4fol3ingo5lis_ol3isho5liteolli4eol3umeom3enaom3ic_om3icao5miniomo4geompro53oncilon5eston3keyon4odion3omyonspi4onten4on3t4iontif53operao5phano5pherop3ingo4posio4r3ago5realore5sh4o5riaor3icaor3ityor3ougors5enor3thior3thyo3scopos4i4eos3itoos3ityos5tilos5titot3er_ot5ersoth3i4ot3ic_ot5icao3ticeouch5iover3sov4ertoviti4o5v4olow3derow5est5paganp3agatpan3elpan4typar5dipar5elp4a4ripar4ispa5terpa5thypear4lpedia4ped4icpeli4epe4nanpen4thp4era_p4eragperme5per3tipe5tenpe5tizphar5iphe3noph4es_ph5ing3phone5phonipi4ciepi5thaplas5tpli5erplum4bpo3et55pointpoly5tppa5rapray4e5precipre5copre3empre4lap3rese3press5pri4epris3op3rocapros3ept5a4bput3errach4eraf5firam3etrane5oran4gerap3er3raphyrar5ef4rarilra5vairav3elra5zier5binerch4err4ci4brdi4errd3ingre5arrre4crere3disred5itre4facreg3isren4tere5pinre4spire3strre4terre3trire5utire4valrev3elre5vilrg3ingric5as5ricidri4cierid5erri3encri3entrig5anril3iz5rimanrim4pe5rina_riph5erit3icrit5urriv5elriv3etrk4linrl5ishrm5ersrm3ingr1nis4ro5filro5ker5role_ron4alron4taro3pelrop3icro4therov5elr5pentrp5er_rp3ingrre4strsa5tirse4crrs5er_rse5v2r4si4brtach4rten4dr4tierrtil3irtil4lr4tilyr4tistru3e4lrum3plrun4tyruti5nrvel4irv5er_r5vest5ryngesac3risalar4san4desa5vor3s4cie4scopyse2c3ose4d4ese4molsen5ats5eneds5enin4sentd4sentlsep3a34s1er_4servo5se5umsev3ensh5oldshort53side_5sidessi5diz4signa5sine_sion5a3sitiosk5inesk5ingslith5small35smithso4labsol3d2so3lic3s4on_s5ophyspen4d2s5peo3sphersp5ings5sengs4ses_ssi4erss5ilyssur5astam4i5stands4ta4p5stat_s5terostew5a5stickst3ing5stockstom3a5stone3stores4trads4trays4tridsy5rintai5lotal5enta5logtan4detanta3ta5perta3riz4taticta4turtax4istch5ettead4ite5gerte2ma2tem3at3tenan4tenes5ter3dter3ist3ess_teth5eth3easthe5atthe3isth5ic_th5ica5thinkth5odeti4atot4ic1utim5ul3tine_ti3zen3tles_t5let_to3natto3rietor5izto3wartra5chtraci4trem5i4tricstro5mitron5i4tronytro3sptu4nis2t3up_tur3isu4berou3ble_ud5estud3iedud3iesuen4teuer4ilugh3enuil5izu5lati5ulcheul3derul3ingul5ishul4larul4lisuls5esultra3um4blyumor5oun5ishunt3abun4tesuper5sup3ingupt5ibure5atur4ferurs5erur5tesur3theur4tieus4linuten4i4u1t2iu3tineut3ing5u5tiz2v1a4bvac5ilva5lieva5nizvel3liven3omv5enue5vere_v4erelv3erenv4eresver3ie3versever3thves4tevet3ervi5ali5vide_5vided5vides5vilit4vi4nav3io4rvis3itvor5ab4voteewa5gerwa5verweath3win4dewo5venwrita4xi5mizxpan4dymbol5yn3chryo5netys3icay3thin',7:'_ad4der_anti5s_ar4tie_aster5_be5sto_but4ti_cam4pe_capa5b_car5ol_de4moi_earth5_gen3t4_hand5i_hero5i_hon5ey_im5pin_lat5er_mag5a5_mar5ti_me5ter_mist5i_muta5b_or5ato_ped5al_pe5tit_re5mit_se5rie_sta5bl_ten5an_tim5o5_under5_ven4dea4lenti5a5lysta4matisa4m5atoan5est_a4pillaar5adisa5ratioar5ativar4chanar5dinear5inat5a5si4ta5ternaat5omizbad5gerban5dagbina5r43bi3tio3bit5uabuf4fercall5incast5ercas5tigccompa55chanic5chine_5cific_5cratic4c3retacul4tiscur5a4b4c5utivdel5i5qdem5ic_de4monsdenti5fdern5izdi4latodrag5on5drupliec5essaec5ifiee4compee4f3ereefor5ese4fuse_el5ativel5ebrae4l5ic_el5igibe4l3ingem5igraem3i3niemoni5oench4erent5age4enthesep5recaep5ti5b4erati_er5encee4sage_e4sagese4sert_e4sertse4servaes5idenes5ignaesis4tees5piraes4si4bestruc5e5titioet5itiv4f3ical4ficatefill5ingani5za4g3o3na5graph_4graphy4gress_hang5erh5a5nizharp5enhar5terhel4lishith5erhro5niziam5eteia4tricic4t3uainer4ari5nite_5initioinsur5aion4eryiphras4iq3ui3t5i5r2izis5itiviso5mer4istral5i5ticki2t5o5mi4v3er_i4vers_iv3o3ro4jestiek5iness4latelilev4er_lev4eralev4ersliar5iz5ligatelink5er5liticalloqui5l3o3nizlo4ratol5ties_5lumnia4matizam4b3ing5metricme5triem5i5liemin5glim5inglymis4er_m5istrymo5lestmon4ismmon4istmpa5rabmula5r4nag5er_ncour5and5est_nge4n4en5o5mizno4rarynov3el3nsta5bln4t3ingo5a5lesoctor5aod5uct_od5uctso2g5a5rog5ativoint5eroist5eno5litiool5ogizom5atizom5erseom5etry5ommend4operagor5alizor5angeor5est_4oscopios5itivo5statiotele4goth5esiounc5erover4nepara5blpar5age5pathicpa4tricpera5blperi5stper4mal5phistipi4grappref5acpre5tenprin4t3prof5itput4tedput4tinration4rb5ing_r5ebratrec5ollre5fer_r4en4tare4posiress5ibre5stalre4ti4zre5versre5vertrev5olurip5licri3ta3br5ited_rit5er_rit5ersr4ming_rom5etero5n4isros5perrtroph45sa3tioscan4t55scin4dscour5asmol5d45sophics5ophizsqual4lsspend4stern5i5stratuta5blestal4listen4tagter5iesteri5za5ternit5thodicthor5ittho5riztill5intion5eeto5cratton4alitrac4ittrac4tetra5ventri5ces5triciatro5pheuar5antu4b5inguiv4er_ul4li4bu4m3ingun4ter_upport5uri4ficus5tereuti5lizution5avar5iedver5encvermi4n4v3idenv3i3lizwea5riewill5inxe4cutoxpecto5ylla5bl',8:'_chill5i_cor5ner_dictio5_eq5ui5t_for5mer_re5stat_trib5utab5it5abab5o5lizap5illara5rameteation5arces5si5bch5a5nisch5inesse4q3ui3sg5rapher5graphicimenta5rin5dlingin5glinglem5aticl5i5tics5losophyma5chinema5rine_mpos5itenato5mizneg5ativni5ficat5nologisntrol5lioc5ratizonspir5appo5siterec5omper5ev5er_5taboliz5tisticatrav5es5url5ing_',9:'_ratio5nac5laratioec5ificatef5i5niteep5etitio5losophiz5mocratiz5nop5o5liuto5matic'}};Hyphenator.config({displaytogglebox:true,remoteloading:false});Hyphenator.run(); \ No newline at end of file
diff --git a/media/js/underscore-min.js b/media/js/underscore-min.js
new file mode 100644
index 0000000..7cfbf99
--- /dev/null
+++ b/media/js/underscore-min.js
@@ -0,0 +1,17 @@
+(function(){var n=this,A=n._,r=typeof StopIteration!=="undefined"?StopIteration:"__break__",B=function(a){return a.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},j=Array.prototype,l=Object.prototype,o=j.slice,C=j.unshift,D=l.toString,p=l.hasOwnProperty,s=j.forEach,t=j.map,u=j.reduce,v=j.reduceRight,w=j.filter,x=j.every,y=j.some,m=j.indexOf,z=j.lastIndexOf;l=Array.isArray;var E=Object.keys,b=function(a){return new k(a)};if(typeof exports!=="undefined")exports._=b;n._=b;b.VERSION="1.0.2";var i=b.forEach=
+function(a,c,d){try{if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=0,f=a.length;e<f;e++)c.call(d,a[e],e,a);else for(e in a)p.call(a,e)&&c.call(d,a[e],e,a)}catch(g){if(g!=r)throw g;}return a};b.map=function(a,c,d){if(t&&a.map===t)return a.map(c,d);var e=[];i(a,function(f,g,h){e.push(c.call(d,f,g,h))});return e};b.reduce=function(a,c,d,e){if(u&&a.reduce===u)return a.reduce(b.bind(d,e),c);i(a,function(f,g,h){c=d.call(e,c,f,g,h)});return c};b.reduceRight=function(a,c,d,e){if(v&&
+a.reduceRight===v)return a.reduceRight(b.bind(d,e),c);a=b.clone(b.toArray(a)).reverse();return b.reduce(a,c,d,e)};b.detect=function(a,c,d){var e;i(a,function(f,g,h){if(c.call(d,f,g,h)){e=f;b.breakLoop()}});return e};b.filter=function(a,c,d){if(w&&a.filter===w)return a.filter(c,d);var e=[];i(a,function(f,g,h){c.call(d,f,g,h)&&e.push(f)});return e};b.reject=function(a,c,d){var e=[];i(a,function(f,g,h){!c.call(d,f,g,h)&&e.push(f)});return e};b.every=function(a,c,d){c=c||b.identity;if(x&&a.every===x)return a.every(c,
+d);var e=true;i(a,function(f,g,h){(e=e&&c.call(d,f,g,h))||b.breakLoop()});return e};b.some=function(a,c,d){c=c||b.identity;if(y&&a.some===y)return a.some(c,d);var e=false;i(a,function(f,g,h){if(e=c.call(d,f,g,h))b.breakLoop()});return e};b.include=function(a,c){if(m&&a.indexOf===m)return a.indexOf(c)!=-1;var d=false;i(a,function(e){if(d=e===c)b.breakLoop()});return d};b.invoke=function(a,c){var d=b.rest(arguments,2);return b.map(a,function(e){return(c?e[c]:e).apply(e,d)})};b.pluck=function(a,c){return b.map(a,
+function(d){return d[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};i(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g>=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};i(a,function(f,g,h){g=c?c.call(d,f,g,h):f;g<e.computed&&(e={value:f,computed:g})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(e,f,g){return{value:e,
+criteria:c.call(d,e,f,g)}}).sort(function(e,f){e=e.criteria;f=f.criteria;return e<f?-1:e>f?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?(e=g+1):(f=g)}return e};b.toArray=function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return o.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=function(a,c,d){return c&&!d?o.call(a,0,c):a[0]};b.rest=function(a,
+c,d){return o.call(a,b.isUndefined(c)||d?1:c)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.filter(a,function(c){return!!c})};b.flatten=function(a){return b.reduce(a,[],function(c,d){if(b.isArray(d))return c.concat(b.flatten(d));c.push(d);return c})};b.without=function(a){var c=b.rest(arguments);return b.filter(a,function(d){return!b.include(c,d)})};b.uniq=function(a,c){return b.reduce(a,[],function(d,e,f){if(0==f||(c===true?b.last(d)!=e:!b.include(d,e)))d.push(e);return d})};
+b.intersect=function(a){var c=b.rest(arguments);return b.filter(b.uniq(a),function(d){return b.every(c,function(e){return b.indexOf(e,d)>=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e<c;e++)d[e]=b.pluck(a,String(e));return d};b.indexOf=function(a,c){if(m&&a.indexOf===m)return a.indexOf(c);for(var d=0,e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,c){if(z&&a.lastIndexOf===z)return a.lastIndexOf(c);for(var d=a.length;d--;)if(a[d]===
+c)return d;return-1};b.range=function(a,c,d){var e=b.toArray(arguments),f=e.length<=1;a=f?0:e[0];c=f?e[0]:e[1];d=e[2]||1;e=Math.ceil((c-a)/d);if(e<=0)return[];e=new Array(e);f=a;for(var g=0;;f+=d){if((d>0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||{},d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);i(c,function(d){a[d]=b.bind(a[d],a)});return a};b.delay=function(a,
+c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=E||function(a){if(b.isArray(a))return b.range(0,a.length);var c=[];for(var d in a)p.call(a,
+d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){i(b.rest(arguments),function(c){for(var d in c)a[d]=c[d]});return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false;
+if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){if(b.isArray(a))return a.length===
+0;for(var c in a)if(p.call(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=l||function(a){return!!(a&&a.concat&&a.unshift&&!a.callee)};b.isArguments=function(a){return a&&a.callee};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return a===+a||D.call(a)==="[object Number]"};b.isBoolean=function(a){return a===true||a===false};b.isDate=function(a){return!!(a&&
+a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&&a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){n._=A;return this};b.identity=function(a){return a};b.times=function(a,c,d){for(var e=0;e<a;e++)c.call(d,e)};b.breakLoop=function(){throw r;};b.mixin=function(a){i(b.functions(a),function(c){F(c,b[c]=a[c])})};
+var G=0;b.uniqueId=function(a){var c=G++;return a?a+c:c};b.templateSettings={start:"<%",end:"%>",interpolate:/<%=(.+?)%>/g};b.template=function(a,c){var d=b.templateSettings,e=new RegExp("'(?=[^"+d.end.substr(0,1)+"]*"+B(d.end)+")","g");a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g," ").replace(e,"\t").split("'").join("\\'").split("\t").join("'").replace(d.interpolate,"',$1,'").split(d.start).join("');").split(d.end).join("p.push('")+
+"');}return p.join('');");return c?a(c):a};b.each=b.forEach;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.select=b.filter;b.all=b.every;b.any=b.some;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var k=function(a){this._wrapped=a},q=function(a,c){return c?b(a).chain():a},F=function(a,c){k.prototype[a]=function(){var d=b.toArray(arguments);C.call(d,this._wrapped);return q(c.apply(b,d),this._chain)}};b.mixin(b);i(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=j[a];
+k.prototype[a]=function(){c.apply(this._wrapped,arguments);return q(this._wrapped,this._chain)}});i(["concat","join","slice"],function(a){var c=j[a];k.prototype[a]=function(){return q(c.apply(this._wrapped,arguments),this._chain)}});k.prototype.chain=function(){this._chain=true;return this};k.prototype.value=function(){return this._wrapped}})();
diff --git a/media/sass/_projects.sass b/media/sass/_projects.sass
index dc4190d..3024a40 100644
--- a/media/sass/_projects.sass
+++ b/media/sass/_projects.sass
@@ -45,6 +45,7 @@ ul.project-tease
font-family: Hoefler Text,Georgia,Times New Roman,Times,serif
font-size: .9em !important
line-height: 23px
+ text-align: justify
span.proj
diff --git a/media/sass/_writing.sass b/media/sass/_writing.sass
index 0391ae3..bc5c9b1 100644
--- a/media/sass/_writing.sass
+++ b/media/sass/_writing.sass
@@ -6,10 +6,12 @@
h3
+sm-headline-sans
margin= 0
-
+ text-align: left
div
- width= !col7 + !pad
+ width= !col7
+ margin-right= !pad
float= left
+ text-align: justify
div.img
width = !col9
margin-left= !pad
@@ -53,7 +55,6 @@ body#writing-detail
div#post-body
-
dl
font-size= 100%
dt
diff --git a/media/sass/base.sass b/media/sass/base.sass
index 94485f8..d0fdb91 100644
--- a/media/sass/base.sass
+++ b/media/sass/base.sass
@@ -22,7 +22,8 @@ body#projects
margin-left= !pad
margin-bottom= 78px
-
+p.hyphenate
+ text-align: justify
section#writing-tease, section#currently
@@ -34,6 +35,7 @@ section#writing-tease, section#currently
padding-top: 20px
//border-top= !luxagraf_brown 1px "solid"
border-top= #b9b9b9 1px "dotted"
+
section#currently
padding: 0
@@ -65,7 +67,30 @@ section#currently
font-family= "Hoefler Text", Georgia, "Times New Roman", Times, serif
cite
padding-left: 4px
-
+
+span.button
+ display: block
+ +sm-sans
+ margin: 10px 10px 0 0
+ width: auto
+ +sm-sans
+ font-size: 10px
+ 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
+ a:hover
+ background= !luxagraf_orange
+ color: #fff
+
+section#writing-tease
+ h2
+ margin: 24px 0 24px 0
section#fromthearc
clear: both
li
@@ -82,13 +107,20 @@ section#fromthearc
h3
+headline-sans
font-size: 1.2em
- margin-bottom: 12px
- min-height: 50px
- .location,time
- +tiny-serif
- line-height= 2em
- font-size: .7em
+ //min-height: 50px
+ margin: 0
p
margin: 0
+ p.hyphenate
+ margin-top: 3px
text-align: justify
-
+ img
+ margin-top: 4px
+ .location, time
+ +tiny-serif
+ line-height= 3em
+ margin: 0
+ padding: 0
+ font-size: .7em
+ text-align: left
+ \ No newline at end of file
diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html
index 7003943..2436795 100644
--- a/templates/archives/homepage.html
+++ b/templates/archives/homepage.html
@@ -12,12 +12,12 @@
<h3><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h3>
<p>
- <span class="location">{% ifequal featured.location.state.country.name "United States" %}{{featured.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.location.state.name}}</a>{%else%}{{featured.location.name|smartypants|safe}}, <a href="/writing/{{featured.location.state.country.slug}}/1/" title="travel writing from {{featured.location.state.country.name}}">{{featured.location.state.country.name}}</a>{%endifequal%}</span> &nbsp;
+ <span class="location">{% if featured.location.state.country.name == "United States" %}{{featured.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{featured.location.state.name}}</a>{%else%}{{featured.location.name|smartypants|safe}}, <a href="/writing/{{featured.location.state.country.slug}}/1/" title="travel writing from {{featured.location.state.country.name}}">{{featured.location.state.country.name}}</a>{%endif%}</span> &nbsp;
<time datetime="{{featured.pub_date}}">{{featured.pub_date|date:"m/d/y"}}</time>
</p>
- <p>{{featured.dek|safe}}</p>
- <span><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More &raquo;</a></span>
+ <p class="hyphenate">{{featured.dek|safe}}</p>
+ <span class="button"><a href="{{featured.get_absolute_url}}" title="{{featured.title}}">More &raquo;</a></span>
</div>
<div id="featured-image">
<a href="{{featured.get_absolute_url}}" title="{{featured.title}}"><img src="{{featured.get_image_url}}" alt="{{ featured.title }}" class="post-image" /></a>
@@ -42,4 +42,6 @@
</article>
-{% endblock %} \ No newline at end of file
+{% endblock %}
+
+{% block js %}<script src="/media/js/hyphenate.js" type="text/javascript"></script>{% endblock%} \ No newline at end of file
diff --git a/templates/archives/photos.html b/templates/archives/photos.html
index e4dfe5f..84cbf01 100644
--- a/templates/archives/photos.html
+++ b/templates/archives/photos.html
@@ -14,8 +14,8 @@
<ul id="breadcrumbs">
<li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
- {% if region %}{%ifequal region.name 'United States'%} <li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li>
- <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Photos </li>{%endif%}
+ {% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li>
+ <li>the United States</li>{%else%}<li><a href="/photos/" title="See all Photos">Photos</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}Photos </li>{%endif%}
</ul>
<ul id="photo-galleries">{% autopaginate object_list 18 %} {% for object in object_list %}
diff --git a/templates/archives/projects.html b/templates/archives/projects.html
index 52edbb7..8efe6aa 100644
--- a/templates/archives/projects.html
+++ b/templates/archives/projects.html
@@ -22,7 +22,8 @@
<div class="tease">
<h4><a href="{{project.get_absolute_url}}">{{project.title|safe}}{{project.subtitle|safe}}</a></h4>
- <div class="lede">{{project.lede|smartypants|safe}}</div>
+ <div class="lede hyphenate">{{project.lede|smartypants|safe}}</div>
+ <span class="button"><a href="{{project.get_absolute_url}}">More&nbsp;&raquo;</a></span>
</div>
<div class="img"><img src="{{project.image.url}}" /></div>
</li>
@@ -32,3 +33,4 @@
</article>
{% endblock %}
+{% block js %}<script src="/media/js/hyphenate.js" type="text/javascript"></script>{% endblock%} \ No newline at end of file
diff --git a/templates/archives/topics.html b/templates/archives/topics.html
index 2e4802e..008ab6f 100644
--- a/templates/archives/topics.html
+++ b/templates/archives/topics.html
@@ -19,7 +19,7 @@
{%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
- <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> &bull; <span class="location">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%}</span>
+ <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time> &bull; <span class="location">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%}</span>
<p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read&nbsp;it&nbsp;&raquo;</a></p>
diff --git a/templates/archives/writing.html b/templates/archives/writing.html
index 5b5f93d..7628272 100644
--- a/templates/archives/writing.html
+++ b/templates/archives/writing.html
@@ -9,12 +9,12 @@
{% block primary %}
<article>
- <h1 class="hide">{% if region %}Writings from {%ifequal region.name 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Writing {%endif%}</h1>
+ <h1 class="hide">{% if region %}Writings from {%if region.name == 'United States'%}the United States{%else%}{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing {%endif%}</h1>
<ul id="breadcrumbs">
<li><a href="/" title="luxagraf homepage">Home</a> &rarr;</li>
- {% if region %}{%ifequal region.name 'United States'%} <li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li>
- <li>the United States</li>{%else%}<li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endifequal%}{%else%}Writing </li>{%endif%}
+ {% if region %}{%if region.name == 'United States'%} <li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li>
+ <li>the United States</li>{%else%}<li><a href="/writing/" title="See all Writing">Writing</a> &rarr;</li> <li>{{region.name|title|smartypants|safe}}{%endif%}{%else%}Writing </li>{%endif%}
</ul>
<ul id="writing-archive">
@@ -25,11 +25,11 @@
<h3><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h3>
<p>
- <span class="location">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%}</span> &nbsp;
+ <span class="location">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%}</span> &nbsp;
<time datetime="{{object.pub_date}}">{{object.pub_date|date:"m/d/y"}}</time>
</p>
- <p>{{object.dek|safe}}</p>
+ <p class="hyphenate">{{object.dek|safe}}</p>
</div>
<div class="img">
<a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="post-image" /></a>
@@ -48,3 +48,4 @@
+{% block js %}<script src="{{MEDIA_URL}}js/hyphenate.js" type="text/javascript"></script>{% endblock%} \ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 351df30..320b114 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<!--[if IE]>
- <script src="{{media_url}}js/html5.js"></script>
+ <script src="{{MEDIA_URL}}js/html5.js"></script>
<![endif]-->
@@ -16,16 +16,16 @@
<link rel="stylesheet"
- href="{{media_url}}css/base.css"
+ href="{{MEDIA_URL}}css/base.css"
type="text/css"
media="screen">
<link rel="stylesheet"
- href="{{media_url}}css/print.css"
+ href="{{MEDIA_URL}}css/print.css"
type="text/css"
media="print">
{%block stylesheet%}{%endblock%}
- <!--[if lte IE 7]><link rel="stylesheet" href="http://luxagraf.net/media/css/ie.css" type="text/css" media="screen, projection"><![endif]-->
+ <!--[if lte IE 7]><link rel="stylesheet" href="{{MEDIA_URL}}css/ie.css" type="text/css" media="screen, projection"><![endif]-->
<link rel="shortcut icon"
diff --git a/templates/details/entry.html b/templates/details/entry.html
index 9bd8535..db378a7 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -1,16 +1,16 @@
{% extends 'base.html' %}
{% load typogrify %}
-{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}){% endblock %}
+{% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}){% endblock %}
-{%block stylesheet%}{%ifequal object.template_name 2%}<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+{%block stylesheet%}{%if object.template_name == 2%}<link rel="stylesheet"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
- media="screen">{%endifequal%}
- {%ifequal object.template_name 3%}<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+ media="screen">{%endif%}
+ {%if object.template_name == 3%}<link rel="stylesheet"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
- media="screen">{%endifequal%}{%endblock%}
+ media="screen">{%endif%}{%endblock%}
{% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %}
@@ -18,11 +18,11 @@
<link rel="canonical" href="http://luxagraf.net{{object.get_absolute_url}}" />
<meta name="ICBM" content="{{object.latitude}}, {{object.longitude}}" />
<meta name="geo.position" content="{{object.latitude}}; {{object.longitude}}" />
- <meta name="geo.placename" content="{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}">
- <meta name="geo.region" content="{% ifequal object.location.state.country.name "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endifequal%}">
+ <meta name="geo.placename" content="{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}">
+ <meta name="geo.region" content="{% if object.location.state.country.name == "United States" %}{{object.location.state.country.iso2}}-{{object.location.state.iso2}}{%else%}{{object.location.state.country.iso2}}{% endif%}">
{%endblock%}
-{%block bodyid%}id="writing-detail" class="{%ifequal object.template_name 0%}single"{%endifequal%}{%ifequal object.template_name 2%}single"{%endifequal%}{%ifequal object.template_name 1%}double"{%endifequal%}{%ifequal object.template_name 3%}double"{%endifequal%}{%endblock%}
+{%block bodyid%}id="writing-detail" class="{%if object.template_name == 0 %}single"{%endif%}{%if object.template_name == 2%}single"{%endif%}{%if object.template_name == 1 %}double"{%endif%}{%if object.template_name == 3 %}double"{%endif%}{%endblock%}
{% block primary %}
@@ -30,21 +30,21 @@
<header>
<h1>{{object.title|smartypants|widont|safe}}</h1>
<aside class="meta">
- <section class="geo">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
+ <section class="geo">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span></section>
{%comment%}<span class="topics">Topics: {%for topic in object.topics.all%}<a href="{{topic.get_absolute_url}}" title="view more {{topic.name}} posts">{{topic.name}}</a>{%if forloop.last%}{%else%}, {%endif%}{% endfor %}</span>{%endcomment%}
</aside>
</header>
- <div id="post-body">
+ <div id="post-body" class="hyphenate">
{{object.body_html|smartypants|widont|safe}}
</div>
- {%ifequal object.template_name 1%}<div class="clearfix"></div>{%endifequal%}
- {%ifequal object.template_name 3%}<div class="clearfix"></div>{%endifequal%}
+ {%if object.template_name == 1 %}<div class="clearfix"></div>{%endif%}
+ {%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
<section id="post-metadata">
<h4 class="hide">About {{object.title|smartypants|safe}}</h4>
- <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%ifequal object.location.state.country.name 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}{{object.location.state.country.name}}{%endifequal%}.
+ <p>Posted <time datetime="{{object.pub_date}}">{{object.pub_date|date:"F j, Y"}}</time>, from {{object.location.name|smartypants|safe}}, {%if object.location.state.country.name == 'United States'%}<a href="/maps/#{{object.location.state.slug}}" title="see other entries from {{object.location.state.name}}">{{object.location.state.name|smartypants|safe}}</a>{% else %}{{object.location.state.country.name}}{%endif%}.
Follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about me, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
</section>
<section id="page-navigation">
diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html
index 0ba0636..4e1084e 100644
--- a/templates/details/national-parks.html
+++ b/templates/details/national-parks.html
@@ -4,17 +4,13 @@
{% block metadescription %}{% endblock %}
{% block extrahead %}
-<script type="text/javascript" src="/media/js/jquery.js"></script>
-<script src="http://documentcloud.github.com/underscore/underscore-min.js" type="text/javascript"></script>
-<script src="/media/js/natparks.js" type="text/javascript"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/underscore-min.js"></script>
+<script type="text/javascript" src="{{MEDIA_URL}}js/natparks.js" ></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-
-
-
-
<link rel="stylesheet"
- href="{{media_url}}css/dark.css"
+ href="{{MEDIA_URL}}css/dark.css"
type="text/css"
media="screen">
diff --git a/templates/details/photo.html b/templates/details/photo.html
index 22adeb9..200995f 100644
--- a/templates/details/photo.html
+++ b/templates/details/photo.html
@@ -1,8 +1,8 @@
{% extends 'base.html' %}
{% load typogrify %}
{% block pagetitle %}Luxagraf | {{object.title|title|smartypants|safe}}{% endblock %}
-{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %}
-{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endifequal%}</span>{% endblock %}
+{% block metadescription %}Luxagraf: Photo, {{object.title}}, Photographer: Scott Gilbertson, Published: {{ object.pub_date|date:"N j, Y" }} {{ object.pub_date|date:"h:i a" }}Camera:{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}, Aperture: {%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}, Shutter Speed: {%if object.exif_shutter%}{{ object.exif_shutter }} sec{%else%}Not Recorded{%endif%}, Film Speed: {%if object.exif_iso%}{{ object.exif_iso }} ISO{%else%}Not Recorded{%endif%}.{% endblock %}
+{% block date %}{{object.pub_date|date:"F j, Y"}}<span class="small byline">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}</span>{% endblock %}
@@ -12,9 +12,9 @@
{% block primary %}
<a href="http://flickr.com/photos/luxagraf/{{object.flickr_id}}/" title="View {{object.flickr_title}} on Flickr.com"><img class="flickr-image" src="{{ object.get_medium_url }}" alt="{{object.title}}" title="{{object.title}}" /></a>
- {% ifnotequal object.description 'None' %}
+ {% if object.description != 'None' %}
<p>{{ object.description|smartypants|widont|safe }}</p>
- {%endifnotequal %}
+ {%endif %}
<p>Other Sizes: <a href="{{object.get_large_url}}" title="see large image">Large</a> and
<a href="http://flickr.com/photo_zoom.gne?id={{object.flickr_id}}&size=o" title="see original image">Original</a></p>
@@ -72,7 +72,7 @@
<dl class="sidebar meta">
<dt>Camera:</dt>
- <dd>{%if object.exif_make%}{%ifnotequal object.exif_make 'Canon'%}{{ object.exif_make }}{%endifnotequal%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
+ <dd>{%if object.exif_make%}{%if object.exif_make != 'Canon'%}{{ object.exif_make }}{%endif%} {{ object.exif_model }}{% else %}Canon Powershot S45{%endif%}</dd>
<dt>Aperture:</dt>
<dd>{%if object.exif_aperture%}{{ object.exif_aperture }}{%else%}Not Recorded{%endif%}</dd>
<dt>Shutter Speed:</dt>
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
index 8c1e097..04e1088 100644
--- a/templates/details/photo_galleries.html
+++ b/templates/details/photo_galleries.html
@@ -16,7 +16,7 @@
<link rel="stylesheet"
- href="{{media_url}}css/photos.css"
+ href="{{MEDIA_URL}}css/photos.css"
type="text/css"
media="screen">
@@ -81,9 +81,9 @@
<div class="meta" style="display: none;">
<dl>
<dt>Camera:</dt>
- <dd>{% ifequal photo.exif_make 'Canon'%}{{photo.exif_model}}{%endifequal%}{% ifequal photo.exif_model 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endifequal%}{%ifequal photo.exif_model 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endifequal%}</dd>
+ <dd>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}<a href="http://amzn.to/cLQozJ" title="Buy on Amazon">{{photo.exif_make}} {{photo.exif_model}}</a>{%endif%}</dd>
<dt>Lens: </dt>
- <dd>{%ifequal photo.exif_lens 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endifequal%}{%ifequal photo.exif_lens '' %}Built-in{%endifequal%}</dd>
+ <dd>{%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">{{photo.exif_lens}}</a>{%endif%}{%if photo.exif_lens =='' %}Built-in{%endif%}</dd>
<dt>Exposure</dt>
<dd>{{photo.exif_exposure}}</dd>
<dt>Aperture</dt>
diff --git a/templates/includes/map_entry_list_template.html b/templates/includes/map_entry_list_template.html
index ed34d11..0705602 100644
--- a/templates/includes/map_entry_list_template.html
+++ b/templates/includes/map_entry_list_template.html
@@ -59,7 +59,7 @@
markerOptions = { clickable:true, draggable:false, icon:tinyIcon};
marker_{{entry.title|truncatewords:2|slugify_under}} = new GMarker(point_{{entry.title|truncatewords:2|slugify_under}}, markerOptions);
map.addOverlay(marker_{{entry.title|truncatewords:2|slugify_under}});
- marker_{{entry.title|truncatewords:2|slugify_under}}.info_window_content = '<div class="infowin"><h4>{{entry.title}}<\/h4><span class="date blok">{{entry.pub_date|date:"F j, Y"}} ({% ifequal entry.location.state.country.name "United States" %}{{entry.location.name|smartypants|safe}}, {{entry.location.state.name}}){%else%}{{entry.location.name|smartypants|safe}}, {{entry.location.state.country.name}}){%endifequal%}<\/span><p><img src="{{entry.get_thumbnail_url}}" height="100" alt="{{ entry.title }}" style="float: left; border: #000 10px solid; margin-right: 8px; margin-bottom: 4px; height: 100px;" \/>{{entry.dek|escapejs}} <a href="{{entry.get_absolute_url}}">Read it &raquo;<\/a><\/p><\/div>'
+ marker_{{entry.title|truncatewords:2|slugify_under}}.info_window_content = '<div class="infowin"><h4>{{entry.title}}<\/h4><span class="date blok">{{entry.pub_date|date:"F j, Y"}} ({% if entry.location.state.country.name == "United States" %}{{entry.location.name|smartypants|safe}}, {{entry.location.state.name}}){%else%}{{entry.location.name|smartypants|safe}}, {{entry.location.state.country.name}}){%endif%}<\/span><p><img src="{{entry.get_thumbnail_url}}" height="100" alt="{{ entry.title }}" style="float: left; border: #000 10px solid; margin-right: 8px; margin-bottom: 4px; height: 100px;" \/>{{entry.dek|escapejs}} <a href="{{entry.get_absolute_url}}">Read it &raquo;<\/a><\/p><\/div>'
marker_{{entry|truncatewords:2|slugify_under}}.bindInfoWindowHtml(marker_{{entry|truncatewords:2|slugify_under}}.info_window_content, {maxWidth:400});
GEvent.addListener(marker_{{entry.title|truncatewords:2|slugify_under}}, "click", function() {
map.panTo(point_{{entry.title|truncatewords:2|slugify_under}}, 2);
diff --git a/templates/includes/recent_entries.html b/templates/includes/recent_entries.html
index 58b165b..4b5acba 100644
--- a/templates/includes/recent_entries.html
+++ b/templates/includes/recent_entries.html
@@ -2,32 +2,35 @@
<ul>
<li class="col1">
<h3><a href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">(There&#8217;ll Be) Peace in the&nbsp;Valley</a></h3>
- <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/deathvalley.jpg" alt="(There&#39;ll Be) Peace in the Valley" class="post-image" />
<p>
<span class="location">Death Valley, <a href="/writing/united-states/1/" title="travel writing from the United States">California</a></span> &nbsp;
<time datetime="2010-04-24 10:45:59">04/24/10</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbnail/2010/deathvalley.jpg" alt="(There&#39;ll Be) Peace in the Valley" class="post-image" />
</p>
- <p class="intro">Sometimes you ignore the places close to home because, well, there's always next weekend. Which is why I never made it Death Valley in the twenty-five years I lived in California. It took being all the way across the country to get me out to Death Valley. Which might explain why I actually got up before dawn just to watch the sunrise at Zabriskie Point. <a class="permalink" href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">Read&nbsp;it&nbsp;&raquo;</a></p>
+ <p class="intro hyphenate">Sometimes you ignore the places close to home because, well, there's always next weekend. Which is why I never made it Death Valley in the twenty-five years I lived in California. It took being all the way across the country to get me out to Death Valley. Which might explain why I actually got up before dawn just to watch the sunrise at Zabriskie Point. </p>
+ <span class="button"><a class="permalink" href="/2010/apr/24/death-valley/" title="(There&#39;ll Be) Peace in the Valley">More&nbsp;&raquo;</a></span>
</li>
<li class="col2">
<h3><a href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">So Far, I Have Not Found The&nbsp;Science</a></h3>
- <img src="http://127.0.0.1:8000/images/post-thumbs/2010/okeefenokee.jpg" alt="So Far, I Have Not Found The Science" class="post-image" />
<p>
<span class="location">Okefenokee Swamp, <a href="/writing/united-states/1/" title="travel writing from the United States">Georgia</a></span> &nbsp;
<time datetime="2010-03-13 11:50:48">03/13/10</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbs/2010/okeefenokee.jpg" alt="So Far, I Have Not Found The Science" class="post-image" />
</p>
- <p class="intro">A canoe trip through the Okefenokee Swamp down in the southern most corner of Georgia. Paddling the strange reddish and incredibly still waters. Begging alligators, aching muscles and the kindly folks of Stintson's Barbecue all getting their due. <a class="permalink" href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">Read&nbsp;it&nbsp;&raquo;</a></p>
+ <p class="intro hyphenate">A canoe trip through the Okefenokee Swamp down in the southern most corner of Georgia. Paddling the strange reddish and incredibly still waters. Begging alligators, aching muscles and the kindly folks of Stintson's Barbecue all getting their due.</p>
+ <span class="button"><a class="permalink" href="/2010/mar/13/so-far-i-have-not-found-science/" title="So Far, I Have Not Found The Science">More&nbsp;&raquo;</a></span>
</li>
<li class="col1">
<h3><a href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">How to Get Off Your Butt and Travel the&nbsp;World</a></h3>
- <img src="http://127.0.0.1:8000/images/post-thumbs/2010/traveltheworld.jpg" alt="How to Get Off Your Butt and Travel the World" class="post-image" />
<p>
<span class="location">Athens, <a href="/writing/united-states/1/" title="travel writing from the United States">Georgia</a></span> &nbsp;
<time datetime="2009-05-03 18:39:16">05/03/09</time>
+ <img src="http://127.0.0.1:8000/images/post-thumbs/2010/traveltheworld.jpg" alt="How to Get Off Your Butt and Travel the World" class="post-image" />
</p>
- <p class="intro">How do you make the leap from cubicle daydreams to life on to the road? You want to travel the world, but, like me, you have a million excuses stopping you. How do overcome the inertia that keeps you trapped in a life that isn't what you want it to be? Here's a few practical tips and how tos designed to motivate you to get off your butt and travel the world. <a class="permalink" href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">Read&nbsp;it&nbsp;&raquo;</a></p>
+ <p class="intro hyphenate">How do you make the leap from cubicle daydreams to life on to the road? You want to travel the world, but, like me, you have a million excuses stopping you. How do overcome the inertia that keeps you trapped in a life that isn't what you want it to be? Here's a few practical tips and how tos designed to motivate you to get off your butt and travel the world.</p>
+ <span class="button"><a class="permalink" href="/2009/may/03/how-to-get-your-butt-and-travel-world/" title="How to Get Off Your Butt and Travel the World">More&nbsp;&raquo;</a></span>
</li>
</ul> \ No newline at end of file
diff --git a/templates/includes/recent_entries_template.html b/templates/includes/recent_entries_template.html
index 29ed3d8..847dc47 100644
--- a/templates/includes/recent_entries_template.html
+++ b/templates/includes/recent_entries_template.html
@@ -2,12 +2,13 @@
<ul>{% for object in object_list %}
<li class="{% cycle 'col1' 'col2' %}">
<h3><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h3>
- {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
<p>
- <span class="location">{% ifequal object.location.state.country.name "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endifequal%}</span> &nbsp;
+ <span class="location">{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%}</span> &nbsp;
<time datetime="{{object.pub_date}}">{{object.pub_date|date:"m/d/y"}}</time>
+ {%if object.thumbnail%}<img src="{{object.get_thumbnail_url}}" alt="{{ object.title }}" class="post-image" />{%endif%}
</p>
- <p class="intro">{{object.dek|safe}} <a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">Read&nbsp;it&nbsp;&raquo;</a></p>
+ <p class="intro hyphenate">{{object.dek|safe}}</p>
+ <span class="button"><a class="permalink" href="{{object.get_absolute_url}}" title="{{object.title}}">More&nbsp;&raquo;</a></span>
</li>{% endfor %}
</ul> \ No newline at end of file