diff --git a/src/postorius/static/postorius/js/script.js b/src/postorius/static/postorius/js/script.js index 77118ce..554897a 100644 --- a/src/postorius/static/postorius/js/script.js +++ b/src/postorius/static/postorius/js/script.js @@ -21,16 +21,5 @@ */ -$(function() { - - /* Pagination */ - $(".pager .pager-select a").click(function(e) { - e.preventDefault(); - $(this).hide(); - $(this).next("form").removeClass("hidden"); - }); - $(".pager .pager-select form select").change(function() { - $(this).closest("form").submit(); - }); - -}); +// $(function() { +// }); diff --git a/src/postorius/templates/postorius/base.html b/src/postorius/templates/postorius/base.html index a6c89d3..1f80897 100644 --- a/src/postorius/templates/postorius/base.html +++ b/src/postorius/templates/postorius/base.html @@ -117,6 +117,7 @@ + {% block additionaljs %}{% endblock %} diff --git a/src/postorius/templates/postorius/index.html b/src/postorius/templates/postorius/index.html index 5d532e8..dbf984a 100644 --- a/src/postorius/templates/postorius/index.html +++ b/src/postorius/templates/postorius/index.html @@ -1,5 +1,6 @@ {% extends postorius_base_template %} {% load i18n %} +{% load pagination %} {% block head_title %} {% trans 'List Index' %} - {{ block.super }} @@ -47,7 +48,7 @@ {% if user.is_superuser %} * {% trans 'Only admins see unadvertised lists in the list index.' %} {% endif %} - {% include 'postorius/lib/pagination.html' with page=lists %} + {% paginator lists %} {% else %}

{% trans 'There are currently no mailing lists.' %}

{% endif %} diff --git a/src/postorius/templates/postorius/lib/pagination.html b/src/postorius/templates/postorius/lib/pagination.html deleted file mode 100644 index 734ea71..0000000 --- a/src/postorius/templates/postorius/lib/pagination.html +++ /dev/null @@ -1,89 +0,0 @@ -{% load i18n %} -{% load pagination %} - -{% if page.paginator.num_pages > 1 %} - -{% endif %} diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index 23b1571..92e7ccd 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -1,6 +1,7 @@ {% extends postorius_base_template %} {% load i18n %} {% load nav_helpers %} +{% load pagination %} {% load staticfiles %} {% block head_title %} @@ -63,7 +64,7 @@ - {% include 'postorius/lib/pagination.html' with page=held_messages %} + {% paginator held_messages %}