From 55519c0722f0ad25a2492fb5561979575272c20f Mon Sep 17 00:00:00 2001
From: cyrozap <cyrozap@gmail.com>
Date: Tue, 8 Jul 2014 18:36:03 -0400
Subject: [PATCH 1/3] Fix article link generation in archives

---
 templates/archives.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/archives.html b/templates/archives.html
index 698ee42..99dc5a4 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -13,7 +13,7 @@ <h2>{{ year }}</h2>
             {% for month, articles in date_year|groupby('date.month')|sort(reverse=NEWEST_FIRST_ARCHIVES) %}
                 {% for article in articles %}
                     <article>
-                        <h1><a href="{{ article.url }}">{{ article.title }}</a></h1>
+                        <h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
                         <time datetime="{{ article.date }}" pubdate>
                             <span class="month">{{ article.date.strftime('%B')[:3] }}</span>
                             <span class="day">{{ article.date.strftime('%d') }}</span>
@@ -21,7 +21,7 @@ <h1><a href="{{ article.url }}">{{ article.title }}</a></h1>
                         </time>
                         <footer>
                             <span class="categories">posted in
-                                <a class='category' href='{{ SITEROOT }}/{{ article.category.url }}'>{{ article.category }}</a>
+                                <a class='category' href='{{ SITEURL }}/{{ article.category.url }}'>{{ article.category }}</a>
                                 {{ tag }}
                             </span>
                         </footer>

From 40892d720a6de776d02dada1d58b68cb5f5ea2bf Mon Sep 17 00:00:00 2001
From: cyrozap <cyrozap@gmail.com>
Date: Tue, 8 Jul 2014 18:39:13 -0400
Subject: [PATCH 2/3] Only show the "Read On" button if the article summary is
 different from the article content

---
 templates/_includes/article.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/_includes/article.html b/templates/_includes/article.html
index 54ce96c..8304f97 100644
--- a/templates/_includes/article.html
+++ b/templates/_includes/article.html
@@ -12,9 +12,11 @@ <h1 class="entry-title">{{ article.title|striptags }}</h1>
 
 {% if index %}
   <div class="entry-content">{{ article.summary }}</div>
+  {% if article.summary != article.content %}
   <footer>
     <a rel="full-article" href="{{ SITEURL }}/{{ article.url }}">Read On &crarr;</a>
   </footer>
+  {% endif %}
 {% else %}
   <div class="entry-content">{{ article.content }}</div>
 {% endif %}

From adf6fd9c881ab0c7ea03d6e99bc70f3e26cd93d5 Mon Sep 17 00:00:00 2001
From: cyrozap <cyrozap@gmail.com>
Date: Tue, 8 Jul 2014 18:40:52 -0400
Subject: [PATCH 3/3] Added support for FeedBurner

---
 README.rst                          | 8 ++++++++
 templates/_includes/navigation.html | 4 ++++
 templates/base.html                 | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/README.rst b/README.rst
index 4d9c52a..be7fb21 100644
--- a/README.rst
+++ b/README.rst
@@ -86,6 +86,14 @@ QR Code generation
 
 - ``QR_CODE``: set to true to enable the qr code generation for articles and pages by browser
 
+FeedBurner integration
+----------------------
+
+- ``FEED_FEEDBURNER``: set this to the part of your FeedBurner URL after the ``http://feeds.feedburner.com/`` to set the
+  displayed feed URL to your FeedBurner URL. This also disables generation of the RSS and ATOM tags, regardless of whether
+  you've set the ``FEED_RSS`` or ``FEED_ATOM`` variables. This way, you can arbitrarily set your generated feed URL while
+  presenting your FeedBurner URL to your users.
+
 Contribute
 ----------
 
diff --git a/templates/_includes/navigation.html b/templates/_includes/navigation.html
index c863eb2..d1777c2 100644
--- a/templates/_includes/navigation.html
+++ b/templates/_includes/navigation.html
@@ -1,10 +1,14 @@
 <ul class="subscription" data-subscription="rss">
+  {% if FEED_FEEDBURNER %}
+  <li><a href="http://feeds.feedburner.com/{{ FEED_FEEDBURNER }}" rel="subscribe-rss">RSS</a></li>
+  {% else %}
   {% if FEED_ATOM %}
   <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" rel="subscribe-atom">Atom</a></li>
   {% endif %}
   {% if FEED_RSS %}
   <li><a href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" rel="subscribe-rss">RSS</a></li>
   {% endif %}
+  {% endif %}
 </ul>
 
 
diff --git a/templates/base.html b/templates/base.html
index 6a371ab..234cab2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,6 +7,10 @@
   <title>{% block title %}{{ SITENAME }}{% endblock %}</title>
   <meta name="author" content="{{ AUTHOR }}">
 
+  {% if FEED_FEEDBURNER %}
+  <link href="http://feeds.feedburner.com/{{ FEED_FEEDBURNER }}" type="application/rss+xml" rel="alternate"
+        title="{{ SITENAME }} RSS Feed" />
+  {% else %}
   {% if FEED_ATOM %}
   <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate"
         title="{{ SITENAME }} Atom Feed" />
@@ -15,6 +19,7 @@
   <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate"
         title="{{ SITENAME }} RSS Feed" />
   {% endif %}
+  {% endif %}
 
   {% if EXTRA_HEADER %}
     {{ EXTRA_HEADER }}