From b6272710d8ef2f29e13cd07cbf8562a5aa7678fe Mon Sep 17 00:00:00 2001
From: Juan Funez <juan.funez@gmail.com>
Date: Mon, 31 Mar 2014 16:45:25 -0300
Subject: [PATCH 1/2] Melhoras para suportar override do parametro page em cada
 link a outra pagina
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- agora é possivel passar um parametro opcional:
`` {% simple_pagination checkins_pending "page_alernative_name" %}``
ou também para pagination:
`` {% pagination checkins_pending "page_alernative_name" %}``
que muda o parametro get na url para cada link a outra pagina.
- removido estilos inline (``style='...'``) nos strings de HTML gerados
no template tag, o certo é usar classes (``class="..."``)  para separar
a logica da presentação.
- foi refeito parte do HTML gerado para que seja mais amigável com
bootstrap, e baseado em classes facilita o trabalho de adaptar a
interface.
---
 .../templatetags/scielo_common.py             | 76 +++++++++++--------
 scielo_extensions/tests/tests_tools.py        | 22 +++---
 2 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/scielo_extensions/templatetags/scielo_common.py b/scielo_extensions/templatetags/scielo_common.py
index 0dd7dda..f7ecbe1 100755
--- a/scielo_extensions/templatetags/scielo_common.py
+++ b/scielo_extensions/templatetags/scielo_common.py
@@ -23,8 +23,8 @@ def inner(parser, token):
     inner.__doc__ = inner.__doc__
     return inner
 
-def full_path(context, **params):
-
+def full_path(context, page_param_name='page', **params):
+    
     url_path = ''
     url_get = context['request'].GET.copy()
 
@@ -32,10 +32,13 @@ def full_path(context, **params):
         url_path = context['request'].META['PATH_INFO']
 
     for key, value in params.items():
+        if key == 'page' and page_param_name and page_param_name.lower() != 'page':
+            key = page_param_name.lower()
         url_get[key] = value
 
     if len(url_get):
-        url_path += "?%s" % "&".join(("%s=%s" % (key, value) for key, value in url_get.items() if value))
+        url_path += '&' if '?' in url_get else '?'
+        url_path += "%s" % "&".join(("%s=%s" % (key, value) for key, value in url_get.items() if value))
 
     return url_path.encode('utf8')
 
@@ -50,17 +53,17 @@ def render(self, context):
         letters = self.letters.resolve(context)
         selected = self.selected.resolve(context)
 
-        html_snippet = '''<div class="pagination" style="margin:0;padding-top:8px;text-align:center;">
-            <ul><li><a href="?" style="line-height: 20px;padding: 0 5px;">''' + str(__('All')) + '''</a></li>'''
+        html_snippet = '''<div class="pagination">
+            <ul><li><a href="?">''' + str(__('All')) + '''</a></li>'''
 
         for letter in letters:
             if letter != selected:
                 html_snippet += '''
-                <li><a href="{0}" style="line-height: 20px;padding: 0 5px;">{1}</a></li>'''\
+                <li><a href="{0}">{1}</a></li>'''\
                     .format(full_path(context, letter=letter),letter.encode('utf8'))
             else:
                 html_snippet += '''
-                <li class="active"><a href="{0}" style="line-height: 20px;padding: 0 5px;">{1}</a></li>'''\
+                <li class="active"><a href="{0}">{1}</a></li>'''\
                     .format(full_path(context, letter=letter),letter.encode('utf8'))
 
         html_snippet += '''
@@ -75,11 +78,13 @@ def named_pagination(_tag_name, *params):
 
 class Pagination(template.Node):
 
-    def __init__(self, object_record):
+    def __init__(self, object_record, page_param_name='page'):
         self.object_record = template.Variable(object_record)
+        self.page_param_name = template.Variable(page_param_name) if page_param_name.lower() != 'page' else None
 
     def render(self, context):
         object_record = self.object_record.resolve(context)
+        page_param_name = self.page_param_name.resolve(context) if self.page_param_name else None
 
         if not object_record.paginator:
             # the paginator is empty
@@ -92,23 +97,23 @@ def render(self, context):
 
             for page in object_record.paginator.page_range:
                 class_li_page = 'active' if object_record.number == page else ''
-                html_pages.append(u'<li class="{0}"><a href="{1}">{2}</a></li>'.format(class_li_page, full_path(context, page=page), page))
+                html_pages.append(u'<li class="{0}"><a href="{1}">{2}</a></li>'.format(class_li_page, full_path(context, page_param_name=page_param_name, page=page), page))
 
             html_snippet = u'''
                 <div class="pagination">
-                <ul>
-                <li class="prev {0}"><a href="{1}">&larr; {2}</a></li>
-                {3}
-                <li class="next {4}"><a href="{5}">{6} &rarr;</a></li>
-                </ul>
+                    <ul>
+                        <li class="prev {0}"><a href="{1}">&larr; {2}</a></li>
+                        {3}
+                        <li class="next {4}"><a href="{5}">{6} &rarr;</a></li>
+                    </ul>
                 </div>
                 '''.format(
                     class_li_previous,
-                    full_path(context, page=object_record.previous_page_number()),
+                    full_path(context, page_param_name=page_param_name, page=object_record.previous_page_number()),
                     _('Previous'),
                     ''.join(html_pages),
                     class_li_next,
-                    full_path(context, page=object_record.next_page_number()),
+                    full_path(context, page_param_name=page_param_name, page=object_record.next_page_number()),
                     _('Next')
                 )
             return html_snippet
@@ -117,17 +122,19 @@ def render(self, context):
 
 @register.tag()
 @easy_tag
-def pagination(_tag_name, params):
-    return Pagination(params)
+def pagination(_tag_name, params, page_param_name='page'):
+    return Pagination(params, page_param_name)
 
 class SimplePagination(template.Node):
 
-    def __init__(self, object_record):
+    def __init__(self, object_record, page_param_name='page'):
         self.object_record = template.Variable(object_record)
+        self.page_param_name = template.Variable(page_param_name) if page_param_name.lower() != 'page' else None
 
     def render(self, context):
 
         object_record = self.object_record.resolve(context)
+        page_param_name = self.page_param_name.resolve(context) if self.page_param_name else None
 
         if not object_record.paginator:
             # the paginator is empty
@@ -138,29 +145,36 @@ def render(self, context):
             class_li_next = 'disabled' if not object_record.has_next() else ''
 
             html_snippet = u'''
-                <span style=""><b>{0}-{1}</b> {2} <b>{3}</b></span>
-                <span class="pagination"><ul>
-                <li class="prev {4}">
-                <a href="{5}">&larr;</a></li>
-                <li class="next {6}">
-                <a href="{7}">&rarr;</a></li>
-                </ul></span>
+                <ul class="pager">
+                    <li class="prev {4}">
+                        <a href="{5}">&larr;</a>
+                    </li>
+                    <li class="middle">
+                        <span>
+                            <strong>{0}-{1}</strong> {2} <strong>{3}</strong>
+                        </span>
+                    </li>
+                    <li class="next {6}">
+                        <a href="{7}">&rarr;</a>
+                    </li>
+                </ul>
                 '''.format(object_record.start_index(),
                     object_record.end_index(), _('of'),
                     object_record.paginator.count,
                     class_li_previous,
-                    full_path(context, page=object_record.previous_page_number()),
+                    full_path(context, page_param_name=page_param_name, page=object_record.previous_page_number()),
                     class_li_next,
-                    full_path(context, page=object_record.next_page_number()))
+                    full_path(context, page_param_name=page_param_name, page=object_record.next_page_number()))
 
             return html_snippet
 
-        else: return ''
+        else:
+            return ''
 
 @register.tag()
 @easy_tag
-def simple_pagination(_tag_name, params):
-    return SimplePagination(params)
+def simple_pagination(_tag_name, params, page_param_name='page'):
+    return SimplePagination(params, page_param_name)
 
 class FieldHelpText(template.Node):
 
diff --git a/scielo_extensions/tests/tests_tools.py b/scielo_extensions/tests/tests_tools.py
index e659209..c2cbf9f 100644
--- a/scielo_extensions/tests/tests_tools.py
+++ b/scielo_extensions/tests/tests_tools.py
@@ -58,15 +58,15 @@ def test_named_pagination(self):
 
         result_html = template.render(context)
 
-        self.assertEqual('''<div class="pagination" style="margin:0;padding-top:8px;text-align:center;">
-            <ul><li><a href="?" style="line-height: 20px;padding: 0 5px;">All</a></li>
-                <li><a href="?letter=a" style="line-height: 20px;padding: 0 5px;">a</a></li>
-                <li class="active"><a href="?letter=f" style="line-height: 20px;padding: 0 5px;">f</a></li>
-                <li><a href="?letter=m" style="line-height: 20px;padding: 0 5px;">m</a></li>
-                <li><a href="?letter=p" style="line-height: 20px;padding: 0 5px;">p</a></li>
-                <li><a href="?letter=r" style="line-height: 20px;padding: 0 5px;">r</a></li>
-                <li><a href="?letter=t" style="line-height: 20px;padding: 0 5px;">t</a></li>
-                <li><a href="?letter=t" style="line-height: 20px;padding: 0 5px;">t</a></li>
-                <li><a href="?letter=u" style="line-height: 20px;padding: 0 5px;">u</a></li>
-                <li><a href="?letter=z" style="line-height: 20px;padding: 0 5px;">z</a></li>
+        self.assertEqual('''<div class="pagination">
+            <ul><li><a href="?">All</a></li>
+                <li><a href="?letter=a">a</a></li>
+                <li class="active"><a href="?letter=f">f</a></li>
+                <li><a href="?letter=m">m</a></li>
+                <li><a href="?letter=p">p</a></li>
+                <li><a href="?letter=r">r</a></li>
+                <li><a href="?letter=t">t</a></li>
+                <li><a href="?letter=t">t</a></li>
+                <li><a href="?letter=u">u</a></li>
+                <li><a href="?letter=z">z</a></li>
             </ul></div>''', result_html)

From ae5389728a16a89ff39b2cff986f1cd0d3475c4c Mon Sep 17 00:00:00 2001
From: Juan Funez <juan.funez@gmail.com>
Date: Mon, 31 Mar 2014 17:08:06 -0300
Subject: [PATCH 2/2] edito requirements e settings (do banco de dados) pora
 executar os test

---
 requirements.txt |  1 +
 runtests.py      | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/requirements.txt b/requirements.txt
index b084c8e..54866de 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 django
+coverage
 django-coverage
\ No newline at end of file
diff --git a/runtests.py b/runtests.py
index e89dbc6..e433e9c 100644
--- a/runtests.py
+++ b/runtests.py
@@ -12,6 +12,16 @@ def main():
     )
     settings.PAGINATION__ITEMS_PER_PAGE = 5
     settings.DOCUMENTATION_BASE_URL = ''
+    settings.DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',  # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+            'NAME': 'scielo_extensions.db',         # Or path to database file if using sqlite3.
+            'USER': '',               # Not used with sqlite3.
+            'PASSWORD': '',                   # Not used with sqlite3.
+            'HOST': '',                       # Set to empty string for localhost. Not used with sqlite3.
+            'PORT': '',                       # Set to empty string for default. Not used with sqlite3.
+        }
+    }
 
     call_command('test_coverage', 'scielo_extensions')