diff --git a/src/postorius/templates/postorius/_pagination.html b/src/postorius/templates/postorius/_pagination.html index ef1ef62..29d6dd2 100644 --- a/src/postorius/templates/postorius/_pagination.html +++ b/src/postorius/templates/postorius/_pagination.html @@ -5,7 +5,7 @@ {% if page.paginator.num_pages > 10 %} <ul class="pager"> {% if page.has_previous %} - <li class="col-md-4 text-right"><a href="?page={{ page.previous_page_number }}">← {% trans 'Previous' %}</a></li> + <li class="col-md-4 text-right"><a href="?page={{ page.previous_page_number }}&count={{ page.paginator.per_page }}">← {% trans 'Previous' %}</a></li> {% else %} <li class="disabled col-md-4 text-right"><span>← {% trans 'Previous' %}</span></li> {% endif %} @@ -23,10 +23,11 @@ {% endfor %} </select> </label> + <input type="hidden" name="count" value="{{ page.paginator.per_page }}" /> </form> </li> {% if page.has_next %} - <li class="col-md-4 text-left"><a href="?page={{ page.next_page_number }}">{% trans 'Next' %} →</a></li> + <li class="col-md-4 text-left"><a href="?page={{ page.next_page_number }}&count={{ page.paginator.per_page }}">{% trans 'Next' %} →</a></li> {% else %} <li class="disabled col-md-4 text-left"><span>{% trans 'Next' %} →</span></li> {% endif %} @@ -34,7 +35,7 @@ {% else %} <ul class="pagination"> {% if page.has_previous %} - <li><a href="?page={{ page.previous_page_number }}">«</a></li> + <li><a href="?page={{ page.previous_page_number }}&count={{ page.paginator.per_page }}">«</a></li> {% else %} <li class="disabled"><span>«</span></li> {% endif %} @@ -42,11 +43,11 @@ {% if page.number == pagenum %} <li class="active"><span>{{ pagenum }}</span></li> {% else %} - <li><a href="?page={{ pagenum }}">{{ pagenum }}</a></li> + <li><a href="?page={{ pagenum }}&count={{ page.paginator.per_page }}">{{ pagenum }}</a></li> {% endif %} {% endfor %} {% if page.has_next %} - <li><a href="?page={{ page.next_page_number }}">»</a></li> + <li><a href="?page={{ page.next_page_number }}&count={{ page.paginator.per_page }}">»</a></li> {% else %} <li class="disabled"><span>»</span></li> {% endif %} diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py index fad1254..4081c12 100644 --- a/src/postorius/views/list.py +++ b/src/postorius/views/list.py @@ -511,8 +511,11 @@ choosable_domains = _get_choosable_domains(request) return render_to_response( template, { + 'count_options': [10, 25, 50, 100, 200], 'error': error, - 'lists': utils.paginate(request, lists, 15), + 'lists': utils.paginate(request, + lists, + count=request.GET.get('count', 10)), 'domain_count': len(choosable_domains), }, context_instance=RequestContext(request))