diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2014-09-25 00:40:23 +0200 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2014-09-25 00:40:23 +0200 |
| commit | 34e975a6400f380157a1c4f2a6136fc778fe1879 (patch) | |
| tree | 6609c3ec37f9746bd27f52e5bb93729c2871eeaa | |
| parent | b879f580f1fed6091edb882c399ee0810fb8e438 (diff) | |
| parent | 8ef32802eef326da10838348a80c38c6bf465aad (diff) | |
| download | pelican-themes-34e975a6400f380157a1c4f2a6136fc778fe1879.tar.gz | |
Merge pull request #150 from tverrbjelke/master
Theme become compatible with Pelican documentation, enable firefox to dynamic-bookmark the feeds by adding meta data.
| -rw-r--r-- | bootstrap/templates/base.html | 23 | ||||
| -rw-r--r-- | tuxlite_tbs/templates/base.html | 26 | ||||
| -rw-r--r-- | tuxlite_zf/templates/base.html | 35 |
3 files changed, 71 insertions, 13 deletions
diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html index 45ddcdc..e9edd0e 100644 --- a/bootstrap/templates/base.html +++ b/bootstrap/templates/base.html @@ -16,13 +16,22 @@ <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> - <!-- Feeds --> - {% if FEED_ALL_ATOM %} - <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> - {% endif %} - {% if FEED_ALL_RSS %} - <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> - {% endif %} + <!-- Feeds --> + {% if FEED_ALL_ATOM %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" /> + {% endif %} + + {% if FEED_ATOM %} + <link href="{{ FEED_ATOM }}" rel="alternate" title="{{ SITENAME }}" type="application/atom+xml"> + {% endif %} + + {% if FEED_ALL_RSS %} + <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" /> + {% endif %} + + {% if FEED_RSS %} + <link href="{{ FEED_RSS }}" rel="alternate" title="{{ SITENAME }}" type="application/rss+xml"> + {% endif %} {% include "analytics.html" %} {% include "disqus.html" %} diff --git a/tuxlite_tbs/templates/base.html b/tuxlite_tbs/templates/base.html index 4dd1f52..866d6a5 100644 --- a/tuxlite_tbs/templates/base.html +++ b/tuxlite_tbs/templates/base.html @@ -18,6 +18,20 @@ <link href="{{ SITEURL }}/theme/local.css" rel="stylesheet"> <link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet"> + <!-- So Firefox can bookmark->"abo this site" --> + {% if FEED_ALL_ATOM %} + <link href="{{ 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"> + {% endif %} + {% if FEED_RSS %} + <link href="{{ 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"> + {% endif %} + </head> <body> @@ -70,10 +84,22 @@ <li><a href="{{ SITEURL }}/{{ ARCHIVES_URL }}">Archives</a> <li><a href="{{ SITEURL }}/tags.html">Tags</a> + + + + {% if FEED_ALL_ATOM %} + <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate">Atom feed</a></li> + {% endif %} + {% if FEED_ATOM %} <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li> + {% endif %} {% if FEED_RSS %} <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li> {% endif %} + {% if FEED_ALL_RSS %} + <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate">RSS feed</a></li> + {% endif %} + </ul> </div> diff --git a/tuxlite_zf/templates/base.html b/tuxlite_zf/templates/base.html index 779c56d..836ecea 100644 --- a/tuxlite_zf/templates/base.html +++ b/tuxlite_zf/templates/base.html @@ -11,6 +11,21 @@ <link rel="stylesheet" href="{{ SITEURL }}/theme/css/style.css" />
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/pygments.css" />
<script src="{{ SITEURL }}/theme/js/custom.modernizr.js"></script>
+
+ <!-- So Firefox can bookmark->"abo this site" -->
+ {% if FEED_ALL_ATOM %}
+ <link href="{{ 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">
+ {% endif %}
+ {% if FEED_RSS %}
+ <link href="{{ 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">
+ {% endif %}
+
</head>
<body>
@@ -60,12 +75,20 @@ <ul class="side-nav">
<li><a href="{{ SITEURL }}/archives.html">Archives</a>
<li><a href="{{ SITEURL }}/tags.html">Tags</a>
- {% if FEED_RSS %}
- <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
- {% endif %}
- {% if FEED_RSS %}
- <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
- {% endif %}
+
+
+ {% if FEED_ALL_ATOM %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" rel="alternate">Atom feed</a></li>
+ {% endif %}
+ {% if FEED_ATOM %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
+ {% endif %}
+ {% if FEED_RSS %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="alternate">RSS feed</a></li>
+ {% endif %}
+ {% if FEED_ALL_RSS %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" rel="alternate">RSS feed</a></li>
+ {% endif %}
</ul>
{% if categories %}
|