Push up outstanding code from ye aulde laptop

CONTRIBUTING.rst

@@ -100,7 +100,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.7 and 3.3.. Check 
+3. The pull request should work for Python 2.7 and 3.3.. Check
    https://travis-ci.org/pydanny/dj-paginator/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

HISTORY.rst

@@ -3,6 +3,17 @@
 History
 -------
 
+0.2.2 ???
+++++++++++++++++++
+
+* Attempted to create simple paginator
+* Readme update
+
+0.2.2 (2015-10-18)
+++++++++++++++++++
+
+* Use ellipsis for divider
+
 0.2.1 (2015-09-04)
 ++++++++++++++++++
 

paginator/__init__.py

@@ -1 +1,2 @@
-__version__ = '0.2.1'
+__version__ = '0.2.2'
+__author__ = 'Daniel Roy Greenfeld'

paginator/templates/paginator/bootstrap/paginator.html

@@ -22,7 +22,7 @@
                   <li><a href="?page{{ page_suffix }}={{ page }}{{ getvars }}{{ hashtag }}" class="page">{{ page }}</a></li>
               {% endif %}
           {% else %}
-              <li class="disabled"><a href="">-</a></li>
+              <li class="disabled"><a href="">. . .</a></li>
           {% endif %}
       {% endfor %}
       {% if page_obj.has_next %}

paginator/templatetags/paginator_tags.py

@@ -1,7 +1,7 @@
 from django.conf import settings
 from django import template
 
-from paginator.paginators import paginate
+from paginator.paginators import paginate, simple_paginate
 
 register = template.Library()
 
@@ -12,9 +12,9 @@
 
 @register.inclusion_tag(BOOTSTRAP_THEME, takes_context=True)
 def bootstrap_paginator(context):
-    return paginate(context)
+    return simple_paginate(context)
 
 
 @register.inclusion_tag(BASIC_THEME, takes_context=True)
 def paginator(context):
-    return paginate(context)
+    return simple_paginate(context)