aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandall Degges <rdegges@gmail.com>2013-03-20 21:01:26 -0700
committerRandall Degges <rdegges@gmail.com>2013-03-20 21:01:26 -0700
commitfe933f80917f865a92db9f8671154b8e0239f779 (patch)
tree48d46c183560b8129632f69307b114ce563a98ee
parent53d6c4254aa2b4781b850419d63a40527c307d71 (diff)
downloadpelican-themes-fe933f80917f865a92db9f8671154b8e0239f779.zip
pelican-themes-fe933f80917f865a92db9f8671154b8e0239f779.tar.gz
pelican-themes-fe933f80917f865a92db9f8671154b8e0239f779.tar.bz2
Fixing broken support for `ARCHIVES_URL` in tuxlite-tbs theme.
This commit fixes an issue with users supplying their own custom `ARCHIVES_URL` setting in their settings file while using the tuxlite-tbs theme. The issue is that the `base.html` template didn't take the `ARCHIVES_URL` variable into account, and therefore ignores is. This causes problems when users want a custom archives URL. This also fixes another part of the issue in the `archives.html` template, in which article URLs were relative (not absolute) which causes breakage when linking to articles. This commit fixes all the above problems.
-rw-r--r--tuxlite_tbs/templates/archives.html2
-rw-r--r--tuxlite_tbs/templates/base.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/tuxlite_tbs/templates/archives.html b/tuxlite_tbs/templates/archives.html
index 1520943..20fcd87 100644
--- a/tuxlite_tbs/templates/archives.html
+++ b/tuxlite_tbs/templates/archives.html
@@ -9,7 +9,7 @@
{% for article in dates %}
<tr>
<td>{{ article.date.strftime("%d %b %Y") }}</td>
- <td><a href='{{ article.url }}'>{{ article.title }}</a></td>
+ <td><a href='{{ SITEURL }}/{{ article.url }}'>{{ article.title }}</a></td>
</tr>
{% endfor %}
</tbody>
diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html
index 59cfae7..2c18586 100644
--- a/tuxlite_tbs/templates/base.html
+++ b/tuxlite_tbs/templates/base.html
@@ -68,7 +68,7 @@
Site
</li>
- <li><a href="{{ SITEURL }}/archives.html">Archives</a>
+ <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL }}">Archives</a>
<li><a href="{{ SITEURL }}/tags.html">Tags</a>
<li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
{% if FEED_RSS %}