website Changeset - 9c090f2c27f4 · Conservancy Kallithea

Changeset - 9c090f2c27f4

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Bradley Kuhn (bkuhn) - 9 years ago 2015-03-04 23:36:25
bkuhn@ebb.org

Correct navigation links.

Earlier commit incorrectly implemented navigation link suppression when
only one page present, such that this was never shown. This is now
corrected herein.

2 files changed with 2 insertions and 2 deletions:

www/conservancy/templates/blog/entry_list.html

www/conservancy/templates/news/pressrelease_list.html

0 comments (0 inline, 0 general)

www/conservancy/templates/blog/entry_list.html

➞

Show inline comments

@@ ... / @@ -17,16 +17,16 @@ @@
     <p class="date">{{ entry.pub_date|date:"F j, Y" }} by {{ entry.author.formal_name }}</p>
     <h3><a href="{{ entry.get_absolute_url }}">{{ entry.headline|safe }}</a></h3>
         {{ entry.body|safe }}
     <p class="date small">Posted by <strong>{{ entry.author.formal_name}}</strong> on {{ entry.pub_date|date:"F j, Y" }}</p>
     {% if entry.tags.all %}<p class="blog-tags small">Tags: {% for tag in entry.tags.all %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
     </div>
 {% endfor %}
 <p>
 {% 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.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>
+{% if blog_entries.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in blog_entries.paginator.page_range %}{% ifequal pagenum blog_entries.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
 <div class="clear"></div>
 {% endblock %}

www/conservancy/templates/news/pressrelease_list.html

➞

Show inline comments

@@ ... / @@ -22,18 +22,18 @@ @@
     {% if news_item.is_recent %}
         {% if news_item.subhead %}<h4>{{ news_item.subhead|safe }}</h4>{% endif %}
         {{ news_item.summary|safe }}
     {% if news_item.body %}<p><span class="continued"><a href="{{ news_item.get_absolute_url }}">Read More...</a></span></p>{% endif %}
     {% endif %}
     </div>
 {% endfor %}
 <p>
 {% 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 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>
+{% if news.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in news.paginator.page_range %}{% ifequal pagenum news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
          </div>
  </div>
 <div class="clear"></div>
 {% endblock %}

0 comments (0 inline, 0 general)