1 files changed, 26 insertions, 19 deletions

diff --git a/templates/article.html b/templates/article.html
index d558183..630323b 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,4 +1,14 @@
 {% extends "base.html" %}
+{% block menu %}
+      | <a href="{{ SITEURL }}">Home</a> |
+      {% for p in PAGES %}
+      | <a href="{{ SITEURL}}/{{p.url}}">{{p.title}}</a> |
+      {% endfor %}
+{% endblock %}
+{% block article %}
+<h1><a href="{{ SITEURL }}/{{ article.url}}">{{
+    article.title |striptags }}</a></h1>
+{% endblock %}
 {% block head %}
   {{ super() }}
   {% for keyword in article.keywords %}
@@ -12,37 +22,34 @@
   {% for tag in article.tags %}
     <meta name="tags" content="{{tag}}" />
   {% endfor %}
-
 {% endblock %}
 
 {% block content %}
 <section id="content" class="body">
-  <header>
-    <h2 class="entry-title">
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
- {% import 'translations.html' as translations with context %}
- {{ translations.translations_for(article) }}
-  </header>
   <footer class="post-info">
-    <abbr class="published" title="{{ article.date.isoformat() }}">
-      {{ article.locale_date }}
+     <p> Posted on {{ article.date|strftime('%b %d, %Y')}}
+      {% if article.authors %} By {{ article.author }}
+       {% endif %}
+       {% if article.category %} under {{ article.category }}
+       {% endif %}
+     </p>
     </abbr>
-	{% if article.modified %}
+    {% if article.modified %}
     <abbr class="modified" title="{{ article.modified.isoformat() }}">
-      {{ article.locale_modified }}
+      Modified on {{ article.locale_modified }}
     </abbr>
-	{% endif %}
-    {% if article.authors %}
-    <address class="vcard author">
-      By {% for author in article.authors %}
-          <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
-        {% endfor %}
-    </address>
     {% endif %}
   </footer><!-- /.post-info -->
   <div class="entry-content">
     {{ article.content }}
   </div><!-- /.entry-content -->
+  <div id="footer">
+    <p>
+      <italic>Tagged as:
+      {% for t in article.tags|sort %}
+      {{t}}, 
+	{% endfor %}
+      </italic>
+    </p>
 </section>
 {% endblock %}