1 files changed, 24 insertions, 51 deletions
diff --git a/templates/base.html b/templates/base.html
index 5af83ff..9ec5e3f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,16 +4,10 @@
 <head>
     <title>{% block pagetitle %}Luxagraf - Topografical Writings{% endblock %}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <script>
-      document.createElement('header');
-      document.createElement('nav');
-      document.createElement('section');
-      document.createElement('article');
-      document.createElement('aside');
-      document.createElement('footer');
-      document.createElement('time');
-      document.createElement('hgroup');
-    </script>
+    
+    <!--[if IE]>
+    <script src="{{media_url}}js/html5.js"></script>
+    <![endif]-->
 
 
     <link rel="alternate" 
@@ -23,10 +17,11 @@
 
 
     <link rel="stylesheet" 
-          href="{{media_url}}/css/base.css" 
+          href="{{media_url}}css/base.css" 
           type="text/css" 
-          media="screen" 
-          charset="utf-8">
+          media="screen">
+          
+    {%block stylesheet%}{%endblock%}
 
 <!--[if IE 6]><link rel="stylesheet" href="http://new.luxagraf.net/media/css/ie6.css" type="text/css" media="screen, projection"><![endif]-->
        
@@ -58,24 +53,18 @@
 
 <body {%block bodyid%}{%endblock%}{%block bodyevents%}{%endblock%}>
     <header>
-        <nav>
-            <ul>
-                <li id="stories"><a href="/writing/1/" title="An archive of previous writings from around the world">Writing</a></li>
-                <li id="photos" title="Photos from travels around the world"><a href="/photos/1/">Photos</a></li>
-                <li id="map" title="Maps and miscellanea"><a href="/map/">Maps</a></li>
-                
-            </ul>
-        </nav>
         <hgroup>
+
             <h1><a href="/" title="home">Luxagraf</a></h1>
-            <h2>{a travelogue}</h2>
+            <h2><a href="/about/" title="About Luxagraf">{a travelogue}</a></h2>
         </hgroup>
-        <nav class="rt">
+        <nav>
             <ul>
-                <li id="projects" title="Luxagraf: Projects (coming soon)"><a href="/projects/">Projects</a></li>
-                <li id="contact" title="How to get in touch"><a href="/contact/">Contact</a></li>
-                <li id="about" title="About Luxagraf"><a href="/about/">About</a></li>
-
+                <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="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>
         </nav>
     </header>
@@ -87,35 +76,19 @@
     {% endblock %}
     {% block extrabody %} {% endblock %}
     
-    <div id="clearfix"></div>
+    <div class="clearfix"></div>
     <footer>
+        <section id="license">
+            <p>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></p>
+        </section>
         <nav>
             <ul>
-                <li><a href="/">Home</a></li>
-                <li><a href="/writing/1/">Writing</a></li>
-                <li><a href="/map/">Map</a></li>
-                <li><a href="/photos/1/">Photographs</a></li>
-                <li><a href="/projects/">Projects</a></li>
-                <li><a href="/contact/">Contact</a></li>
+                <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://www.flickr.com/photos/luxagraf" rel="me" title="luxagraf on Flickr">Flickr</a></li>
+                <li><a href="/contact/" tile="contact luxagraf">Contact</a></li>
             </ul>
         </nav>
-        <div>
-            <section id="about-lux">
-                <h4>About</h4>
-                {% chunk "about_sidebar" %}
-            </section>
-            <section>
-                <h4>Places</h4>
-                {% chunk "regions_sidebar" %}
-            </section>
-            <section>
-                <h4>Follow</h4>
-                {% chunk "follow_sidebar" %}
-            </section>
-            <section id="license">
-                <p>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></p>
-            </section>
-        </div>
     </footer>
     {% block js %}{% endblock%}
     <script type="text/javascript">