From: Zygmunt Krynicki Date: Mon, 13 Jun 2011 12:54:16 +0000 (+0200) Subject: Merge branch 'master' of git://github.com/stephane/django-pagination X-Git-Tag: release-2.0~26 X-Git-Url: https://git.mdrn.pl/django-pagination.git/commitdiff_plain/7f5e87b3900b780fce0dcbe9e11e9c191af03571 Merge branch 'master' of git://github.com/stephane/django-pagination Conflicts: MANIFEST.in setup.py --- 7f5e87b3900b780fce0dcbe9e11e9c191af03571 diff --cc CONTRIBUTORS.txt index ce3e326,ce3e326..b29e1e5 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@@ -1,3 -1,3 +1,5 @@@ ++There are a lot more contributors, please check the git history for details. ++ Eric Florenzano Martin Mahner --James Tauber ++James Tauber diff --cc MANIFEST.in index 471e508,72da335..ff6e35d --- a/MANIFEST.in +++ b/MANIFEST.in @@@ -1,5 -1,5 +1,5 @@@ --include LICENSE.txt ++include COPYING include CONTRIBUTORS.txt recursive-include docs * --recursive-include pagination/templates/pagination *.html --recursive-include pagination/locale * ++recursive-include linaro_django_pagination/templates/pagination *.html ++recursive-include linaro_django_pagination/locale *.po diff --cc setup.py index 66a3976,fc40fb6..fd5760c mode 100755,100644..100755 --- a/setup.py +++ b/setup.py @@@ -1,13 -1,111 +1,11 @@@ +#!/usr/bin/env python from setuptools import setup, find_packages - version = '1.0.7.1' -version = '1.0.7' - -LONG_DESCRIPTION = """ -How to use django-pagination ----------------------------- - -``django-pagination`` allows for easy Digg-style pagination without modifying -your views. - -There are really 5 steps to setting it up with your projects (not including -installation, which is covered in INSTALL.txt in this same directory.) - -1. List this application in the ``INSTALLED_APPS`` portion of your settings - file. Your settings file might look something like:: - - INSTALLED_APPS = ( - # ... - 'pagination', - ) - - -2. Install the pagination middleware. Your settings file might look something - like:: - - MIDDLEWARE_CLASSES = ( - # ... - 'pagination.middleware.PaginationMiddleware', - ) - -3. If it's not already added in your setup, add the request context processor. - Note that context processors are set by default implicitly, so to set them - explicitly, you need to copy and paste this code into your under - the value TEMPLATE_CONTEXT_PROCESSORS:: - - ("django.core.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.request") - -4. Add this line at the top of your template to load the pagination tags: - - {% load pagination_tags %} - - -5. Decide on a variable that you would like to paginate, and use the - autopaginate tag on that variable before iterating over it. This could - take one of two forms (using the canonical ``object_list`` as an example - variable): - - {% autopaginate object_list %} - - This assumes that you would like to have the default 20 results per page. - If you would like to specify your own amount of results per page, you can - specify that like so: - - {% autopaginate object_list 10 %} - - Note that this replaces ``object_list`` with the list for the current page, - so you can iterate over the ``object_list`` like you normally would. - - -6. Now you want to display the current page and the available pages, so - somewhere after having used autopaginate, use the paginate inclusion tag: - - {% paginate %} - - This does not take any arguments, but does assume that you have already - called autopaginate, so make sure to do so first. - - -That's it! You have now paginated ``object_list`` and given users of the site -a way to navigate between the different pages--all without touching your views. - - -Optional Settings ------------------- - -In django-pagination, there are no required settings. There are, however, a -small set of optional settings useful for changing the default behavior of the -pagination tags. Here's an overview: - -``PAGINATION_DEFAULT_PAGINATION`` - The default amount of items to show on a page if no number is specified. - -``PAGINATION_DEFAULT_WINDOW`` - The number of items to the left and to the right of the current page to - display (accounting for ellipses). - -``PAGINATION_DEFAULT_ORPHANS`` - The number of orphans allowed. According to the Django documentation, - orphans are defined as:: - - The minimum number of items allowed on the last page, defaults to zero. - -``PAGINATION_INVALID_PAGE_RAISES_404`` - Determines whether an invalid page raises an ``Http404`` or just sets the - ``invalid_page`` context variable. ``True`` does the former and ``False`` - does the latter. -""" -- setup( - name='django-pagination', + name='linaro-django-pagination', version=version, - description="django-pagination", - long_description=LONG_DESCRIPTION, + description="linaro-django-pagination", + long_description=open("README").read(), classifiers=[ "Programming Language :: Python", "Topic :: Software Development :: Libraries :: Python Modules", @@@ -15,9 -113,9 +13,9 @@@ "Environment :: Web Environment", ], keywords='pagination,django', -- author='Eric Florenzano', - author_email='floguy@gmail.com', - url='http://django-pagination.googlecode.com/', ++ author='Zygmunt Krynicki', + author_email='zygmunt.krynicki@linaro.org', + url='http://launchpad.net/linaro-django-pagination/', license='BSD', packages=find_packages(), include_package_data=True,