From 855584408b472503c3eb415ff168ed3513d7d02a Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Wed, 4 Mar 2015 15:32:32 -0800
Subject: [PATCH] Move blog index to be part of base template.

This way, it's not on the bottom of pages.  This shouldn't cause
trouble, since when date_list isn't defined, nothing is shown by this
code.
---
 www/conservancy/templates/base_blog.html       | 6 ++++++
 www/conservancy/templates/blog/entry_list.html | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/www/conservancy/templates/base_blog.html b/www/conservancy/templates/base_blog.html
index dc8dac4c..187825fd 100644
--- a/www/conservancy/templates/base_blog.html
+++ b/www/conservancy/templates/base_blog.html
@@ -24,6 +24,12 @@
 (<a href="/feeds/blog/?tag={{ tag.slug }}">rss</a>)</li>
 {% endfor %}
 </ul>
+{% if date_list %}
+<h3>Blog Index by Year</h3>
+<ul>
+{% for year in date_list reversed %}<li><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
+</ul>
+{% endif %}
 
 <h2><a href="/blog/">See all posts&hellip;</a></h2>
 <!-- <p><a href="/blog/query/">Query...</a></p> -->
diff --git a/www/conservancy/templates/blog/entry_list.html b/www/conservancy/templates/blog/entry_list.html
index 334ef519..10323b4c 100644
--- a/www/conservancy/templates/blog/entry_list.html
+++ b/www/conservancy/templates/blog/entry_list.html
@@ -29,11 +29,4 @@
 <p class="pagination_list">{% if blog_entries.num_pages > 1 %} {% for pagenum in blog_entries.paginator.page_range %}{% ifequal pagenum blog_entries.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}{% endif %}</p>
 <div class="clear"></div>
 
-{% if date_list %}
-<h3>Blog Index by Year</h3>
-<ul>
-{% for year in date_list reversed %}<li><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
-</ul>
-{% endif %}
-
 {% endblock %}