Merge pull request #28 from kylef/url

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

4 files changed, 6 insertions, 6 deletions

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 %}