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

---
 notmyidea-cms-fr/templates/article.html | 2 +-
 notmyidea-cms-fr/templates/base.html    | 4 ++--
 notmyidea-cms-fr/templates/index.html   | 4 ++--
 notmyidea-cms-fr/templates/taglist.html | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'notmyidea-cms-fr')

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>
-- 
cgit v1.1