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

---
 bootstrap/templates/base.html       | 4 ++--
 bootstrap/templates/categories.html | 2 +-
 bootstrap/templates/metadata.html   | 6 +++---
 bootstrap/templates/tags.html       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'bootstrap')

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