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

---
 waterspill/templates/article.html | 4 ++--
 waterspill/templates/base.html    | 4 ++--
 waterspill/templates/index.html   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'waterspill')

diff --git a/waterspill/templates/article.html b/waterspill/templates/article.html
index 975d441..baa42cf 100644
--- a/waterspill/templates/article.html
+++ b/waterspill/templates/article.html
@@ -11,9 +11,9 @@
   {{ article.content }}	
   {% include 'twitter.html' %}
       
-      <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3>
+      <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3>
 	<h3 class="blogMeta">Tags : {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
+<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
 {% endfor %}</h3>
     
     </div><!-- end #blogItem -->
diff --git a/waterspill/templates/base.html b/waterspill/templates/base.html
index 0ec8d25..1f9049d 100644
--- a/waterspill/templates/base.html
+++ b/waterspill/templates/base.html
@@ -53,7 +53,7 @@
     <h3>Categories</h3>
     <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>
     {% if LINKS %}
@@ -84,7 +84,7 @@
         <h3>Tags</h3>
         <ul>
         {% for tag, articles in tags %}
-                <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li>
+                <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
         {% endfor %}
         </ul>
 </li>
diff --git a/waterspill/templates/index.html b/waterspill/templates/index.html
index bbc6a1f..d7bd1e3 100644
--- a/waterspill/templates/index.html
+++ b/waterspill/templates/index.html
@@ -13,9 +13,9 @@
       {{ article.content }}	
 
       
-      <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3>
+      <h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3>
 	<h3 class="blogMeta">Tags : {% for tag in article.tags %}
-<span><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> / </span>
+<span><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> / </span>
 {% endfor %}</h3>
     
     </div><!-- end #blogItem -->
@@ -31,7 +31,7 @@
       <h3>Le {{ article.locale_date }}</h3>
       
       {{ article.summary }}	
-<h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></h3>
+<h3 class="blogMeta">Par <a href="#">{{ article.author }}</a>, Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></h3>
 	<a href="{{ SITEURL }}/{{ article.url }}">Lire la suite …</a>
       
       
-- 
cgit