9 files changed, 170 insertions, 21 deletions
diff --git a/lightweight/templates/archives.html b/lightweight/templates/archives.html
index e69de29..4d6234f 100644
--- a/lightweight/templates/archives.html
+++ b/lightweight/templates/archives.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{%block title %}{{ SITENAME }} - Archives{%endblock%}
+
+{% block content %}
+  <h2 class="page_title">Archives</h1>
+  <table id="archives">
+    <tbody>
+      <tr>
+        <th>Date</th>
+        <th>Article</th>
+      </tr>
+  {% for article in dates %}
+      <tr>
+        <td>{{ article.date.strftime(DEFAULT_DATE_FORMAT or '%a %d %B %Y') }}</td>
+        <td><a href='{{ article.url }}'>{{ article.title }}</a></td>
+      </tr>
+  {% endfor %}
+    </tbody>
+  </table>
+{% endblock %}
diff --git a/lightweight/templates/article.html b/lightweight/templates/article.html
index b4d872e..68556bf 100644
--- a/lightweight/templates/article.html
+++ b/lightweight/templates/article.html
@@ -1,17 +1,31 @@
 {% extends "base.html" %}
+
 {% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
 
-{% block content %}
-    <article class="post">
-      <h2 class="page_title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
-      <details class="meta">
-        <p>
-        Posté{%if article.date %} le <time pubdate="pubdate" datetime="{{ article.date }}">{{ article.locale_date }}</time>{% endif %}{% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>».
-        {% if articles.tags %}<br />Tags : {% for tag in article.tags %}{% if loop.index > 1%}, {% endif %}<span class="tag"><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></span>{% endfor %}{%endif%}
-        </p>
-      </details>
-      <section class="post_content">
+{% block content %}        
+  <article class="post">
+        <h2 class="page_title"><a href="{{ article.url }}" rel="bookmark" title="{{SITENAME}} - {{ article.title }}">{{ article.title }}</a></h2>
+
+        <section class="post_content">
         {{ article.content }}
-      </section>
-    </article>
+        </section>
+
+      {%include 'meta.html'%}
+  </article>
+
+        {% if DISQUS_SITENAME %}
+        <div class="comments">
+        <h2>Commentaires:</h2>
+            <div id="disqus_thread"></div>
+            <script type="text/javascript">
+               var disqus_identifier = "{{ article.url }}";
+               (function() {
+               var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+               dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+              })();
+            </script>
+        </div>
+        {% endif %}
+
 {% endblock %}
diff --git a/lightweight/templates/base.html b/lightweight/templates/base.html
index 14a0d11..a2d3a9f 100644
--- a/lightweight/templates/base.html
+++ b/lightweight/templates/base.html
@@ -6,7 +6,18 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <link rel="stylesheet" href="{{ SITEURL }}/theme/css/main.css" type="text/css" />
   <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} - Flux ATOM" />
-</html>
+  {% if GOOGLE_ANALYTICS %}
+  <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"));
+    </script>
+    <script type="text/javascript">
+    try {
+        var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
+    pageTracker._trackPageview();
+    } catch(err) {}</script>
+  {% endif %}
+</head>
 <body>
 <div id="page">
 
diff --git a/lightweight/templates/category.html b/lightweight/templates/category.html
index e69de29..764a6f9 100644
--- a/lightweight/templates/category.html
+++ b/lightweight/templates/category.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% block title %}{{ SITENAME }} - {{ category}}{% endblock %}
+
+{% block content %}
+ <h2 class="page_title">Articles dans la catégorie «{{ category }}»</h2>
+ {% if articles %}
+  {% for article in articles %} 
+    <article class="post">
+      <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
+      {%include 'meta.html'%}
+
+      <section class="post_content">
+        {{ article.summary }}<br />
+        <a class="more" href="{{ SITEURL }}/{{ article.url }}">Lire la suite...</a>
+      </section>
+    </article>
+  {% endfor %}
+ {% endif %}
+{% endblock %}
diff --git a/lightweight/templates/index.html b/lightweight/templates/index.html
index b51a318..d5879bd 100644
--- a/lightweight/templates/index.html
+++ b/lightweight/templates/index.html
@@ -6,12 +6,7 @@
   {% for article in articles %} 
     <article class="post">
       <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
-      <details class="meta">
-        <p>
-        Posté{%if article.date %} le <time pubdate="pubdate" datetime="{{ article.date }}">{{ article.date }}</time>{% endif %}{% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>».
-        {% if articles.tags %}<br />Tags : {% for tag in article.tags %}{% if loop.index > 1%}, {% endif %}<span class="tag"><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></span>{% endfor %}{%endif%}
-        </p>
-      </details>
+      {%include 'meta.html'%}
 
       <section class="post_content">
         {{ article.summary }}<br />
diff --git a/lightweight/templates/menu.html b/lightweight/templates/menu.html
index 88d5d7a..9a9d011 100644
--- a/lightweight/templates/menu.html
+++ b/lightweight/templates/menu.html
@@ -4,6 +4,10 @@
     {% for p in PAGES %}
   <a {% if p == page %}class="active" {% endif %}href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a>
     {% endfor %}
+  {% else %}
+  <a href="{{ SITEURL }}/categories.html">Catégories</a>
+  <a href="{{ SITEURL }}/tags.html">Mots-clés</a>
   {% endif %}
+  <a href="{{ SITEURL }}/archives.html">Archives</a>
 
 </nav> <!-- /#nav -->
diff --git a/lightweight/templates/sidebar.html b/lightweight/templates/sidebar.html
index 964b43c..d73fa91 100644
--- a/lightweight/templates/sidebar.html
+++ b/lightweight/templates/sidebar.html
@@ -1,5 +1,59 @@
 <aside id="sidebar">
-  <h2>Sidebar</h2>
-{% block sidebar %}
+{% block sidebar_header %}
 {% endblock %}
+
+  <div class="widget" id="categories">
+    <h2>Catégories</h2>
+    <ul>
+    {% for cat, null in categories %}
+      <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+    {% endfor %}
+    </ul>
+  </div>
+
+  {% if article  and article.tags %}
+  <div class="widget" id="tags">
+    <h2>Mots-clés:</h2>
+    <ul>
+    {% for tag in article.tags %}
+      <li><a href="{{SITEURL}}/tag/{{tag}}.html">{{ tag }}</a></li>
+    {% endfor %}
+      <li><a class="more" href="{{SITEURL}}/tags.html">Plus...</a></li>
+    </ul>
+  </div>
+  {%endif%}
+  
+  {% if LINKS %}
+  <div class="widget" id="blogroll">
+    <h2>Liens</h2>
+    <ul>
+    {% for name, link in LINKS %}
+      <li><a href="{{ link }}">{{ name }}</a></li>
+    {% endfor %}
+    </ul>
+  </div>
+  {% endif %}
+
+  {% if SOCIAL %}
+    <div class="widget" id="social">
+      <h2>Réseaux sociaux</h2>
+      <ul>
+        {% for name, link in SOCIAL %}
+        <li><a href="{{ link }}">{{ name }}</a></li>
+        {% endfor %}
+       </ul>
+    </div>
+ {% endif %}
+
+ {% if FEED or FEED_RSS %}
+    <div class="widget" id="subscribe">
+    <h2>S'abonner</h2>
+      <ul>
+        <li><a href="{{ SITEURL }}/{{ FEED }}" rel="alternate">Flux ATOM</a></li>
+        {% if FEED_RSS %}
+        <li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux RSS</a></li>
+        {% endif %}
+      </ul>
+    </div>
+  {% endif %}
 </aside>
diff --git a/lightweight/templates/tag.html b/lightweight/templates/tag.html
index e69de29..cb5038c 100644
--- a/lightweight/templates/tag.html
+++ b/lightweight/templates/tag.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% block title %}{{ SITENAME }} - «{{ tag }}»{% endblock %}
+
+{% block content %}
+ <h2 class="page_title">Articles avec le mot-clé «{{ tag }}»</h2>
+ {% if articles %}
+  {% for article in articles %} 
+    <article class="post">
+      <h2 class="title"><a href="{{ SITEURL }}/{{ article.url}}">{{ article.title }}</a></h2>
+      {%include 'meta.html'%}
+
+      <section class="post_content">
+        {{ article.summary }}<br />
+        <a class="more" href="{{ SITEURL }}/{{ article.url }}">Lire la suite...</a>
+      </section>
+    </article>
+  {% endfor %}
+ {% endif %}
+{% endblock %}
diff --git a/lightweight/templates/tags.html b/lightweight/templates/tags.html
index e69de29..60ac7db 100644
--- a/lightweight/templates/tags.html
+++ b/lightweight/templates/tags.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Mots-clés{% endblock %}
+
+{% block content %}
+<h2 class="page_title">Liste des mots-clés</h2>
+<ul id="tag_list">
+{% for tag, articles in tags %}
+    <li><h3><a href="{{SITEURL}}/tag/{{tag}}.html">{{ tag }}</a></h3></li>
+{% endfor %}
+</ul>
+{% endblock %}