adds support for TAG and CATEGORY feeds
diff --git a/templates/analytics.html b/templates/analytics.html
index 12bce47..d90476e 100644
--- a/templates/analytics.html
+++ b/templates/analytics.html
@@ -1,6 +1,5 @@
{% if GOOGLE_ANALYTICS %}
<script type="text/javascript">
-
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
_gaq.push(['_trackPageview']);
@@ -10,6 +9,5 @@
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-
</script>
{% endif %}
diff --git a/templates/archives.html b/templates/archives.html
index 3417046..4030843 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,14 +1,15 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Archives{% endblock %}
{% block content %}
-{% set custom_header = "Archives" %}
-{% include "header.html" %}
+<header>
+ <h3>Archives</h3>
+</header>
<div id="like_article">
<dl>
- {% for article in dates %}
+ {% for article in dates %}
<dt>{{ article.locale_date }}</dt>
<dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
- {% endfor %}
+ {% endfor %}
</dl>
</div>
<footer>
diff --git a/templates/article.html b/templates/article.html
index c1bea9b..8fb8bad 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,7 +1,9 @@
{% extends "base.html" %}
+{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
{% block content %}
-{% set custom_header = "Posted on " + article.locale_date %}
-{% include "header.html" %}
+<header>
+ <h3>Posted on {{ article.locale_date }}</h3>
+</header>
<article>
<h1 id="title">
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
@@ -12,17 +14,17 @@
</div>
<div id="article_meta">
- Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a><br />
+ <p>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
{% if article.tags %}
- Tags:
- {% for tag in article.tags %}
+ <p>Tags:
+ {% for tag in article.tags %}
<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% if not loop.last %},{% endif %}
- {% endfor %}
+ {% endfor %}
+ </p>
{% endif %}
</div>
</article>
-
<footer>
- <a href="{{ SITEURL }}/" class="button_accent">←Back to blog</a>
+ <a href="{{ SITEURL }}/" class="button_accent">←Index</a>
</footer>
{% endblock %}
diff --git a/templates/author.html b/templates/author.html
index 09763b9..0b37290 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1 +1,2 @@
{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
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>
diff --git a/templates/categories.html b/templates/categories.html
index edda5fa..8c7dcfc 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,13 +1,14 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Categories{% endblock %}
{% block content %}
-{% set custom_header = "Categories" %}
-{% include "header.html" %}
+<header>
+ <h3>Categories</h3>
+</header>
<div id="like_article">
<ul>
- {% for category, articles in categories %}
+ {% for category, articles in categories %}
<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
- {% endfor %}
+ {% endfor %}
</ul>
</div>
<footer>
diff --git a/templates/category.html b/templates/category.html
index 09763b9..3a12e0c 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -1 +1,10 @@
{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
+{% block head %}
+{% if CATEGORY_FEED_ATOM %}
+<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category Atom Feed" />
+{% endif %}
+{% if CATEGORY_FEED_RSS %}
+<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ category }} Category RSS Feed" />
+{% endif %}
+{% endblock %}
diff --git a/templates/header.html b/templates/header.html
deleted file mode 100644
index e5b1dc4..0000000
--- a/templates/header.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% if custom_header %}
-<header>
- <h3>{{ custom_header }}</h3>
-</header>
-{% else %}
-<header>
- <h3>{{ AUTHOR }}</h3>
-</header>
-{% endif %}
diff --git a/templates/index.html b/templates/index.html
index dcfe708..07ec0c8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,20 +1,21 @@
{% extends "base.html" %}
{% block content %}
-{% set custom_header = "Index" %}
-{% include "header.html" %}
-{% for article in articles_page.object_list %}
-<article>
- <h1 id="title">
+<header>
+ <h3>Index</h3>
+</header>
+ {% for article in articles_page.object_list %}
+ <article>
+ <h1 id="title">
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a>
- </h1>
- <div id="article_content">
- {{ article.summary }}
- </div>
-</article>
-{% if not loop.last %}
-<hr />
-{% endif %}
-{% endfor %}
+ </h1>
+ <div id="article_content">
+ {{ article.summary }}
+ </div>
+ </article>
+ {% if not loop.last %}
+ <hr />
+ {% endif %}
+ {% endfor %}
<footer>
{% include "pagination.html" %}
</footer>
diff --git a/templates/page.html b/templates/page.html
index d32a9b1..f7d6d61 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,8 +1,9 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - {{ page.title }}{% endblock %}
{% block content %}
-{% set custom_header = page.title %}
-{% include "header.html" %}
+<header>
+ <h3>{{ page.title }}</h3>
+</header>
<article>
<h1 id="title">
<a href="{{ SITEURL }}/{{ page.url }}" rel="bookmark">{{ page.title }}</a>
@@ -10,6 +11,6 @@
{{ page.content }}
</article>
<footer>
- <a href="{{ SITEURL }}/" class="button_accent">←Back to blog</a>
+ <a href="{{ SITEURL }}/" class="button_accent">←Index</a>
</footer>
{% endblock %}
diff --git a/templates/pagination.html b/templates/pagination.html
index 66757b2..6dd05c4 100644
--- a/templates/pagination.html
+++ b/templates/pagination.html
@@ -2,13 +2,13 @@
<p id="paginator">
{% if articles_page.has_previous() %}
{% if articles_page.previous_page_number() == 1 %}
-<a href="{{ SITEURL }}/{{ page_name }}.html" class="button_accent">←newer</a>
+<a href="{{ SITEURL }}/{{ page_name }}.html" class="button_accent">←Newer</a>
{% else %}
-<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html" class="button_accent">←newer</a>
+<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.previous_page_number() }}.html" class="button_accent">←Newer</a>
{% endif %}
{% endif %}
{% if articles_page.has_next() %}
-<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" class="button_accent">older→</a>
+<a href="{{ SITEURL }}/{{ page_name }}{{ articles_page.next_page_number() }}.html" class="button_accent">Older→</a>
{% endif %}
</p>
{% endif %}
diff --git a/templates/tag.html b/templates/tag.html
index 09763b9..b01f93f 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -1 +1,10 @@
{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
+{% block head %}
+{% if TAG_FEED_ATOM %}
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag Atom Feed" />
+{% endif %}
+{% if TAG_FEED_RSS %}
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} {{ tag }} Tag RSS Feed" />
+{% endif %}
+{% endblock %}
diff --git a/templates/tags.html b/templates/tags.html
index 93f7062..6a42e73 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,13 +1,14 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Tags{% endblock %}
{% block content %}
-{% set custom_header = "Tags" %}
-{% include "header.html" %}
+<header>
+ <h3>Tags</h3>
+</header>
<div id="like_article">
<ul>
- {% for tag in tag_cloud %}
+ {% for tag in tag_cloud %}
<li><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
- {% endfor %}
+ {% endfor %}
</ul>
</div>
<footer>