Use object.url to get the url for author, category and tags

42 files changed, 74 insertions, 74 deletions

diff --git a/Just-Read/templates/archives.html b/Just-Read/templates/archives.html
index 72fd2a5..e4f26b8 100644
--- a/Just-Read/templates/archives.html
+++ b/Just-Read/templates/archives.html
@@ -30,7 +30,7 @@
 		<h2>Tags</h2>
 		<ul class="tag">
 		{% for tag in tag_cloud|sort %}
-		    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+		    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
 		{% endfor %}
 		</ul>
 	</div>
@@ -43,4 +43,4 @@
 		$("#jquerytabs").tabs();
 	});
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/Just-Read/templates/metadata.html b/Just-Read/templates/metadata.html
index c051c75..b4865f8 100644
--- a/Just-Read/templates/metadata.html
+++ b/Just-Read/templates/metadata.html
@@ -1,12 +1,12 @@
 <div class="meta wrapper">
 	<time datetime="{{ article.date.isoformat() }}" pubdate>{{ article.locale_date }}</time>
 	<ul class="tag clearfix">
-		<li><a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></li>
+		<li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li>
 {% if article.tags %}
 	{% 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 %}
 {% endif %}
 	</ul>
 	{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">Download the .pdf</a></p>{% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/Just-Read/templates/tags.html b/Just-Read/templates/tags.html
index 8ddbcd1..27240ef 100644
--- a/Just-Read/templates/tags.html
+++ b/Just-Read/templates/tags.html
@@ -8,10 +8,10 @@
 	
 	<ul class="tag">
     {% for tag in tag_cloud %}
-        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
     {% endfor %}
 	</ul>
 
 </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html
index 5710a5e..9458d6e 100644
--- a/bootstrap/templates/base.html
+++ b/bootstrap/templates/base.html
@@ -35,7 +35,7 @@
 					{% endfor %}
 				{% endif %}
 				{% 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>
 			<p class="pull-right"><a href="{{ SITEURL }}/archives.html">[archives]</a> <a href="{{ SITEURL }}/tags.html">[tags]</a></p>
@@ -73,4 +73,4 @@
    
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/bootstrap/templates/categories.html b/bootstrap/templates/categories.html
index 4500237..de7cbc3 100644
--- a/bootstrap/templates/categories.html
+++ b/bootstrap/templates/categories.html
@@ -3,7 +3,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-	<li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</a></li>
+	<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/bootstrap/templates/metadata.html b/bootstrap/templates/metadata.html
index 876df8f..8c9f261 100644
--- a/bootstrap/templates/metadata.html
+++ b/bootstrap/templates/metadata.html
@@ -1,4 +1,4 @@
 Permalink: <a class="more" href="{{ SITEURL }}/{{ article.url }}">{{ article.date }}</a>
-{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>{% endif %}
-in <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
-{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %}{% endif %}
+{% if article.author %}by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>{% endif %}
+in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+{% if article.tags %}tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}{% endif %}
diff --git a/bootstrap/templates/tags.html b/bootstrap/templates/tags.html
index a3b37be..d481bc3 100644
--- a/bootstrap/templates/tags.html
+++ b/bootstrap/templates/tags.html
@@ -3,7 +3,7 @@
 {% block content %}
 <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>
 {% endblock %}
diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html
index 3e42e65..26195f7 100644
--- a/bootstrap2/templates/base.html
+++ b/bootstrap2/templates/base.html
@@ -82,7 +82,7 @@
               {% endif %}
               {% for cat, null in categories %}
                   <li {% if cat == category %}class="active"{% endif %}>
-                    <a href="{{ SITEURL }}/category/{{ cat }}.html">
+                    <a href="{{ SITEURL }}/{{ cat.url }}">
 						<i class="icon-folder-open icon-large"></i>{{ cat }}
 					</a>
                   </li>
diff --git a/bootstrap2/templates/sidebar.html b/bootstrap2/templates/sidebar.html
index fb94733..ae2e009 100644
--- a/bootstrap2/templates/sidebar.html
+++ b/bootstrap2/templates/sidebar.html
@@ -19,7 +19,7 @@
 <li class="nav-header"><h4><i class="icon-folder-close icon-large"></i>Categories</h4></li>
 {% for cat, null in categories %}
 <li>
-<a href="{{ SITEURL }}/category/{{ cat }}.html">
+<a href="{{ SITEURL }}/{{ cat.url }}">
     <i class="icon-folder-open icon-large"></i>{{ cat }}
 </a>
 </li>
@@ -28,7 +28,7 @@
 <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
 {% for tag in tag_cloud %}
 <li class="tag-{{ tag.1 }}">
-    <a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">
+    <a href="{{ SITEURL }}/{{ tag.0.url }}">
         <i class="icon-tag icon-large"></i>{{ tag.0 }}
     </a>
 </li>
@@ -40,4 +40,4 @@
 {% if SIDEBAR_CUSTOM %}
     {{ SIDEBAR_CUSTOM }}
 {% endif %}
-</ul>
\ No newline at end of file
+</ul>
diff --git a/bootstrap2/templates/tags.html b/bootstrap2/templates/tags.html
index 6e8a22f..862eff6 100644
--- a/bootstrap2/templates/tags.html
+++ b/bootstrap2/templates/tags.html
@@ -4,10 +4,10 @@
 <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
 {% for tag in tag_cloud %}
 <li class="tag-{{ tag.1 }}">
-	<a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">
+	<a href="{{ SITEURL }}/{{ tag.0.url }}">
 		<i class="icon-tag icon-large"></i>{{ tag.0 }}
 	</a>
 </li>
 {% endfor %}
 </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/brownstone/templates/article.html b/brownstone/templates/article.html
index 2458ecb..dd07404 100644
--- a/brownstone/templates/article.html
+++ b/brownstone/templates/article.html
@@ -4,9 +4,9 @@
                         	<div id="content">
 					<div class="post">
 						<h2 class="title"><a href="{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+						<p class="meta"><span class="date">Le {{ article.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></p>
 					<p class="meta">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 %}</p>	
 						<div style="clear: both;">&nbsp;</div>
 						<div class="entry">
diff --git a/brownstone/templates/base.html b/brownstone/templates/base.html
index cd7cc7b..1da0c60 100644
--- a/brownstone/templates/base.html
+++ b/brownstone/templates/base.html
@@ -50,7 +50,7 @@ Released   : 20100928
 							<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>
 						</li>
@@ -82,7 +82,7 @@ Released   : 20100928
 						        <h2>Tags</h2>
 						        <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/brownstone/templates/index.html b/brownstone/templates/index.html
index 3ec1781..fbe7476 100644
--- a/brownstone/templates/index.html
+++ b/brownstone/templates/index.html
@@ -7,9 +7,9 @@
 				<div id="content">
 					<div class="post">
 						<h2 class="title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
-						<p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></span></p>
+						<p class="meta"><span class="date">Le {{ article.date.locale_date }} </span><span class="posted">Par <a href="#">{{ article.author }}</a></span><span>&nbsp; | Catégorie : <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></p>
 					<p class="meta">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 %}</p>
 						<div style="clear: both;">&nbsp;</div>
 						<div class="entry">
diff --git a/dev-random/templates/article.html b/dev-random/templates/article.html
index ab5679c..6048b5a 100644
--- a/dev-random/templates/article.html
+++ b/dev-random/templates/article.html
@@ -22,8 +22,8 @@
           </a>
         </h1>
         <div class="meta">
-            Dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>» 
-            par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a>
+            Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» 
+            par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a>
         </div>
       </header>
       <div class="post-content"> 
@@ -31,9 +31,9 @@
       </div>
       <footer class="post-footer">
         <div class="meta">
-            Posté dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>» 
-            par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a><br />
-            Mots-clés: {% for tag in article.tags %} #<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}
+            Posté dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» 
+            par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a><br />
+            Mots-clés: {% for tag in article.tags %} #<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}
         </div>
       </footer>
       {% if DISQUS_SITENAME %}
diff --git a/dev-random/templates/index.html b/dev-random/templates/index.html
index 11314d1..aeb5986 100644
--- a/dev-random/templates/index.html
+++ b/dev-random/templates/index.html
@@ -18,8 +18,8 @@
             </a>
           </h1>
           <div class="meta">
-              Dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>» 
-              par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a>
+              Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>» 
+              par <a href="{{ SITEURL }}/{{article.author.url}}">{{ article.author}}</a>
           </div>
         </header>
         <div class="post-content"> 
diff --git a/dev-random/templates/tags.html b/dev-random/templates/tags.html
index b95d401..5d8a8c7 100644
--- a/dev-random/templates/tags.html
+++ b/dev-random/templates/tags.html
@@ -7,7 +7,7 @@
       <h1>Mots-clés</h1>
       <ul id="tagslist">
       {% for tag in tag_cloud %}
-        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
       {% endfor %}
       </ul>
     </section>
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 %}
diff --git a/martyalchin/templates/article.html b/martyalchin/templates/article.html
index f5c6591..b6ec1c0 100644
--- a/martyalchin/templates/article.html
+++ b/martyalchin/templates/article.html
@@ -7,7 +7,7 @@
      By <a class="url fn" href="#">{{ article.author }}</a>
     {% endif %}
      on <a>{{ article.date.locale_date }}</a>
-     about <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+     about <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
     </div>
     {{ article.content }}
 {% endblock %}
diff --git a/mnmlist/templates/categories.html b/mnmlist/templates/categories.html
index 78362e4..e29be0c 100644
--- a/mnmlist/templates/categories.html
+++ b/mnmlist/templates/categories.html
@@ -2,7 +2,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-    <li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</a></li>
+    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
 {% endfor %}
 </ul>
 {% endblock %}
diff --git a/mnmlist/templates/taglist.html b/mnmlist/templates/taglist.html
index 0f4862d..c792fd7 100644
--- a/mnmlist/templates/taglist.html
+++ b/mnmlist/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}
diff --git a/mnmlist/templates/tags.html b/mnmlist/templates/tags.html
index 5bee1e1..a6011a0 100644
--- a/mnmlist/templates/tags.html
+++ b/mnmlist/templates/tags.html
@@ -2,7 +2,7 @@
 {% block content %}
 <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>
 {% endblock %}
diff --git a/notmyidea-cms-fr/templates/article.html b/notmyidea-cms-fr/templates/article.html
index 501bb95..24767dd 100644
--- a/notmyidea-cms-fr/templates/article.html
+++ b/notmyidea-cms-fr/templates/article.html
@@ -16,7 +16,7 @@
                         Par <a class="url fn" href="#">{{ article.author }}</a>
                 </address>
                 {% endif %}
-                <p>Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. 
+                <p>Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. 
         {% include 'taglist.html' %}
         </footer><!-- /.post-info -->
         {{ article.content }}
diff --git a/notmyidea-cms-fr/templates/base.html b/notmyidea-cms-fr/templates/base.html
index 12db9ca..b954762 100644
--- a/notmyidea-cms-fr/templates/base.html
+++ b/notmyidea-cms-fr/templates/base.html
@@ -38,7 +38,7 @@
                 {% endfor %}
                 {% endif %}
                 {#{% 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></nav>
         </header><!-- /#banner -->
@@ -51,7 +51,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>
diff --git a/notmyidea-cms-fr/templates/index.html b/notmyidea-cms-fr/templates/index.html
index ab68f81..1216f24 100644
--- a/notmyidea-cms-fr/templates/index.html
+++ b/notmyidea-cms-fr/templates/index.html
@@ -18,7 +18,7 @@
                                 Par <a class="url fn" href="#">{{ article.author }}</a>
                         </address>
                         {% endif %}
-                <p>Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">télécharger le PDF</a>{% endif %}</p>
+                <p>Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">télécharger le PDF</a>{% endif %}</p>
                 {% include 'taglist.html' %}
                 </footer><!-- /.post-info -->
                 {{ article.content }}
@@ -43,7 +43,7 @@
                         <address class="vcard author">
                                 Par <a class="url fn" href="#">{{ article.author }}</a>
                         </address>
-                        <p> Dans <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></p>
+                        <p> Dans <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
                         {% include 'taglist.html' %}
                     <p>{% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a>{% endif %}</p>
                 </footer><!-- /.post-info -->
diff --git a/notmyidea-cms-fr/templates/taglist.html b/notmyidea-cms-fr/templates/taglist.html
index 8ca52db..f1238b6 100644
--- a/notmyidea-cms-fr/templates/taglist.html
+++ b/notmyidea-cms-fr/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">Télécharger le PDF</a>{% endif %}</p>
diff --git a/notmyidea-cms/templates/article_infos.html b/notmyidea-cms/templates/article_infos.html
index e1803be..a1993a0 100644
--- a/notmyidea-cms/templates/article_infos.html
+++ b/notmyidea-cms/templates/article_infos.html
@@ -5,10 +5,10 @@
 
         {% if article.author %}
         <address class="vcard author">
-                By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
+                By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
         </address>
         {% endif %}
-<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
 {% include 'taglist.html' %}
 {% include 'translations.html' %}
 </footer><!-- /.post-info -->
diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html
index 8f3d20e..02833f6 100644
--- a/notmyidea-cms/templates/base.html
+++ b/notmyidea-cms/templates/base.html
@@ -37,7 +37,7 @@
                 {% endfor %}
                 {% endif %}
                 {#{% 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></nav>
         </header><!-- /#banner -->
@@ -50,7 +50,7 @@
                         <h2>Categories</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>
diff --git a/notmyidea-cms/templates/taglist.html b/notmyidea-cms/templates/taglist.html
index 4259077..7ed6bf1 100644
--- a/notmyidea-cms/templates/taglist.html
+++ b/notmyidea-cms/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
diff --git a/sneakyidea/templates/article_infos.html b/sneakyidea/templates/article_infos.html
index b5af6c5..d7cb534 100644
--- a/sneakyidea/templates/article_infos.html
+++ b/sneakyidea/templates/article_infos.html
@@ -6,10 +6,10 @@
 
         {% if article.author %}
         <address class="vcard author">
-                By <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
+                By <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
         </address>
         {% endif %}
-<p>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
+<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>. {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
 {% include 'taglist.html' %}
 {{ translations.translate(article) }}
 </footer><!-- /.post-info -->
diff --git a/sneakyidea/templates/base.html b/sneakyidea/templates/base.html
index a4a7564..a6cfb79 100644
--- a/sneakyidea/templates/base.html
+++ b/sneakyidea/templates/base.html
@@ -38,7 +38,7 @@
                     {% endfor %}
                 {% endif %}
                 {% for cat, null in categories %}
-                    <li {% if cat == category and not article %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                    <li {% if cat == category and not article %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ SITEURL }}/{{ link }}">{{ title }}</a></li>
diff --git a/sneakyidea/templates/comments.html b/sneakyidea/templates/comments.html
index ea693af..bb033c0 100644
--- a/sneakyidea/templates/comments.html
+++ b/sneakyidea/templates/comments.html
@@ -1 +1 @@
-{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.slug }}.html#disqus_thread">comments</a>.</p>{% endif %}
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}
diff --git a/sneakyidea/templates/taglist.html b/sneakyidea/templates/taglist.html
index 4259077..7ed6bf1 100644
--- a/sneakyidea/templates/taglist.html
+++ b/sneakyidea/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>{% endif %}</p>
diff --git a/sneakyidea/templates/tags.html b/sneakyidea/templates/tags.html
index bd18105..43bec00 100644
--- a/sneakyidea/templates/tags.html
+++ b/sneakyidea/templates/tags.html
@@ -5,8 +5,8 @@
     <h1 class="entry-title">Tags</h1>
     <ul id="cloud">
         {% for tag in tag_cloud %}
-            <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ 
-            tag.0 }}.html">{{ tag.0 }}</a></li>
+            <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ 
+            tag.0.url }}">{{ tag.0 }}</a></li>
         {% endfor %}
     </ul>
 </section>
diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html
index d8b195b..2a71f74 100644
--- a/tuxlite_tbs/templates/base.html
+++ b/tuxlite_tbs/templates/base.html
@@ -85,7 +85,7 @@
                 </li>
                 
                 {% for cat, null in categories %}
-                <li><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                <li><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
                 {% endfor %}                   
             </ul>
             </div>
diff --git a/tuxlite_tbs/templates/categories.html b/tuxlite_tbs/templates/categories.html
index c96774d..2b95d34 100644
--- a/tuxlite_tbs/templates/categories.html
+++ b/tuxlite_tbs/templates/categories.html
@@ -3,7 +3,7 @@
 {% block content %}
 <ul>
 {% for category, articles in categories %}
-	<li><a href="{{ SITEURL }}/category/{{ category }}.html">{{ category }}</li>
+	<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</li>
 {% endfor %}
 </ul>
 
diff --git a/tuxlite_tbs/templates/metadata.html b/tuxlite_tbs/templates/metadata.html
index cb04053..f3148f7 100644
--- a/tuxlite_tbs/templates/metadata.html
+++ b/tuxlite_tbs/templates/metadata.html
@@ -1,13 +1,13 @@
 {{ article.date.strftime("%d %b %Y") }}
 
 {% if article.author %}
-by <a class="url fn" href="{{ SITEURL }}/author/{{ article.author }}.html">{{ article.author }}</a>
+by <a class="url fn" href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
 {% endif %} 
 
-{# Filed under <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a> #}
+{# Filed under <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a> #}
 
 {# 
 {% if article.tags %} 
-    Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a> {% endfor %}
+    Tags {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}
 {% endif %}
 #}
diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html
index df6f55f..dea6672 100644
--- a/tuxlite_tbs/templates/tags.html
+++ b/tuxlite_tbs/templates/tags.html
@@ -3,7 +3,7 @@
 {% block content %}
 <ul>
 {% for tag, articles in tags %}
-    <li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</li>
+    <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</li>
 {% endfor %}
 </ul>
 {% endblock %}
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>