From 9b1aa6f9633a507908442821b3769cfd39cc2852 Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Thu, 13 Jan 2011 17:21:22 -0500
Subject: revamped templates, added ARIA roles, meta geo data

---
 templates/archives/homepage.html |  2 +-
 templates/archives/photos.html   |  2 +-
 templates/archives/projects.html | 34 +++++++++++++++++-----------------
 templates/archives/writing.html  |  8 ++++----
 templates/base.html              | 18 ++++++++----------
 templates/details/entry.html     |  9 ++++++---
 6 files changed, 37 insertions(+), 36 deletions(-)

(limited to 'templates')

diff --git a/templates/archives/homepage.html b/templates/archives/homepage.html
index 291433c..898ca01 100644
--- a/templates/archives/homepage.html
+++ b/templates/archives/homepage.html
@@ -8,7 +8,7 @@
 
 {%block bodyid%}id="home"{%endblock%}
 
-{% block primary %}<section id="featured">
+{% block primary %}<section id="featured" class="archive">
         <article id="featured-intro">
             <h1><a href="{{featured.get_absolute_url}}" title="{%if featured.title_keywords%}{{featured.title_keywords}}{%else%}{{featured.title}}{%endif%}">{{featured.title|smartypants|widont|safe}}</a></h1>
             <p class="dateline">
diff --git a/templates/archives/photos.html b/templates/archives/photos.html
index eeb6451..e8a881d 100644
--- a/templates/archives/photos.html
+++ b/templates/archives/photos.html
@@ -10,7 +10,7 @@
 
 {% block primary %}<section id="page-header">
         <h1 class="hide">{% if region %}Photographs from {{region.name|title|smartypants|safe}}{%else%}Photographs from Around the World {%endif%}</h1>
-        <nav>
+        <nav id="page-nav">
             <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
                <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr;</li>
                {% if region %}{%if region.name == 'United States'%} <li><a href="/photos/" title="See all Photos" itemprop="url"><span itemprop="title">Photos</span></a> &rarr;</li>
diff --git a/templates/archives/projects.html b/templates/archives/projects.html
index b253ad1..3b2dd9a 100644
--- a/templates/archives/projects.html
+++ b/templates/archives/projects.html
@@ -7,28 +7,28 @@
 				
 {% block primary %}
 <article>
-    <ul id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
-        <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr;</li>
-        <li>Projects</li>
-    </ul>
+    <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>Projects</li>
+        </ul>
+    </nav>
     <h1 class="hide">Projects</h1>
     <div class="top"><p class="col">These are a few of the things that I use to inspire myself to do more. The truth is, just about <a href="http://www.youtube.com/watch?v=8r1CZTLk-Gk" title="Louis CK talking about how everything is amazing">everything is amazing</a> when viewed from the proper perspective. </p>
     
     <p class="col two">The projects on luxagraf are more or less goals I've created in effort to get my body in motion, because the difference between the mundane and the amazing is often simply motion. To move is to do, and to do is to live.</p></div>
-    <div class="break"></div>
-    {%for project in object_list %}
-    <ul class="project-tease">
-        <li>
-            <div class="tease">
-                <h3><a href="{{project.get_absolute_url}}">{{project.title|safe}}{{project.subtitle|safe}}</a></h3> 
-             
-                <div class="lede hyphenate">{{project.lede|smartypants|safe}}</div>
-                <span class="button"><a href="{{project.get_absolute_url}}">More&nbsp;&raquo;</a></span>
+    
+    
+    <section id="projects-archive" class="archive">  {%for object in object_list %}
+        <article>
+            <h1><a href="{{object.get_absolute_url}}" title="{{object.title}}">{{object.title|safe}} {{object.subtitle|safe}}</a></h1>
+            <div class="img">
+                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.image.url}}" alt="{{ object.title }}" class="post-image" /></a>
             </div>
-            <div class="img"><img src="{{project.image.url}}"  /></div>
-        </li>
-    </ul>
-    {% endfor %}
+            <div class="hyphenate">{{object.lede|smartypants|safe}}</div>
+            <span class="button"><a href="{{project.get_absolute_url}}">More&nbsp;&raquo;</a></span>
+        </article> {% endfor %}
+    </section>
 
 </article>
 {% endblock %}
diff --git a/templates/archives/writing.html b/templates/archives/writing.html
index ce20dc6..f950b8b 100644
--- a/templates/archives/writing.html
+++ b/templates/archives/writing.html
@@ -18,18 +18,18 @@
             </ul>
         </nav>
     </section>
-    <section id="writing-archive"> {% autopaginate object_list 10 %} {% for object in object_list %}
+    <section id="writing-archive" class="archive"> {% autopaginate object_list 10 %} {% for object in object_list %}
         <article>
             <h1><a href="{{object.get_absolute_url}}" title="{%if object.title_keywords%}{{object.title_keywords}}{%else%}{{object.title}}{%endif%}">{{object.title|smartypants|widont|safe}}</a></h1>
+            <div class="img">
+                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="post-image" /></a>
+            </div>
             <p class="dateline">
                 <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​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%}
                 <meta itemprop="latitude" content="{{object.latitude}}" />
                 <meta itemprop="longitude" content="{{object.longitude}}" /></span> &nbsp;
                 <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"m/d/y"}}</time>
             </p>
-            <div class="img">
-                <a href="{{object.get_absolute_url}}" title="{{object.title}}"><img src="{{object.get_image_url}}" alt="{{ object.title }}" class="post-image" /></a>
-            </div>
             <p class="hyphenate">{{object.dek|safe}}</p>
         </article> {% endfor %}
     </section>
diff --git a/templates/base.html b/templates/base.html
index 2785d42..ec35269 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -33,18 +33,18 @@
           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%}
 </head>
-
 <body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}>
-    <header>
+    <header role="banner">
         <a id="logo" href="/" title="home">
             <hgroup>
                 <h1>Luxagraf</h1>
                 <h2>{a travelogue}</h2>
             </hgroup>
         </a>
-        <nav>
+        <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>
@@ -54,13 +54,9 @@
             </ul>
         </nav>
     </header>
-    {% block primary %}
-    <article>
-    
-    </article>
-    {% endblock %}
-    {% block extrabody %} {% endblock %}
-    <footer>
+    {% block primary %}{% endblock %}
+    {% block extrabody %}{% endblock %}
+    <footer role="contentinfo">
         <nav>
             <ul>
                 <li><a href="http://feeds2.feedburner.com/luxagraf/blog" title="RSS feed">RSS</a></li>
@@ -74,6 +70,7 @@
         </p>
     </footer>
     {% block js %}{% endblock%}
+    {%comment%}
     <script type="text/javascript">
     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
@@ -83,5 +80,6 @@
     var pageTracker = _gat._getTracker("UA-1186171-1");
     pageTracker._trackPageview();
     } catch(err) {}</script>
+    {%endcomment%}
 </body>
 </html>
diff --git a/templates/details/entry.html b/templates/details/entry.html
index de27df2..7952b9f 100644
--- a/templates/details/entry.html
+++ b/templates/details/entry.html
@@ -26,11 +26,14 @@
 								
 				
 {% block primary %}		
-    <article id="writing-detail">
+    <article role="main">
         <header>
             <h1>{{object.title|smartypants|widont|safe}}</h1>
-            <aside class="meta">
-                <p class="geo">{%spaceless%}{% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.location.state.name}}</a>{%else%}{{object.location.name|smartypants|safe}}, <a href="/writing/{{object.location.state.country.slug}}/1/" title="travel writing from {{object.location.state.country.name}}">{{object.location.state.country.name}}</a>{%endif%} <span class="latitude hide">{{object.latitude}}</span> <span class="longitude hide">{{object.longitude}}</span>{%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}{%endspaceless%}</p>
+            <aside class="geo">
+                <span class="location" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/​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%}
+                <meta itemprop="latitude" content="{{object.latitude}}" />
+                <meta itemprop="longitude" content="{{object.longitude}}" /></span>
+                {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
             </aside>
         </header>
         <div id="post-body">
-- 
cgit v1.2.3-70-g09d2