adds support for TAG and CATEGORY feeds
diff --git a/templates/base.html b/templates/base.html
index 7e8c0b6..1cb32c0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -4,18 +4,19 @@
<head>
<link rel="stylesheet/less" type="text/css" href="{{ SITEURL }}/theme/css/style.less">
<script src="{{ SITEURL }}/theme/js/less-1.3.3.min.js" type="text/javascript"></script>
+
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/pygments.css">
- <link href="http://fonts.googleapis.com/css?family=PT+Sans|PT+Serif|PT+Mono" rel="stylesheet" type="text/css">
+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=PT+Sans|PT+Serif|PT+Mono">
+
+ <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
+ <meta charset="utf-8" />
{% if FEED_ALL_ATOM %}
- <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
{% endif %}
{% if FEED_ALL_RSS %}
- <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
{% endif %}
-
{% block head %}
- <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
- <meta charset="utf-8" />
{% endblock %}
</head>
@@ -24,21 +25,23 @@
<figure>
<a href="{{ SITEURL }}"><img src="{{ SITEURL }}/theme/images/gravatar_to192.png" alt="logo"></a>
</figure>
-
<div id="user_meta">
<h1><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h1>
<h2>{{ TAGLINE }}</h2>
<ul>
+ {% for title, link in MENUITEMS %}
+ <li><a href="{{ link }}">{{ title }}</a></li>
+ {% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in pages %}
- <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+ <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% endif %}
{% for name, link in LINKS %}
- <li><a href="{{ link }}">{{ name }}</a></li>
+ <li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %}
{% for name, link in SOCIAL %}
- <li><a href="{{ link }}">{{ name }}</a></li>
+ <li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %}
</ul>
</div>