From 9c349d82c60d06563e1c1fc52600179f702cebc2 Mon Sep 17 00:00:00 2001
From: Kyle Fuller <inbox@kylefuller.co.uk>
Date: Mon, 14 May 2012 18:17:00 +0100
Subject: Use object.url to get the url for author, category and tags

---
 lightweight/templates/meta.html    | 4 ++--
 lightweight/templates/sidebar.html | 4 ++--
 lightweight/templates/tags.html    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lightweight/templates')

diff --git a/lightweight/templates/meta.html b/lightweight/templates/meta.html
index db29579..db36173 100644
--- a/lightweight/templates/meta.html
+++ b/lightweight/templates/meta.html
@@ -1,5 +1,5 @@
         <details class="meta">
           Publié le <time datetime="{{ article.date.isoformat() }}" pubdate="pubdate">{{ article.locale_date }}</time>
-          {% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>».  
-          {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+          {% if article.author %} par {{ article.author }}{% endif %} dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>».  
+          {% if article.tags %}Mots-clés: {% for tag in article.tags %}{%if loop.index > 1%}, {%endif%}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
         </details> 
diff --git a/lightweight/templates/sidebar.html b/lightweight/templates/sidebar.html
index d73fa91..8e25cbf 100644
--- a/lightweight/templates/sidebar.html
+++ b/lightweight/templates/sidebar.html
@@ -6,7 +6,7 @@
     <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>
+      <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
     {% endfor %}
     </ul>
   </div>
@@ -16,7 +16,7 @@
     <h2>Mots-clés:</h2>
     <ul>
     {% for tag in article.tags %}
-      <li><a href="{{SITEURL}}/tag/{{tag}}.html">{{ tag }}</a></li>
+      <li><a href="{{SITEURL}}/{{tag.url}}">{{ tag }}</a></li>
     {% endfor %}
       <li><a class="more" href="{{SITEURL}}/tags.html">Plus...</a></li>
     </ul>
diff --git a/lightweight/templates/tags.html b/lightweight/templates/tags.html
index 60ac7db..a5d5f9e 100644
--- a/lightweight/templates/tags.html
+++ b/lightweight/templates/tags.html
@@ -6,7 +6,7 @@
 <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>
+    <li><h3><a href="{{SITEURL}}/{{tag.url}}">{{ tag }}</a></h3></li>
 {% endfor %}
 </ul>
 {% endblock %}
-- 
cgit v1.1