").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cc=a.document.documentElement;function dc(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cc;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cc})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=La(k.pixelPosition,function(a,c){return c?(c=Ja(a,b),Ha.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ec=a.jQuery,fc=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fc),b&&a.jQuery===m&&(a.jQuery=ec),m},typeof b===K&&(a.jQuery=a.$=m),m});
diff --git a/alchemy/templates/archives.html b/alchemy/templates/archives.html
index 686a1de..5fe6dee 100644
--- a/alchemy/templates/archives.html
+++ b/alchemy/templates/archives.html
@@ -1,15 +1,18 @@
{% extends "base.html" %}
{% block title %}
- {{ SITENAME }} — Archives
+Archives {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Archives
{% endblock %}
{% block content %}
-
Archives
-
- {% for article in dates %}
- - {{ article.locale_date }}
- - {{ article.title }}
- {% endfor %}
-
+
+ {% for article in dates %}
+ - {{ article.locale_date }}
+ - {{ article.title }}
+ {% endfor %}
+
{% endblock %}
diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html
index 71de071..3d95c13 100644
--- a/alchemy/templates/article.html
+++ b/alchemy/templates/article.html
@@ -1,56 +1,45 @@
{% extends "base.html" %}
{% block head %}
- {{ super() }}
- {% if article.author %}
-
- {% endif %}
- {% if article.summary %}
-
- {% endif %}
-
+{{ super() }}
+{% if article.summary %}
+
+{% endif %}
{% endblock %}
{% block title %}
- {{ SITENAME }} — {{ article.title|striptags }}
+{{ article.title|striptags }} {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+{{ article.title }}
{% endblock %}
{% block content %}
-
-
+
+
-
- {{ article.content }}
-
-
-
- {% include 'include/disqus_comments.html' %}
+
+ {{ article.content }}
+
+
+{% include 'include/comments.html' %}
{% endblock %}
diff --git a/alchemy/templates/author.html b/alchemy/templates/author.html
index f457216..a87730b 100644
--- a/alchemy/templates/author.html
+++ b/alchemy/templates/author.html
@@ -1,9 +1,9 @@
{% extends "index.html" %}
{% block title %}
- {{ SITENAME }} — Articles by {{ author }}
+{{ author }} Articles — {{ SITENAME }}
{% endblock %}
-{% block page_title %}
-
Articles by {{ author }}
+{% block page_header %}
+{{ author }} Articles
{% endblock %}
diff --git a/alchemy/templates/authors.html b/alchemy/templates/authors.html
index 220c7f4..c1c3c9f 100644
--- a/alchemy/templates/authors.html
+++ b/alchemy/templates/authors.html
@@ -1,14 +1,17 @@
{% extends "base.html" %}
{% block title %}
- {{ SITENAME }} — Authors
+Authors {{ super() }}
+{% endblock %}
+
+{% block page_header %}
+Authors
{% endblock %}
{% block content %}
-
Authors on {{ SITENAME }}
-
- {% for author, articles in authors|sort %}
- - {{ author }} ({{ articles|count }})
- {% endfor %}
-
+
+ {% for author, articles in authors|sort %}
+ - {{ author }} ({{ articles|count }})
+ {% endfor %}
+
{% endblock %}
diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html
index 6d05c87..c441a36 100644
--- a/alchemy/templates/base.html
+++ b/alchemy/templates/base.html
@@ -3,50 +3,150 @@
{% block head %}
-
-
-
-
+
+
+
-
{% block title %}{{ SITE_SUBTEXT }}{% endblock title %}
+
{% block title %}— {{ SITENAME }}{% endblock %}
+
- {% if EXTRA_FAVICON %}
-
-
-
-
-
- {% endif %}
+ {% if FEED_ALL_ATOM %}
+
+ {% endif %}
+ {% if FEED_ALL_RSS %}
+
+ {% endif %}
+ {% if FEED_ATOM %}
+
+ {% endif %}
+ {% if FEED_RSS %}
+
+ {% endif %}
+ {% if CATEGORY_FEED_ATOM and category %}
+
+ {% endif %}
+ {% if CATEGORY_FEED_RSS and category %}
+
+ {% endif %}
+ {% if TAG_FEED_ATOM and tag %}
+
+ {% endif %}
+ {% if TAG_FEED_RSS and tag %}
+
+ {% endif %}
+ {% if SHOW_FAVICONS %}
+
+
+
+ {% endif %}
- {% if FEED_ATOM %}
-
- {% endif %}
- {% if FEED_RSS %}
-
- {% endif %}
+
+
+
+
-
-
-
-
- {% include "include/google_analytics.html" %}
+
+
+
{% endblock %}
- {% include "include/header.html" %}
-
- {% block content %}{% endblock %}
+
- {% include "include/footer.html" %}
-
-
+
+
+
+ {% block content %}{% endblock %}
+
+
+
+