Projet

Général

Profil

0001-separate-pagination-logic-for-categories-and-announc.patch

Serghei Mihai (congés, retour 15/05), 07 février 2017 13:55

Télécharger (4,12 ko)

Voir les différences:

Subject: [PATCH] separate pagination logic for categories and announces
 (#14906)

 corbo/templates/corbo/announce_list.html | 30 +-----------------------------
 corbo/templates/corbo/manage.html        | 28 +---------------------------
 corbo/templates/corbo/paginator.html     | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 56 deletions(-)
 create mode 100644 corbo/templates/corbo/paginator.html
corbo/templates/corbo/announce_list.html
38 38
{% endfor %}
39 39
</ul>
40 40

  
41
{% if is_paginated %}
42
<p class="paginator">
43
  {% if page_obj.number > 1 %}
44
    {% if page_obj.previous_page_number != 1 %}
45
      <a href="?page=1">1</a>
46
      ...
47
    {% endif %}
48
  {% endif %}
49

  
50
  {% if page_obj.has_previous %}
51
    <a href="?page={{ page_obj.previous_page_number }}">{{ page_obj.previous_page_number }}</a>
52
  {% endif %}
53
  <span class="this-page">
54
    {{ page_obj.number }}
55
  </span>
56
  {% if page_obj.has_next %}
57
    <a href="?page={{ page_obj.next_page_number }}">{{ page_obj.next_page_number }}</a>
58
  {% endif %}
59

  
60
  {% if page_obj.number != page_obj.paginator.num_pages %}
61
    {% if page_obj.paginator.num_pages > 1 %}
62
       {% if page_obj.next_page_number != page_obj.paginator.num_pages %}
63
         ...
64
         <a href="?page={{ page_obj.paginator.num_pages }}">{{ page_obj.paginator.num_pages }}</a>
65
       {% endif %}
66
     {% endif %}
67
   {% endif %}
68
</p>
69
{% endif %}
41
{% include "corbo/paginator.html" %}
70 42

  
71 43
{% else %}
72 44
<div class="big-msg-info">
corbo/templates/corbo/manage.html
28 28
    {% endfor %}
29 29
  </ul>
30 30

  
31
{% if is_paginated %}
32
<p class="paginator">
33
  {% if page_obj.number > 1 %}
34
    {% if page_obj.previous_page_number != 1 %}
35
      <a href="?page=1">1</a>
36
      ...
37
    {% endif %}
38
  {% endif %}
39
  {% if page_obj.has_previous %}
40
    <a href="?page={{ page_obj.previous_page_number }}">{{ page_obj.previous_page_number }}</a>
41
  {% endif %}
42
  <span class="this-page">
43
    {{ page_obj.number }}
44
  </span>
45
  {% if page_obj.has_next %}
46
    <a href="?page={{ page_obj.next_page_number }}">{{ page_obj.next_page_number }}</a>
47
  {% endif %}
48
  {% if page_obj.number != page_obj.paginator.num_pages %}
49
    {% if page_obj.paginator.num_pages > 1 %}
50
       {% if page_obj.next_page_number != page_obj.paginator.num_pages %}
51
         ...
52
         <a href="?page={{ page_obj.paginator.num_pages }}">{{ page_obj.paginator.num_pages }}</a>
53
       {% endif %}
54
     {% endif %}
55
   {% endif %}
56
</p>
57
{% endif %}
31
  {% include "corbo/paginator.html" %}
58 32

  
59 33
{% else %}
60 34
<div class="big-msg-info">
corbo/templates/corbo/paginator.html
1
{% if is_paginated %}
2
<p class="paginator">
3
  {% if page_obj.number > 1 %}
4
    {% if page_obj.previous_page_number != 1 %}
5
      <a href="?page=1">1</a>
6
      ...
7
    {% endif %}
8
  {% endif %}
9

  
10
  {% if page_obj.has_previous %}
11
    <a href="?page={{ page_obj.previous_page_number }}">{{ page_obj.previous_page_number }}</a>
12
  {% endif %}
13
  <span class="this-page">
14
    {{ page_obj.number }}
15
  </span>
16
  {% if page_obj.has_next %}
17
    <a href="?page={{ page_obj.next_page_number }}">{{ page_obj.next_page_number }}</a>
18
  {% endif %}
19

  
20
  {% if page_obj.number != page_obj.paginator.num_pages %}
21
    {% if page_obj.paginator.num_pages > 1 %}
22
       {% if page_obj.next_page_number != page_obj.paginator.num_pages %}
23
         ...
24
         <a href="?page={{ page_obj.paginator.num_pages }}">{{ page_obj.paginator.num_pages }}</a>
25
       {% endif %}
26
     {% endif %}
27
   {% endif %}
28
</p>
29
{% endif %}
0
-