--- a/gpp/templates/news/index.html	Sun Sep 12 18:30:23 2010 +0000
+++ b/gpp/templates/news/index.html	Wed Sep 15 00:14:54 2010 +0000
@@ -6,29 +6,15 @@
 {% block news_content %}
 <h3>{{ title }}</h3>
 
-{% if query %}
-{% include 'core/pagination_query.html' %}
-{% else %}
+{% if page.object_list %}
 {% include 'core/pagination.html' %}
-{% endif %}
-
-{% if page.object_list %}
 {% for story in page.object_list %}
    {% include 'news/story_summary.html' %}
 {% endfor %}
+{% include 'core/pagination.html' %}
 <div style="clear:right;"></div>
 {% else %}
-   {% if query %}
-      <p>No results found.</p>
-   {% else %}
-      <p>No news at this time.</p>
-   {% endif %}
-{% endif %}
-
-{% if query %}
-{% include 'core/pagination_query.html' %}
-{% else %}
-{% include 'core/pagination.html' %}
+   <p>No news at this time.</p>
 {% endif %}
 
 {% endblock %}