diff --git a/conservancy/templates/blog/entry_list.html b/conservancy/templates/blog/entry_list.html index 624133b8e59cedf69db9051c1855ae30c06bd03a..ab09d2c5bae2b7fe9fa61bcd577a756436197e37 100644 --- a/conservancy/templates/blog/entry_list.html +++ b/conservancy/templates/blog/entry_list.html @@ -12,8 +12,8 @@ {% if authors or tags %}

Displaying posts -{% if authors %}by {% for author in authors %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}{{ author.formal_name }}{% ifequal forloop.revcounter 2 %} and {% endifequal %}{% endfor %}{% endif %} -{% if tags %}tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}{{ tag.label }}{% ifequal forloop.revcounter 2 %} or {% endifequal %}{% endfor %}{% endif %} +{% if authors %}by {% for author in authors %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}{{ author.formal_name }}{% if forloop.revcounter == 2 %} and {% endif %}{% endfor %}{% endif %} +{% if tags %}tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}{{ tag.label }}{% if forloop.revcounter == 2 %} or {% endif %}{% endfor %}{% endif %}

{% endif %} @@ -25,7 +25,7 @@ {% if blog_entries.has_next %}Next page (older) »{% endif %} {% if blog_entries.has_previous %}« Previous page (newer){% endif %}

-{% if blog_entries.paginator.num_pages > 1 %}

{% for pagenum in blog_entries.paginator.page_range %}{% ifequal pagenum blog_entries.number %}[{{ pagenum }}]{% else %}{{ pagenum }}{% endifequal %} {% endfor %}

{% endif %} +{% if blog_entries.paginator.num_pages > 1 %}

{% for pagenum in blog_entries.paginator.page_range %}{% if pagenum == blog_entries.number %}[{{ pagenum }}]{% else %}{{ pagenum }}{% endif %} {% endfor %}

{% endif %}
{% endblock %}