Merge branch 'release/0.6.4'

Author: sdispater

CHANGELOG.md

@@ -1,3 +1,12 @@
+### 0.6.4
+
+(July 7th, 2015)
+
+##### Fixes
+
+- [#11](https://github.com/sdispater/orator/issues/11) Paginator.resolve_current_page() raises and error on Python 2.7.
+
+
 ### 0.6.3
 
 (June 30th, 2015)

docs/_static/orator-logo-80.png

@@ -66,6 +66,15 @@ article ul li {
     color: #7A7A7A;
 }
 
+.wy-side-nav-search a.icon.icon-home {
+    visibility: collapse;
+}
+
+.wy-side-nav-search a.icon.icon-home img.logo {
+    visibility: visible;
+    margin-top: -0.85em;
+}
+
 .wy-menu-vertical ul {
     font-family: "Open Sans", "Roboto", sans-serif;
     margin-right: 1em;
@@ -762,6 +771,7 @@ tt.code .integer, code.code .integer { color: #F4BC87 }
 .highlight .nx { color: #7BB } /* Name.Other */
 .highlight .py { color: #7BB } /* Name.Property */
 .highlight .nb { color: #E3AB83 } /* Name.Builtin */
+.highlight .p { color: #8A8A8A } /* Punctuation */
 
 /* Inline code */
 

docs/_static/theme_overrides.css

@@ -55,7 +55,7 @@
 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.2'
+release = '0.6.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -105,7 +105,9 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    'logo_only': True
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
@@ -119,7 +121,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = 'orator-logo-80.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32

docs/conf.py

@@ -89,7 +89,7 @@ def resolve_current_page(cls, default=1):
 
     @classmethod
     def current_page_resolver(cls, resolver):
-        cls._current_page_resolver = resolver
+        cls._current_page_resolver = staticmethod(resolver)
 
     def __len__(self):
         return self.count()

orator/pagination/base.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-VERSION = '0.6.3'
+VERSION = '0.6.4'

orator/version.py

@@ -20,3 +20,10 @@ def test_returns_relevant_context(self):
         self.assertEqual(4, p.last_item)
 
         self.assertEqual('item4', p[1])
+
+    def test_current_page_resolver(self):
+        def current_page_resolver():
+            return 7
+
+        Paginator.current_page_resolver(current_page_resolver)
+        self.assertEqual(7, Paginator.resolve_current_page())