Revert to django-tables2 1.2.6's pagination footer behavior, which in…

…cludes a 'cardinality' section detailing item counts

CHANGELOG.rst

@@ -17,6 +17,8 @@
 - Change the display order of a few elements on the album download
   page, and use an HTML ``<meta>`` tag to automatically queue up
   the download, rather than only having the direct link.
+- Override table footers to always include item counts, as was
+  present in ``django-tables2`` 1.2.6 but patched out in 1.2.7.
 
 1.0.3 (2016-11-22)
 ------------------

exordium/templates/exordium/album_download.html

@@ -1,6 +1,5 @@
 {# vim: set syntax=htmldjango: #}
 {% extends "exordium/album.html" %}
-{% load render_table from django_tables2 %}
 
 {% block extraheader %}
 {% if zip_url and zip_file %}

exordium/templates/exordium/album_info.html

@@ -3,5 +3,5 @@
 {% load render_table from django_tables2 %}
 
 {% block albumbody %}
-{% render_table songs %}
+{% render_table songs "exordium/table.html" %}
 {% endblock %}

exordium/templates/exordium/artist.html

@@ -3,11 +3,11 @@
 {% load render_table from django_tables2 %}
 
 {% block body %}
-{% render_table albums %}
+{% render_table albums "exordium/table.html" %}
 
 {% if have_songs %}
 <h2>Songs by {{ artist }}</h2>
-{% render_table songs %}
+{% render_table songs "exordium/table.html" %}
 {% endif %}
 
 {% endblock %}

exordium/templates/exordium/browse.html

@@ -3,5 +3,5 @@
 {% load render_table from django_tables2 %}
 
 {% block body %}
-{% render_table table %}
+{% render_table table "exordium/table.html" %}
 {% endblock %}

exordium/templates/exordium/index.html

@@ -5,5 +5,5 @@
 {% block body %}
 <p>Welcome to Exordium!</p>
 <h3>Recently-Added Albums</h3>
-{% render_table album_list %}
+{% render_table album_list "exordium/table.html" %}
 {% endblock %}

exordium/templates/exordium/search.html

@@ -11,17 +11,17 @@
 
 {% if artist_results %}
 <h3>Artists</h3>
-{% render_table artist_results %}
+{% render_table artist_results "exordium/table.html" %}
 {% endif %}
 
 {% if album_results %}
 <h3>Albums</h3>
-{% render_table album_results %}
+{% render_table album_results "exordium/table.html" %}
 {% endif %}
 
 {% if song_results %}
 <h3>Songs</h3>
-{% render_table song_results %}
+{% render_table song_results "exordium/table.html" %}
 {% endif %}
 
 {% else %}

exordium/templates/exordium/table.html

@@ -0,0 +1,47 @@
+{# vim: set syntax=htmldjango: #}
+{% extends "django_tables2/table.html" %}
+{% comment %}
+    django-tables 1.2.7 introduced some changes to their pagination
+    footer which I wasn't fond of (specifically they got rid of the
+    "X of Y item(s)" text).  This custom template just overrides that
+    block to revert back to 1.2.6 behavior.
+
+    Since I want to implement a pagination system which lets you go
+    directly to various page numbers anyway, it'll be nice to have
+    this in place...
+{% endcomment %}
+{% load django_tables2 %}
+{% load i18n %}
+
+{% block pagination %}
+<ul class="pagination">
+    {% if table.page.has_previous %}
+        {% block pagination.previous %}
+            <li class="previous">
+                <a href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}">{% trans "Previous" %}</a>
+            </li>
+        {% endblock pagination.previous %}
+    {% endif %}
+
+    {% if table.page.has_previous or table.page.has_next %}
+        {% block pagination.current %}
+            <li class="current">
+                {% blocktrans with table.page.number as current and table.paginator.num_pages as total %}Page {{ current }} of {{ total }}{% endblocktrans %}
+            </li>
+        {% endblock pagination.current %}
+    {% endif %}
+
+    {% if table.page.has_next %}
+        {% block pagination.next %}
+            <li class="next">
+                <a href="{% querystring table.prefixed_page_field=table.page.next_page_number %}">{% trans "Next" %}</a>
+            </li>
+        {% endblock pagination.next %}
+    {% endif %}
+    {% block pagination.cardinality %}
+        <li class="cardinality">
+            {% if total != count %}{% blocktrans %}{{ count }} of {{ total }}{% endblocktrans %}{% else %}{{ total }}{% endif %} {% if total == 1 %}{{ table.data.verbose_name }}{% else %}{{ table.data.verbose_name_plural }}{% endif %}
+        </li>
+    {% endblock pagination.cardinality %}
+</ul>
+{% endblock pagination %}