entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 30 Releases Activity

release 1.11.0

This commit is contained in:
Thomas NOËL 2014-06-13 10:07:30 +02:00
parent acc219aa31
commit d404c21546
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/__init__.py
View File

@ -18,7 +18,7 @@ import sys
import os
sys.path.insert(0, os.path.dirname(__file__))
__version__ = '1.10.9'
__version__ = '1.11.0'
import qommon

25
wcs/forms/backoffice.py
View File

@ -116,8 +116,9 @@ class FormDefUI:
r += htmltext('</table>')
if partial_display:
links = TemplateIO(html=True)
# add links to paginate
r += htmltext('<div id="page-links">')
links += htmltext('<div id="page-links">')
if offset > 0:
# link to previous page
query = get_request().form.copy()
@ -125,12 +126,12 @@ class FormDefUI:
query['count'] = count
if 'ajax' in query:
del query['ajax']
r += htmltext('<a data-offset="%s" href="?%s">%s</a>') % (
links += htmltext('<a data-offset="%s" href="?%s">%s</a>') % (
query['offset'], urllib.urlencode(query), _('Previous Page'))
else:
r += _('Previous Page')
links += _('Previous Page')
r += ' - '
links += ' - '
if offset + count < total_count:
# link to next page
@ -139,10 +140,10 @@ class FormDefUI:
query['count'] = count
if 'ajax' in query:
del query['ajax']
r += htmltext('<a data-offset="%s" href="?%s">%s</a>') % (
links += htmltext('<a data-offset="%s" href="?%s">%s</a>') % (
query['offset'], urllib.urlencode(query), _('Next Page'))
else:
r += _('Next Page')
links += _('Next Page')
# display links to individual pages
page_range = 7
@ -160,24 +161,26 @@ class FormDefUI:
page_numbers.append(Ellipsis)
page_numbers.append(last_page)
r += htmltext(' <span class="pages">')
links += htmltext(' <span class="pages">')
for page_number in page_numbers:
if page_number is Ellipsis:
r += htmltext(' <span class="ellipsis">&#8230;</span> ')
links += htmltext(' <span class="ellipsis">&#8230;</span> ')
else:
query['offset'] = (page_number-1)*count
if page_number == current_page:
klass = 'current'
else:
klass = ''
r += htmltext(' <a class="%s" data-offset="%s" href="?%s">%s</a> ') % (
links += htmltext(' <a class="%s" data-offset="%s" href="?%s">%s</a> ') % (
klass,
query['offset'],
urllib.urlencode(query),
page_number)
r += htmltext('</span>') # <!-- .pages -->
links += htmltext('</span>') # <!-- .pages -->
r += htmltext('</div>')
links += htmltext('</div>')
return links.getvalue() + r.getvalue()
return r.getvalue()