From 3458d64850978e7d0fe6e8fe062fcffa2b8f037f Mon Sep 17 00:00:00 2001
From: Tobias Kunze <rixx@cutebit.de>
Date: Mon, 29 Aug 2016 19:19:57 +0200
Subject: [PATCH] Add a count of elements to pagination elements (#219)

Also, add a second, upper pagination element to orders and attendees
list sites as those tend to get long.
---
 .../pretixcontrol/attendees/index.html        |  1 +
 .../templates/pretixcontrol/events/index.html |  2 +-
 .../templates/pretixcontrol/orders/index.html |  1 +
 .../templates/pretixcontrol/pagination.html   | 24 ++++++++++++-------
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/attendees/index.html b/src/pretix/control/templates/pretixcontrol/attendees/index.html
index f6b888db5..baf6b9a5d 100644
--- a/src/pretix/control/templates/pretixcontrol/attendees/index.html
+++ b/src/pretix/control/templates/pretixcontrol/attendees/index.html
@@ -46,6 +46,7 @@
             <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
         </form>
         </p>
+        {% include "pretixcontrol/pagination.html" %}
         <div class="table-responsive">
             <table class="table table-condensed table-hover">
                 <thead>
diff --git a/src/pretix/control/templates/pretixcontrol/events/index.html b/src/pretix/control/templates/pretixcontrol/events/index.html
index d9af35ee0..f6347b048 100644
--- a/src/pretix/control/templates/pretixcontrol/events/index.html
+++ b/src/pretix/control/templates/pretixcontrol/events/index.html
@@ -33,6 +33,6 @@
             {% endfor %}
             </tbody>
         </table>
+        {% include "pretixcontrol/pagination.html" %}
     {% endif %}
-    {% include "pretixcontrol/pagination.html" %}
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/orders/index.html b/src/pretix/control/templates/pretixcontrol/orders/index.html
index 282502f32..16ee033d6 100644
--- a/src/pretix/control/templates/pretixcontrol/orders/index.html
+++ b/src/pretix/control/templates/pretixcontrol/orders/index.html
@@ -57,6 +57,7 @@
             <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
         </form>
         </p>
+        {% include "pretixcontrol/pagination.html" %}
         <div class="table-responsive">
             <table class="table table-condensed table-hover">
                 <thead>
diff --git a/src/pretix/control/templates/pretixcontrol/pagination.html b/src/pretix/control/templates/pretixcontrol/pagination.html
index 687293695..55c879013 100644
--- a/src/pretix/control/templates/pretixcontrol/pagination.html
+++ b/src/pretix/control/templates/pretixcontrol/pagination.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load urlreplace %}
-{% if is_paginated %}
-    <nav class="text-center">
-        <ul class="pagination">
+<nav class="text-center">
+    <ul class="pagination">
+        {% if is_paginated %}
             {% if page_obj.has_previous %}
                 <li>
                     <a href="?{% url_replace request 'page' page_obj.previous_page_number %}">
@@ -11,8 +11,8 @@
                 </li>
             {% endif %}
             <li class="page-current"><a>
-                {% blocktrans trimmed with page=page_obj.number of=page_obj.paginator.num_pages %}
-                    Page {{ page }} of {{ of }}
+                {% blocktrans trimmed with page=page_obj.number of=page_obj.paginator.num_pages count=page_obj.paginator.count %}
+                    Page {{ page }} of {{ of }} ({{ count }} elements)
                 {% endblocktrans %}
             </a></li>
             {% if page_obj.has_next %}
@@ -22,6 +22,14 @@
                     </a>
                 </li>
             {% endif %}
-        </ul>
-    </nav>
-{% endif %}
+        {% else %}
+        {% if page_obj.paginator.count > 1 %}
+                <li class="page-current"><a>
+                    {% blocktrans trimmed with count=page_obj.paginator.count %}
+                        {{ count }} elements
+                    {% endblocktrans %}
+                </a></li>
+            {% endif %}
+        {% endif %}
+    </ul>
+</nav>