From 9d654d08ee45af88bf107da4d26d6ede159a843d Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Wed, 4 Mar 2015 15:35:16 -0800
Subject: [PATCH] Restore navigation links.

Previous commit incorrectly implemented solution for avoiding showing
nav links.  This corrects that.
---
 www/conservancy/templates/blog/entry_list.html        | 2 +-
 www/conservancy/templates/news/pressrelease_list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/conservancy/templates/blog/entry_list.html b/www/conservancy/templates/blog/entry_list.html
index 10323b4c..0ec25489 100644
--- a/www/conservancy/templates/blog/entry_list.html
+++ b/www/conservancy/templates/blog/entry_list.html
@@ -26,7 +26,7 @@
 {% if blog_entries.has_next %}<a class="next_page_button" href="?page={{ blog_entries.next_page_number }}{% if query_string %}&amp;{{ query_string|escape }}{% endif %}">Next page (older) &raquo;</a>{% endif %}
 {% if blog_entries.has_previous %}<a href="?page={{ blog_entries.previous_page_number }}{% if query_string %}&amp;{{ query_string|escape }}{% endif %}">&laquo; Previous page (newer)</a>{% endif %}
 </p>
-<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>
+<p class="pagination_list">{% if blog_entries.paginator.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>
 
 {% endblock %}
diff --git a/www/conservancy/templates/news/pressrelease_list.html b/www/conservancy/templates/news/pressrelease_list.html
index 5c93d3d6..c2ce3eeb 100644
--- a/www/conservancy/templates/news/pressrelease_list.html
+++ b/www/conservancy/templates/news/pressrelease_list.html
@@ -31,7 +31,7 @@
 {% if news.has_next %}<a class="next_page_button" href="?page={{ news.next_page_number }}">Next page (older) &raquo;</a>{% endif %}
 {% if news.has_previous %}<a href="?page={{ news.previous_page_number }}">&laquo; Previous page (newer)</a>{% endif %}
 </p>
-<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>
+<p class="pagination_list">{% if news.paginator.num_pages > 1 %} {% for pagenum in news.paginator.page_range %}{% ifequal pagenum news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}{% endif %}</p>
          </div>
  </div>
 <div class="clear"></div>