Merge branch 'bootstrap5' into 110_extend_thirdparty

This commit is contained in:
Mathieu Jaumotte 2021-07-16 13:24:35 +02:00
commit 1e626d573f
3 changed files with 45 additions and 19 deletions

View File

@ -1,27 +1,29 @@
{%- macro page(text, page, class = "") -%} {%- macro page(text, page, class = "") -%}
<span class="link {{ class }}"><a href="{{ page.generateUrl() }}">{{ text }}</a></span> <li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
{%- endmacro -%} {%- endmacro -%}
{% import _self as m %} {% import _self as m %}
{% if paginator|length > 1 %} {% if paginator|length > 1 %}
<div class="pagination long"> <nav aria-label="Page navigation">
{%- if paginator.hasPreviousPage() -%} <ul class="pagination justify-content-center long">
{{ m.page('Previous'|trans, paginator.getPreviousPage() ) }} {%- if paginator.hasPreviousPage() -%}
{%- endif -%} {{ m.page('Previous'|trans, paginator.getPreviousPage() ) }}
{% for i in range(10, 1) %}
{%- if paginator.hasPage(current - i) -%}
{{ m.page(current - i, paginator.getPage(current - i) ) }}
{%- endif -%} {%- endif -%}
{%- endfor -%} {% for i in range(10, 1) %}
<span class="current link">{{ current }}</span> {%- if paginator.hasPage(current - i) -%}
{% for i in range(1,10) %} {{ m.page(current - i, paginator.getPage(current - i) ) }}
{%- if paginator.hasPage(current + i) -%} {%- endif -%}
{{ m.page(current + i, paginator.getPage(current + i) ) }} {%- endfor -%}
<li class="active page-item"><span class="page-link">{{ current }}</span></li>
{% for i in range(1,10) %}
{%- if paginator.hasPage(current + i) -%}
{{ m.page(current + i, paginator.getPage(current + i) ) }}
{%- endif -%}
{%- endfor -%}
{%- if paginator.hasNextPage() -%}
{{ m.page('Next'|trans, paginator.getNextPage() ) }}
{%- endif -%} {%- endif -%}
{%- endfor -%} </ul>
{%- if paginator.hasNextPage() -%} </nav>
{{ m.page('Next'|trans, paginator.getNextPage() ) }}
{%- endif -%}
</div>
{% endif %} {% endif %}

View File

@ -0,0 +1,25 @@
{%- macro page(text, page, class = "") -%}
<li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
{%- endmacro -%}
{% import _self as m %}
{% if paginator|length > 1 %}
<nav aria-label="Page navigation">
<ul class="pagination pagination-sm justify-content-center short">
{% for i in range(10, 1) %}
{%- if paginator.hasPage(current - i) -%}
{{ m.page(current - i, paginator.getPage(current - i) ) }}
{%- endif -%}
{%- endfor -%}
<li class="active page-item"><span class="page-link">{{ current }}</span></li>
{% for i in range(1,10) %}
{%- if paginator.hasPage(current + i) -%}
{{ m.page(current + i, paginator.getPage(current + i) ) }}
{%- endif -%}
{%- endfor -%}
</ul>
</nav>
{% endif %}

View File

@ -15,7 +15,6 @@
<nav class="filter-actions border border-secondary my-4 p-3"> <nav class="filter-actions border border-secondary my-4 p-3">
filter nav filter nav
{{ dump() }}
</nav> </nav>
</div> </div>