Skip to content

Commit ddb655e

Browse files
author
Fabien S.
committed
Revert indentation fixes
1 parent cba9076 commit ddb655e

File tree

3 files changed

+52
-49
lines changed

3 files changed

+52
-49
lines changed

‎templates/Pagination/foundation_v6_pagination.html.twig

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<nav aria-label="Pagination">
33
{% set classAlign = (align is defined) ? " text-#{align}" : '' %}
44
<ul class="pagination{{ classAlign }}">
5+
56
{% if previous is defined %}
67
<li class="pagination-previous">
78
<a rel="prev" href="{{ path(route, knp_pagination_query(query, previous, options)) }}">
@@ -67,6 +68,7 @@
6768
{{ 'label_next'|trans({}, 'KnpPaginatorBundle') }}
6869
</li>
6970
{% endif %}
71+
7072
</ul>
7173
</nav>
7274
{% endif %}

‎templates/Pagination/uikit_v3_pagination.html.twig

+49-48
Original file line numberDiff line numberDiff line change
@@ -13,69 +13,70 @@
1313
#}
1414
{% if pageCount > 1 %}
1515
<ul class="uk-pagination uk-flex-center uk-margin-medium-top">
16-
{% if previous is defined %}
17-
<li>
18-
<a rel="prev" href="{{ path(route, knp_pagination_query(query, previous, options)) }}">&laquo;&nbsp;{{ 'label_previous'|trans({}, 'KnpPaginatorBundle') }}</a>
19-
</li>
20-
{% else %}
21-
<li class="uk-disabled">
22-
<span>&laquo;&nbsp;{{ 'label_previous'|trans({}, 'KnpPaginatorBundle') }}</span>
23-
</li>
24-
{% endif %}
2516

26-
{% if startPage > 1 %}
27-
<li>
28-
<a href="{{ path(route, knp_pagination_query(query, 1, options)) }}">1</a>
29-
</li>
30-
{% if startPage == 3 %}
17+
{% if previous is defined %}
3118
<li>
32-
<a href="{{ path(route, knp_pagination_query(query, 2, options)) }}">2</a>
19+
<a rel="prev" href="{{ path(route, knp_pagination_query(query, previous, options)) }}">&laquo;&nbsp;{{ 'label_previous'|trans({}, 'KnpPaginatorBundle') }}</a>
3320
</li>
34-
{% elseif startPage != 2 %}
21+
{% else %}
3522
<li class="uk-disabled">
36-
<span>&hellip;</span>
23+
<span>&laquo;&nbsp;{{ 'label_previous'|trans({}, 'KnpPaginatorBundle') }}</span>
3724
</li>
3825
{% endif %}
39-
{% endif %}
4026

41-
{% for page in pagesInRange %}
42-
{% if page != current %}
27+
{% if startPage > 1 %}
4328
<li>
44-
<a href="{{ path(route, knp_pagination_query(query, page, options)) }}">{{ page }}</a>
45-
</li>
46-
{% else %}
47-
<li class="uk-active">
48-
<span>{{ page }}</span>
29+
<a href="{{ path(route, knp_pagination_query(query, 1, options)) }}">1</a>
4930
</li>
50-
{% endif %}
51-
52-
{% endfor %}
53-
54-
{% if pageCount > endPage %}
55-
{% if pageCount > (endPage + 1) %}
56-
{% if pageCount > (endPage + 2) %}
31+
{% if startPage == 3 %}
32+
<li>
33+
<a href="{{ path(route, knp_pagination_query(query, 2, options)) }}">2</a>
34+
</li>
35+
{% elseif startPage != 2 %}
5736
<li class="uk-disabled">
5837
<span>&hellip;</span>
5938
</li>
60-
{% else %}
39+
{% endif %}
40+
{% endif %}
41+
42+
{% for page in pagesInRange %}
43+
{% if page != current %}
6144
<li>
62-
<a href="{{ path(route, knp_pagination_query(query, (pageCount - 1), options)) }}">{{ pageCount - 1 }}</a>
45+
<a href="{{ path(route, knp_pagination_query(query, page, options)) }}">{{ page }}</a>
6346
</li>
47+
{% else %}
48+
<li class="uk-active">
49+
<span>{{ page }}</span>
50+
</li>
51+
{% endif %}
52+
53+
{% endfor %}
54+
55+
{% if pageCount > endPage %}
56+
{% if pageCount > (endPage + 1) %}
57+
{% if pageCount > (endPage + 2) %}
58+
<li class="uk-disabled">
59+
<span>&hellip;</span>
60+
</li>
61+
{% else %}
62+
<li>
63+
<a href="{{ path(route, knp_pagination_query(query, (pageCount - 1), options)) }}">{{ pageCount - 1 }}</a>
64+
</li>
65+
{% endif %}
6466
{% endif %}
67+
<li>
68+
<a href="{{ path(route, knp_pagination_query(query, pageCount, options)) }}">{{ pageCount }}</a>
69+
</li>
6570
{% endif %}
66-
<li>
67-
<a href="{{ path(route, knp_pagination_query(query, pageCount, options)) }}">{{ pageCount }}</a>
68-
</li>
69-
{% endif %}
7071

71-
{% if next is defined %}
72-
<li>
73-
<a rel="next" href="{{ path(route, knp_pagination_query(query, next, options)) }}">{{ 'label_next'|trans({}, 'KnpPaginatorBundle') }}&nbsp;&raquo;</a>
74-
</li>
75-
{% else %}
76-
<li class="uk-disabled">
77-
<span>{{ 'label_next'|trans({}, 'KnpPaginatorBundle') }}&nbsp;&raquo;</span>
78-
</li>
79-
{% endif %}
80-
</ul>
72+
{% if next is defined %}
73+
<li>
74+
<a rel="next" href="{{ path(route, knp_pagination_query(query, next, options)) }}">{{ 'label_next'|trans({}, 'KnpPaginatorBundle') }}&nbsp;&raquo;</a>
75+
</li>
76+
{% else %}
77+
<li class="uk-disabled">
78+
<span>{{ 'label_next'|trans({}, 'KnpPaginatorBundle') }}&nbsp;&raquo;</span>
79+
</li>
80+
{% endif %}
81+
</ul>
8182
{% endif %}

‎templates/Pagination/uikit_v3_sortable.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
<i></i>
1919
{% endif %}
2020
</span>
21-
{{- title -}}
21+
{{- title -}}
2222
</a>

0 commit comments

Comments
 (0)