Merge branch 'more_customizations'

[django-pagination.git] / pagination / templates / pagination / default.html

diff --git a/pagination/templates/pagination/default.html b/pagination/templates/pagination/default.html
index 794765b..2fe8410 100644 (file)
--- a/pagination/templates/pagination/default.html
+++ b/pagination/templates/pagination/default.html
@@ -3,12 +3,12 @@
     <div class="pagination">
         {% block previouslink %}
             {% if page_obj.has_previous %}
     <div class="pagination">
         {% block previouslink %}
             {% if page_obj.has_previous %}

-                <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}{{ hashtag }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>
+                <a href="?page{{ page_suffix }}={{ page_obj.previous_page_number }}{{ getvars }}{{ hashtag }}" class="prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</a>

             {% else %}
                 {% if display_disabled_previous_link %}
             {% else %}
                 {% if display_disabled_previous_link %}

-                    <span class="disabled prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</span>    
+                    <span class="disabled prev">{{ previous_link_decorator|safe }}{% trans "previous" %}</span>

                 {% endif %}
                 {% endif %}

-            {% endif %}            
+            {% endif %}

         {% endblock previouslink %}
         {% block pagelinks %}
             {% if display_page_links %}
         {% endblock previouslink %}
         {% block pagelinks %}
             {% if display_page_links %}


@@ -17,22 +17,22 @@
                         {% ifequal page page_obj.number %}
                             <span class="current page">{{ page }}</span>
                         {% else %}
                         {% ifequal page page_obj.number %}
                             <span class="current page">{{ page }}</span>
                         {% else %}

-                            <a href="?page={{ page }}{{ getvars }}{{ hashtag }}" class="page">{{ page }}</a>
+                            <a href="?page{{ page_suffix }}={{ page }}{{ getvars }}{{ hashtag }}" class="page">{{ page }}</a>

                         {% endifequal %}
                     {% else %}
                         ...
                     {% endif %}
                         {% endifequal %}
                     {% else %}
                         ...
                     {% endif %}

-                {% endfor %}        
-            {% endif %}            
+                {% endfor %}
+            {% endif %}

         {% endblock pagelinks %}
         {% block nextlink %}
             {% if page_obj.has_next %}
         {% endblock pagelinks %}
         {% block nextlink %}
             {% if page_obj.has_next %}

-                <a href="?page={{ page_obj.next_page_number }}{{ getvars }}{{ hashtag }}" class="next">{% trans "next" %}{{ next_link_decorator|safe }}</a>
+                <a href="?page{{ page_suffix }}={{ page_obj.next_page_number }}{{ getvars }}{{ hashtag }}" class="next">{% trans "next" %}{{ next_link_decorator|safe }}</a>

             {% else %}
                 {% if display_disabled_next_link %}
                     <span class="disabled next">{% trans "next" %}{{ next_link_decorator|safe }}</span>
                 {% endif %}
             {% else %}
                 {% if display_disabled_next_link %}
                     <span class="disabled next">{% trans "next" %}{{ next_link_decorator|safe }}</span>
                 {% endif %}

-            {% endif %}            
+            {% endif %}

         {% endblock nextlink %}
     </div>
         {% endblock nextlink %}
     </div>

-{% endif %}
\ No newline at end of file
+{% endif %}