klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-21 21:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

generalize usage of the paginate_jinja macro

Browse Source
This commit is contained in:
thomas girod 2024-09-25 14:35:13 +02:00
parent 6449724ed5
commit 1800785b80
11 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
club/templates/club/club_sellings.jinja
View File

@ -53,6 +53,7 @@
{% endfor %}
</tbody>
</table>
{# TODO: Replace this pagination by an Alpine pagination #}
<script type="text/javascript">
function formPagination(link){
$("form").attr("action", link.href);

1
core/templates/core/base.jinja
View File

@ -11,6 +11,7 @@
<link rel="stylesheet" href="{{ scss('core/markdown.scss') }}">
<link rel="stylesheet" href="{{ scss('core/header.scss') }}">
<link rel="stylesheet" href="{{ scss('core/navbar.scss') }}">
<link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
<link rel="stylesheet" href="{{ static('vendored/select2/select2.min.css') }}">
{% block jquery_css %}

9
core/templates/core/macros.jinja
View File

@ -157,6 +157,15 @@
{% endmacro %}
{% macro paginate_jinja(current_page, paginator) %}
{# Add pagination buttons for pages without Alpine.
This must be coupled with a view that handles pagination
with the Django Paginator object.
Parameters:
current_page (django.core.paginator.Page): the current page object
paginator (django.core.paginator.Paginator): the paginator object
#}
<nav class="pagination">
{% if current_page.has_previous() %}
<a href="?page={{ current_page.previous_page_number() }}">

4
counter/templates/counter/cash_summary_list.jinja
View File

@ -1,5 +1,5 @@
{% extends "core/base.jinja" %}
{% from 'core/macros.jinja' import user_profile_link, paginate %}
{% from 'core/macros.jinja' import user_profile_link, paginate_jinja %}
{% block title %}
{% trans %}Cash register summary list{% endtrans %}
@ -57,7 +57,7 @@
</table>
<br>
{% if is_paginated %}
{{ paginate(page_obj, paginator) }}
{{ paginate_jinja(page_obj, paginator) }}
{% endif %}
{% else %}
{% trans %}There is no cash register summary in this website.{% endtrans %}

4
counter/templates/counter/refilling_list.jinja
View File

@ -1,5 +1,5 @@
{% extends "core/base.jinja" %}
{% from 'core/macros.jinja' import paginate %}
{% from "core/macros.jinja" import paginate_jinja %}
{% block title %}
{%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
@ -28,7 +28,7 @@
{%- endfor %}
</table>
{% if is_paginated %}
{{ paginate(page_obj, paginator) }}
{{ paginate_jinja(page_obj, paginator) }}
{% endif %}
{%- endblock %}

4
election/templates/election/election_list.jinja
View File

@ -1,5 +1,5 @@
{% extends "core/base.jinja" %}
{% from 'core/macros.jinja' import paginate %}
{% from "core/macros.jinja" import paginate_jinja %}
{% block title %}
{%- trans %}Election list{% endtrans %}
@ -46,7 +46,7 @@
</section>
{%- endfor %}
{% if is_paginated %}
{{ paginate(page_obj, paginator) }}
{{ paginate_jinja(page_obj, paginator) }}
{% endif %}
{%- endblock %}

1
forum/templates/forum/topic.jinja
View File

@ -10,7 +10,6 @@
{% block additional_css %}
<link rel="stylesheet" href="{{ scss('forum/css/forum.scss') }}">
<link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
{% endblock %}
{% block content %}

6
matmat/templates/matmat/search_form.jinja
View File

@ -1,5 +1,5 @@
{% from "core/macros.jinja" import user_mini_profile, paginate %}
{% extends "core/base.jinja" %}
{% from "core/macros.jinja" import user_mini_profile, paginate_jinja %}
{% block title %}
{% trans %}Search user{% endtrans %}
@ -18,7 +18,9 @@
{% endfor %}
</div>
{{ paginate(page_obj, paginator) }}
{% if page_obj.has_other_pages() %}
{{ paginate_jinja(page_obj, paginator) }}
{% endif %}
<hr>
{% endif %}
<h2>{% trans %}Search user{% endtrans %}</h2>

1
pedagogy/templates/pedagogy/guide.jinja
View File

@ -7,7 +7,6 @@
{% block additional_css %}
<link rel="stylesheet" href="{{ scss('pedagogy/css/pedagogy.scss') }}">
<link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
{% endblock %}
{% block head %}

4
rootplace/templates/rootplace/logs.jinja
View File

@ -1,5 +1,5 @@
{% extends "core/base.jinja" %}
{% from 'core/macros.jinja' import paginate %}
{% from "core/macros.jinja" import paginate_jinja %}
{% block title %}
{% trans %}Operation logs{% endtrans %}
@ -28,5 +28,5 @@
</table>
<br>
{{ paginate(page_obj, paginator) }}
{{ paginate_jinja(page_obj, paginator) }}
{% endblock content %}

1
sas/templates/sas/album.jinja
View File

@ -3,7 +3,6 @@
{%- block additional_css -%}
<link rel="stylesheet" href="{{ scss('sas/css/album.scss') }}">
<link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">
{%- endblock -%}
{% block title %}