aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Mayer <entroP@gmail.com>2015-01-05 11:00:25 -0800
committerJustin Mayer <entroP@gmail.com>2015-01-05 11:00:25 -0800
commita16c9fb80cbb439a9ffa29c9e1c2bdef75d81d64 (patch)
tree0d1c6fe32d3adf7988b9dabfda60c250e113c9da
parent066f85888488a9201e990b7704b4ae7382f7e842 (diff)
parent44323739f890512932542a4a468df616e9f231e3 (diff)
downloadpelican-themes-a16c9fb80cbb439a9ffa29c9e1c2bdef75d81d64.tar.gz
Merge pull request #263 from feld/master
Minor tuxlite_tbs updates
-rw-r--r--tuxlite_tbs/templates/base.html8
-rw-r--r--tuxlite_tbs/templates/tags.html2
-rw-r--r--tuxlite_tbs/templates/twitter.html4
3 files changed, 7 insertions, 7 deletions
diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html
index bcde895..62ffdaa 100644
--- a/tuxlite_tbs/templates/base.html
+++ b/tuxlite_tbs/templates/base.html
@@ -20,16 +20,16 @@
<!-- So Firefox can bookmark->"abo this site" -->
{% if FEED_ALL_ATOM %}
- <link href="{{ FEED_ALL_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
{% endif %}
{% if FEED_ATOM %}
- <link href="{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml">
{% endif %}
{% if FEED_RSS %}
- <link href="{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
{% endif %}
{% if FEED_ALL_RSS %}
- <link href="{{ FEED_ALL_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml">
{% endif %}
</head>
diff --git a/tuxlite_tbs/templates/tags.html b/tuxlite_tbs/templates/tags.html
index db1c520..94a5fc3 100644
--- a/tuxlite_tbs/templates/tags.html
+++ b/tuxlite_tbs/templates/tags.html
@@ -2,7 +2,7 @@
{% block title %}{{ SITENAME }} <small>[tgs]</small>{% endblock %}
{% block content %}
<ul>
-{% for tag, articles in tags %}
+{% for tag, articles in tags|sort %}
<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
{% endfor %}
</ul>
diff --git a/tuxlite_tbs/templates/twitter.html b/tuxlite_tbs/templates/twitter.html
index c6b159f..17b49e1 100644
--- a/tuxlite_tbs/templates/twitter.html
+++ b/tuxlite_tbs/templates/twitter.html
@@ -1,3 +1,3 @@
{% if TWITTER_USERNAME %}
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-{% endif %} \ No newline at end of file
+<a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-text="{{article.title}}" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+{% endif %}