moves header and footer from index to base
diff --git a/templates/archives.html b/templates/archives.html
index 918d1c6..8115d9e 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,11 +1,6 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Archives{% endblock %}
{% block content %}
-<header>
- <h3>
- <a href="{{ SITEURL }}">Index</a> | Archives
- </h3>
-</header>
<article>
<div id="article_text">
<dl>
@@ -16,6 +11,4 @@
</dl>
</div>
</article>
-<footer>
-</footer>
{% endblock %}
diff --git a/templates/article.html b/templates/article.html
index 5886383..e3a8cc3 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,9 +1,10 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
+{% block header %}
+Posted on {{ article.locale_date }}
+{% endblock %}
+
{% block content %}
-<header>
- <h3>Posted on {{ article.locale_date }}</h3>
-</header>
<article>
<div id="article_title">
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
@@ -24,7 +25,8 @@
{% endif %}
</div>
</article>
-<footer>
- <a href="{{ SITEURL }}/" class="button_accent">← Back to Index</a>
-</footer>
+{% endblock %}
+
+{% block footer %}
+<a href="{{ SITEURL }}/" class="button_accent">← Back to Index</a>
{% endblock %}
diff --git a/templates/author.html b/templates/author.html
index e71e926..5381df6 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -1,5 +1,5 @@
{% extends "index.html" %}
{% block title %}{{ SITENAME }} - Author: {{ author }}{% endblock %}
{% block header %}
-<a href="{{ SITEURL }}">Index</a> | AUTHOR: {{ author }}
+| Author: {{ author }}
{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 13ba457..a554ca9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,17 +8,20 @@
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/pygments.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" />
<meta name="viewport" content="width=device-width; initial-scale=1.0">
+
{% if FEED_ALL_ATOM %}
<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/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
{% endif %}
+
{% block head %}
{% endblock %}
+
+ <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
</head>
<body>
@@ -53,11 +56,25 @@
</aside>
<main>
+ <header>
+ <h3>
+ {% block header %}
+ <a href="{{ SITEURL }}">Index</a> | <a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/categories.html">Categories</a>
+ {% endblock header %}
+ </h3>
+ </header>
+
{% block content %}
{% endblock %}
+
+ <footer>
+ {% block footer %}
+ {% endblock %}
+ </footer>
+
<div id="ending_message">
<hr />
- <p>Made using <a href="http://getpelican.com" target="_new">Pelican</a>, theme from Giulio Fidente. Get it <a href="https://github.com/giulivo/pelican-svbhack" target="_new">from github</a>.</p>
+ <p>Made using <a href="http://getpelican.com" target="_blank">Pelican</a>, content from Giulio Fidente. Get the blog theme <a href="https://github.com/giulivo/pelican-svbhack" target="_blank">from github</a>.</p>
</div>
</main>
diff --git a/templates/categories.html b/templates/categories.html
index a8a803d..7046137 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,11 +1,6 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Categories{% endblock %}
{% block content %}
-<header>
- <h3>
- <a href="{{ SITEURL }}">Index</a> | Categories
- </h3>
-</header>
<article>
<div id="article_text">
<ul>
@@ -15,6 +10,4 @@
</ul>
</div>
</article>
-<footer>
-</footer>
{% endblock %}
diff --git a/templates/category.html b/templates/category.html
index 613da88..7c4e687 100644
--- a/templates/category.html
+++ b/templates/category.html
@@ -9,5 +9,5 @@
{% endif %}
{% endblock %}
{% block header %}
-<a href="{{ SITEURL }}">Index</a> | CATEGORY: {{ category }}
+| Category: {{ category }}
{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index d1e3e89..a68bf6b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,12 +1,5 @@
{% extends "base.html" %}
{% block content %}
-<header>
- <h3>
- {% block header %}
- Index | <a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/categories.html">Categories</a>
- {% endblock header %}
- </h3>
-</header>
{% for article in articles_page.object_list %}
<article>
<div id="article_title">
@@ -20,7 +13,8 @@
<hr />
{% endif %}
{% endfor %}
-<footer>
- {% include "pagination.html" %}
-</footer>
+{% endblock %}
+
+{% block footer %}
+{% include "pagination.html" %}
{% endblock %}
diff --git a/templates/page.html b/templates/page.html
index 8613554..91695f1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,9 +1,10 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - {{ page.title }}{% endblock %}
+{% block header %}
+{{ page.title }
+{% endblock %}
+
{% block content %}
-<header>
- <h3>{{ page.title }}</h3>
-</header>
<article>
<div id="article_title">
<a href="{{ SITEURL }}/{{ page.url }}" rel="bookmark">{{ page.title }}</a>
@@ -12,7 +13,8 @@
{{ page.content }}
</div>
</article>
-<footer>
- <a href="{{ SITEURL }}/" class="button_accent">← Back to Index</a>
-</footer>
+{% endblock %}
+
+{% block footer %}
+<a href="{{ SITEURL }}/" class="button_accent">← Back to Index</a>
{% endblock %}
diff --git a/templates/tag.html b/templates/tag.html
index ab7ccb7..7855d7a 100644
--- a/templates/tag.html
+++ b/templates/tag.html
@@ -9,5 +9,5 @@
{% endif %}
{% endblock %}
{% block header %}
-<a href="{{ SITEURL }}">Index</a> | TAG: {{ tag }}
+| Tag: {{ tag }}
{% endblock %}
diff --git a/templates/tags.html b/templates/tags.html
index 8965515..e621ad1 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,11 +1,6 @@
{% extends "base.html" %}
{% block title %}{{ SITENAME }} - Tags{% endblock %}
{% block content %}
-<header>
- <h3>
- <a href="{{ SITEURL }}">Index</a> | Tags
- </h3>
-</header>
<article>
<div id="article_text">
<ul>
@@ -15,6 +10,4 @@
</ul>
</div>
</article>
-<footer>
-</footer>
{% endblock %}