From 8e2e31965126bee7992d26428d42c1631d29786f Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Tue, 5 Apr 2011 10:38:52 -0400
Subject: fixed image sprties, updated photo gallery codeand changed
 contact/about pages

---
 templates/base.html                    | 12 ++++-----
 templates/details/about.html           | 24 ++++++++++++-----
 templates/details/contact.html         | 47 ++++++++++++++++++++++++++++++++++
 templates/details/entry.html           | 26 ++++++++++++++++---
 templates/details/photo_galleries.html |  9 ++++---
 5 files changed, 96 insertions(+), 22 deletions(-)
 create mode 100644 templates/details/contact.html

(limited to 'templates')

diff --git a/templates/base.html b/templates/base.html
index 8733a5c..95fd6e9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -37,8 +37,6 @@
           content="{% block metadescription %}Luxagraf: a travelogue of sorts, Recording journeys around the world and just next door.{% endblock %}">
     <meta name="keywords" 
           content="luxagraf writing travel authors philosophy ramblings">
-    <meta name="copyright" 
-          content="Licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0  License">
 
     <script>var _gaq=[['_setAccount','UA-1186171-1'],['_trackPageview']];(function(d,t){    var g=d.createElement(t),s=d.getElementsByTagName(t)[0];    g.async=1;g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script'))</script>
     {%block extrahead%}{%endblock%}
@@ -47,13 +45,13 @@
     <header role="banner">
         <a id="logo" href="/" title="home">
                 <h1>Luxagraf</h1>
-                <h2>{a travelogue}</h2>
+                <h2>{Walk Slowly}</h2>
         </a>
         <nav role="navigation">
             <ul>
                 <li id="stories"><a href="/writing/1/" title="An archive of writings from around the world">Writing</a>,</li>
                 <li id="photos"><a href="/photos/1/" title="Photos from travels around the world">Photos</a>,</li>
-                <li id="maps"><a href="/map/" title="Maps and miscellanea">Maps</a>,</li>
+                <li id="maps"><a href="/map/" title="Maps and miscellanea">Map</a>,</li>
                 <li id="projects" ><a href="/projects/" title="Luxagraf: Projects (coming soon)">Projects</a>,</li>
                 <li id="etc"><a href="/about/" title="About Luxagraf">Etc</a></li>
             </ul>
@@ -64,14 +62,14 @@
     <footer role="contentinfo">
         <nav>
             <ul>
-                <li><a href="http://feeds2.feedburner.com/luxagraf/blog" title="RSS feed">RSS</a></li>
-                <li><a href="http://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">Twitter</a></li>
+                <li><a href="http://feeds2.feedburner.com/luxagraf/blog" title="RSS feed">Subscribe</a></li>
+                <li><a href="http://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">@luxagraf</a></li>
                 <li><a href="http://www.flickr.com/photos/luxagraf" rel="me" title="luxagraf on Flickr">Flickr</a></li>
                 <li><a href="/contact/" title="contact luxagraf">Contact</a></li>
             </ul>
         </nav>
         <p id="license">
-            All content licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" title="read the Attribution-Noncommercial-Share Alike 3.0 deed">details</a>). <span>Built with <a href="http://geodjango.org/" title="a GeoDjango joint">GeoDjango</a> and hosted on <a href="http://www.webfaction.com/" title="webfaction">Webfaction</a>.</span>
+            &copy; 2003-{% now "Y" %} Scott Gilbertson, except photos, which are licensed under the Creative Commons (<a href="http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en" title="read the Attribution-Noncommercial-Share Alike 3.0 deed">details</a>).
         </p>
     </footer>
     {% block js %}{% endblock%}
diff --git a/templates/details/about.html b/templates/details/about.html
index e5561c9..f8b36c8 100644
--- a/templates/details/about.html
+++ b/templates/details/about.html
@@ -18,19 +18,28 @@
     <article role="main">
         <h1 class="hide">About Luxagraf</h1>
         <section>
-            <h2>Background</h2>
-            <img src="{{IMAGES_URL}}bio.jpg" alt="me" />
-            <div class="content">{%for object in object_list %}{%if forloop.first %}
-                {{object.content|smartypants|safe}}{%endif%} {% endfor %}
+            <div class="content">
+            <p>Luxagraf is written and published by Scott Gilbertson.</p>
+            <p><img src="{{MEDIA_URL}}img/bio.jpg" alt="Scott Gilbertson" /></p>
+            <p><small>Photo by <a href="http://twitter.com/lagsolo" >@lagsolo</a></small></p>
             </div>
         </section>
         <section>
-            <h2>About the Site</h2>
-            <img src="{{IMAGES_URL}}site.jpg" alt="me" />
+            <h2>Colophon</h2>
+            <div class="content">
+            <p>Luxagraf is publishing using a custom content management system written with the <a href="http://docs.djangoproject.com/en/dev/ref/contrib/gis/">GeoDjango framework</a>. The site validates as HTML5 and uses @media rules to handle phones, iPads and the like. It should work in any modern web browser. If you have trouble, let me know.</p>
+            
+            <p>I write in long hand because I am an old man and that's we used to roll. I make the clackity noise in BBEdit, the best text editor ever.</p>
+            
+            <p>Photos are processed with Adobe Lightroom and Photoshop. The galleries were inspired by the lovely <a href="http://www.pictorymag.com/">Pictory</a> photo showcase. Also note that the photos are licensed under the creative commons so you're free to use them so long as you attribute them to me.</p>
+            </div>
+        </section>  
+            
+            {%comment%}
             <div class="content">{%for object in object_list %}{%if forloop.last %}
                 {{object.content|smartypants|safe}}{%endif%} {% endfor %}
             </div>
-        </section>
+        
         <section>
             <h2>Colophon</h2>
             <img src="{{IMAGES_URL}}colo.jpg" alt="me" />
@@ -38,5 +47,6 @@
                 {{object.content|smartypants|safe}}{%endif%} {% endfor %}
             </div>
         </section>
+        {%endcomment%}
     </article>
 {% endblock %}
diff --git a/templates/details/contact.html b/templates/details/contact.html
new file mode 100644
index 0000000..d2106b1
--- /dev/null
+++ b/templates/details/contact.html
@@ -0,0 +1,47 @@
+{% extends 'base.html' %}
+{% load typogrify %}
+
+{% block pagetitle %}Luxagraf: Email{% endblock %}
+{% block metadescription %}{% endblock %}
+{%block bodyid%}id="contact"{%endblock%}
+
+{% block primary %}<section id="page-header">
+        <h1 class="hide">Luxagraf: Email</h1>
+        <nav id="page-nav">
+            <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+                <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
+                <li>Contact</li>
+            </ul>
+        </nav>
+    </section>
+    <section id="contact"> 
+        <article role="main">
+            <header>
+                <h1>Contact Information</h1>
+            </header>
+            <div id="post">
+                <p>I'd love to hear what you think about the posts on luxagraf. Sadly, I suck at email. Or rather I don't have the time to respond the way I would like to, so if you don't hear back from me, or you do but it's five months later and you've entirely forgotten that you even emailed me in the first place, please don't take it personally.</p>
+                
+                <p>Please send your thoughts to:</p>
+                <p>
+                <script type="text/javascript">
+                    //<![CDATA[
+                    <!--
+                    var x="function f(x){var i,o=\"\",ol=x.length,l=ol;while(x.charCodeAt(l/13)!" +
+                    "=69){try{x+=x;l+=l;}catch(e){}}for(i=l-1;i>=0;i--){o+=x.charAt(i);}return o" +
+                    ".substr(0,ol);}f(\")811,\\\"Zofr{i4|m;(%g!$1&^ENUwFG_J@FFD330\\\\100\\\\}zp" +
+                    ";u~t~T/b771\\\\)lfjm=^&E320\\\\030\\\\600\\\\130\\\\230\\\\LH4220\\\\100\\\\"+
+                    "410\\\\N8=(?7,'<610\\\\?>&#)//]600\\\\ULZ]S]410\\\\p720\\\\NCVJ000\\\\771\\" +
+                    "\\ 80xxwdg~}&rjgm010\\\\030\\\\620\\\\320\\\\\\\"(f};o nruter};))++y(^)i(tA" +
+                    "edoCrahc.x(edoCrahCmorf.gnirtS=+o;721=%y;++y)811<i(fi{)++i;l<i;0=i(rof;htgn" +
+                    "el.x=l,\\\"\\\"=o,i rav{)y,x(f noitcnuf\")"                                  ;
+                    while(x=eval(x));
+                    //-->
+                    //]]>
+                </script>
+                </p>
+            </div>
+        </article>
+    </section>
+{% endblock %}
+
diff --git a/templates/details/entry.html b/templates/details/entry.html
index f5387cc..c94485d 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -31,28 +31,46 @@
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span>
                 {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
             </aside>
+            <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
         </header>
         <div id="post-body">
             {{object.body_html|smartypants|widont|safe}}
         </div>{%if object.template_name == 1 %}
         <div class="clearfix"></div>{%endif%}{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
+        {% with object.get_next_published as next %}
+        {% with object.get_previous_published as prev %}
+        <nav id="page-navigation">
+            <table>{% if prev%}
+                <tr>
+                    <td><strong>Previous:</strong></td>
+                    <td><a href="{{ prev.get_absolute_url }}" title="{{prev.title}}">{{prev.title}}</a></td>
+                </tr>{%endif%}
+                <tr>{% if next%}
+                    <td><strong>Next:</strong></td>
+                    <td><a href="{{ next.get_absolute_url }}" title="{{next.title}}">{{next.title}}</a></td>
+                </tr>{%endif%}
+            </table> {%endwith%}{%endwith%}
+        </div>
+        {%comment%}
         <footer id="post-metadata">
             <h4 class="hide">About {{object.title|smartypants|safe}}</h4>
             <p>Posted <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F j, Y"}}</time>, from {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.country_name|slugify}}/1/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}.
             Follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about me, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
         </footer>
+        
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}
         <nav id="page-navigation">
             <ul>{% if next%}
-                <li id="prev">
-                    <a href="{{ next.get_absolute_url }}" title=" {{next.title}}">&larr; newer</a>
+                <li id="prev"><span>Next:</span> 
+                    <a href="{{ next.get_absolute_url }}" title=" {{next.title}}">{{next.title}}</a>
                 </li>{%endif%}
-                {% if prev%}<li id="next">
-                    <a href="{{ prev.get_absolute_url }}" title=" {{prev.title}}">older &rarr;</a>
+                {% if prev%}<li id="next"><span>Previous:</span> 
+                    <a href="{{ prev.get_absolute_url }}" title=" {{prev.title}}">{{prev.title}}</a>
                 </li>{%endif%}
             </ul>
         </nav>{%endwith%}{%endwith%}
+        {% endcomment %}
         {%comment%}
         <section id="comments">
             <h4><a class="disqus-link-count" href="{{object.get_absolute_url}}#disqus_thread">Comments</a></h4>
diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html
index 9596737..cd73b5f 100644
--- a/templates/details/photo_galleries.html
+++ b/templates/details/photo_galleries.html
@@ -31,7 +31,7 @@
         {%for photo in object.photos.all reversed %}
         <article id="image-{{forloop.counter}}"> 
             <h6><a href="#image-{{forloop.counter}}" class="permalink" title="link to this image">&#8734; {{forloop.counter|number_to_word}} &#8734;</a></h6>
-            <img src="{{photo.get_local_slideshow_url}}" alt="{{photo.title}}" title="{{photo.title}}" />
+            <div class="fig"><img src="{{photo.get_local_slideshow_url}}" alt="{{photo.title}}" title="{{photo.title}}" height="{{photo.slideshowimage_height}}" width="{{photo.slideshowimage_width}}" style="margin-left:{{photo.slideshowimage_marginleft}}px; " /></div>
             <div class="figcaption">
                 <div class="caption" id="id-{{photo.id}}">
                     <h3>{{photo.title}} &nbsp;&nbsp;<span>{{photo.exif_date|date:"M j, Y"}}</span></h3>
@@ -39,8 +39,9 @@
                     {%if photo.description %}<p>{{photo.description|safe}}</p> {%endif%}  
                 </div>
                 <div class="photo-options">
-                    <p class="camera">{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == None %}Built-in{%endif%}</p>
-                    <p class="details">{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p>
+                    <p>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == None %}Built-in{%endif%}</p>
+                    <p>{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p>
+                    <!--<p><a href="{{photo.flickr_link}}" title="View this Photo on Flickr.com">View on Flickr</a></p>-->
                     <!--<a href="#" class="exif-link" title="{{photo.id}}">Camera</a>-->
                 </div>
                 
@@ -73,7 +74,7 @@
 {% block js %}
     <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.js"></script>
     <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.scrollTo-1.4.2-min.js"></script>
-    <script type="text/javascript" src="{{MEDIA_URL}}js/slideshow.js" ></script>
+    <script type="text/javascript" src="{{MEDIA_URL}}js/slideshow.pack.js" ></script>
     <!-- if you'd like to see a non-packed version of my slideshow script, see this file: http://media.luxagraf.net/js/slideshow.js (requires jquery, jcarousel and cycle) -->
     <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
 {% endblock%}
-- 
cgit v1.2.3-70-g09d2