diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2012-05-14 11:26:29 -0700 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2012-05-14 11:26:29 -0700 |
| commit | 858eb07eb94d36614d05697722c5055da6abd120 (patch) | |
| tree | 311ea3ead0833a85fbbc7463739a26bec7443934 /bootstrap/templates | |
| parent | 2e0d1cae62b36ebef459e7b3ad5c8c83a0255c7f (diff) | |
| parent | 9c349d82c60d06563e1c1fc52600179f702cebc2 (diff) | |
| download | pelican-themes-858eb07eb94d36614d05697722c5055da6abd120.tar.gz | |
Merge pull request #28 from kylef/url
Use object.url to get the url for author, category and tags
Diffstat (limited to 'bootstrap/templates')
| -rw-r--r-- | bootstrap/templates/base.html | 4 | ||||
| -rw-r--r-- | bootstrap/templates/categories.html | 2 | ||||
| -rw-r--r-- | bootstrap/templates/metadata.html | 6 | ||||
| -rw-r--r-- | bootstrap/templates/tags.html | 2 |
4 files changed, 7 insertions, 7 deletions
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 %} |