| 1 |
commit: 41e97d54fa8be7927c6daefd0acc5f42d23c7420 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Sat Jun 30 19:24:04 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Sat Jun 30 19:24:04 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=41e97d54 |
| 7 |
|
| 8 |
Add set optional prev and next |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/generic/templatetags/paginator.py | 5 +++-- |
| 12 |
gpackages/templates/paginator.html | 4 ++-- |
| 13 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gpackages/apps/generic/templatetags/paginator.py b/gpackages/apps/generic/templatetags/paginator.py |
| 16 |
index 109154b..c856f9c 100644 |
| 17 |
--- a/gpackages/apps/generic/templatetags/paginator.py |
| 18 |
+++ b/gpackages/apps/generic/templatetags/paginator.py |
| 19 |
@@ -58,7 +58,7 @@ def get_r_range(m_end, num_pages, num): |
| 20 |
return r_start, num_pages, r_gap |
| 21 |
|
| 22 |
@register.inclusion_tag('paginator.html') |
| 23 |
-def paginator(page, num_middle, num_first, all_num = 0): |
| 24 |
+def paginator(page, num_middle, num_first, n_a_p = True, all_num = 0): |
| 25 |
paginator = page.paginator |
| 26 |
num_pages = paginator.num_pages |
| 27 |
if all_num >= num_pages: |
| 28 |
@@ -80,4 +80,5 @@ def paginator(page, num_middle, num_first, all_num = 0): |
| 29 |
'first_pages': first, |
| 30 |
'last_pages': last, |
| 31 |
'left_gap': l_gap, |
| 32 |
- 'right_gap': r_gap} |
| 33 |
+ 'right_gap': r_gap, |
| 34 |
+ 'next_and_prev': bool(n_a_p)} |
| 35 |
|
| 36 |
diff --git a/gpackages/templates/paginator.html b/gpackages/templates/paginator.html |
| 37 |
index 8d8e309..74a5956 100644 |
| 38 |
--- a/gpackages/templates/paginator.html |
| 39 |
+++ b/gpackages/templates/paginator.html |
| 40 |
@@ -2,7 +2,7 @@ |
| 41 |
{% if is_paginated %} |
| 42 |
<div class="pagination pagination-centered" id="paginator"> |
| 43 |
<ul> |
| 44 |
- {% if page_obj.has_previous %} |
| 45 |
+ {% if page_obj.has_previous and next_and_prev %} |
| 46 |
<li> |
| 47 |
<a href="?page={{ page_obj.previous_page_number }}">← Prev</a> |
| 48 |
</li> |
| 49 |
@@ -22,7 +22,7 @@ |
| 50 |
{% for page in last_pages %} |
| 51 |
<li class="{{ page.active }}"><a href="{{ page.link }}">{{ page.num }}</a></li> |
| 52 |
{% endfor %} |
| 53 |
- {% if page_obj.has_next %} |
| 54 |
+ {% if page_obj.has_next and next_and_prev %} |
| 55 |
<li> |
| 56 |
<a href="?page={{ page_obj.next_page_number }}">Next →</a> |
| 57 |
</li> |
Archives