~netlandish/django-pagination

947647e585b7621a41b8a5d1e72f9d6924cf6750 — Brian Rosner 14 years ago cbdc3bd + 1d3f1e0
Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py
M pagination/templates/pagination/pagination.html => pagination/templates/pagination/pagination.html +2 -2
@@ 2,7 2,7 @@
{% load i18n %}
<div class="pagination">
    {% if page_obj.has_previous %}
        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}{{ hashtag }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
    {% else %}
        <span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %}</span>
    {% endif %}


@@ 18,7 18,7 @@
        {% endif %}
    {% endfor %}
    {% if page_obj.has_next %}
        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}{{ hashtag }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
    {% else %}
        <span class="disabled next">{% trans "next" %} &rsaquo;&rsaquo;</span>
    {% endif %}

M pagination/templatetags/pagination_tags.py => pagination/templatetags/pagination_tags.py +2 -1
@@ 104,7 104,8 @@ class AutoPaginateNode(template.Node):
        context['page_obj'] = page_obj
        return u''

def paginate(context, window=DEFAULT_WINDOW, hashtag=None):

def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
    """
    Renders the ``pagination/pagination.html`` template, resulting in a
    Digg-like display of the available pages, given the current page.  If there