diff --git a/conservancy/podjango/templates/podjango/cast/cast_list.html b/conservancy/podjango/templates/podjango/cast/cast_list.html index c15e0b72..f0b9e122 100644 --- a/conservancy/podjango/templates/podjango/cast/cast_list.html +++ b/conservancy/podjango/templates/podjango/cast/cast_list.html @@ -12,7 +12,7 @@ {% if tags %}

Displaying casts -tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}{{ tag.label }}{% ifequal forloop.revcounter 2 %} or {% endifequal %}{% endfor %} +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 %} diff --git a/conservancy/templates/blog/entry_list.html b/conservancy/templates/blog/entry_list.html index 624133b8..ab09d2c5 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 %} diff --git a/conservancy/templates/feeds/omnibus_description.html b/conservancy/templates/feeds/omnibus_description.html index d612f7fe..e678fc0e 100644 --- a/conservancy/templates/feeds/omnibus_description.html +++ b/conservancy/templates/feeds/omnibus_description.html @@ -1,10 +1,10 @@ -{% ifequal obj.omnibus_type "news" %} +{% if obj.omnibus_type == "news" %}

A news item from Software Freedom Conservancy.

-{% endifequal %} -{% ifequal obj.omnibus_type "event" %} +{% endif %} +{% if obj.omnibus_type == "event" %}

An upcoming event related to the Software Freedom Conservancy.

-{% endifequal %} -{% ifequal obj.omnibus_type "blog" %} +{% endif %} +{% if obj.omnibus_type == "blog" %}

A blog post from Software Freedom Conservancy.

-{% endifequal %} +{% endif %} {% include obj.omnibus_feed_description_template %} diff --git a/conservancy/templates/news/pressrelease_list.html b/conservancy/templates/news/pressrelease_list.html index 05611f70..66a0fdff 100644 --- a/conservancy/templates/news/pressrelease_list.html +++ b/conservancy/templates/news/pressrelease_list.html @@ -12,7 +12,7 @@

[RSS] Conservancy News

-{% ifnotequal news.number 1 %}

(Page {{ news.number }} of {{ news.paginator.num_pages }})

{% endifnotequal %} +{% if news.number > 1 %}

(Page {{ news.number }} of {{ news.paginator.num_pages }})

{% endif %} {% for pressr in news %} {% if forloop.first %} @@ -26,7 +26,7 @@ {% if news.has_next %}Next page (older) »{% endif %} {% if news.has_previous %}« Previous page (newer){% endif %}

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

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

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

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

{% endif %}