Merge branch 'development'

[django-tables2.git] / django_tables2 / templates / django_tables2 / table.html

diff --git a/django_tables2/templates/django_tables2/table.html b/django_tables2/templates/django_tables2/table.html
index d580a1a591eb7a8aba4b1b6d1a24248c7a229a93..3a9bac4207dac34d347aabd4870efbb9dcec972b 100644 (file)
--- a/django_tables2/templates/django_tables2/table.html
+++ b/django_tables2/templates/django_tables2/table.html
@@ -9,7 +9,7 @@
         {% for column in table.columns %}
         {% if column.sortable %}
             {% with column.order_by as ob %}
-            <th class="{% spaceless %}{% if column.sortable %}sortable {% endif %}{% if ob %}{% if ob.is_descending %}desc{% else %}asc{% endif %}{% endif %}{% endspaceless %}"><a href="{% if ob %}{% set_url_param sort=ob.opposite %}{% else %}{% set_url_param sort=column.name %}{% endif %}">{{ column.header }}</a></th>
+            <th class="{% spaceless %}{% if column.sortable %}sortable {% endif %}{% if ob %}{% if ob.is_descending %}desc{% else %}asc{% endif %}{% endif %}{% endspaceless %}"><a href="{% querystring table.prefixed_order_by_field=ob.opposite|default:column.name %}">{{ column.header }}</a></th>
             {% endwith %}
         {% else %}
             <th>{{ column.header }}</th>
@@ -34,11 +34,11 @@
 {% if table.page %}
 <ul class="pagination">
     {% if table.page.has_previous %}
-    <li class="previous"><a href="{% set_url_param page=table.page.previous_page_number %}">Previous</a></li>
+    <li class="previous"><a href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}">Previous</a></li>
     {% endif %}
     <li class="current">Page {{ table.page.number }} of {{ table.paginator.num_pages }}</li>
     {% if table.page.has_next %}
-    <li class="next"><a href="{% set_url_param page=table.page.next_page_number %}">Next</a></li>
+    <li class="next"><a href="{% querystring table.prefixed_page_field=table.page.next_page_number %}">Next</a></li>
     {% endif %}
 </ul>
 </div>