Merge pull request #28 from kylef/url

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

5 files changed, 7 insertions, 7 deletions

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>