pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add pagination

Browse Source
This commit is contained in:
Montana
2019-01-07 15:54:07 -05:00
committed by leigh-mil
parent 3731dd876e
commit ef6d9a2c5f
8 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
templates/components/pagination.html
View File

@@ -1,4 +1,4 @@
{% macro Page(pagination, route, i, label=None, disabled=False) -%}
{% macro Page(pagination, route, i, label=None, disabled=False, workspace_id=None) -%}
{% set label = label or i %}
{% set button_class = "page usa-button " %}
@@ -11,38 +11,38 @@
{% set button_class = button_class + "usa-button-secondary" %}
{% endif %}
<a id="{{ label }}" type="button" class="{{ button_class }}" href="{{ url_for(route, page=i, perPage=pagination.per_page) if not disabled else 'null' }}">{{ label }}</a>
<a id="{{ label }}" type="button" class="{{ button_class }}" href="{{ url_for(route, workspace_id=workspace_id, page=i, perPage=pagination.per_page) if not disabled else 'null' }}">{{ label }}</a>
{%- endmacro %}
{% macro Pagination(pagination, route) -%}
{% macro Pagination(pagination, route, workspace_id=None) -%}
<div class="pagination">
{% if pagination.page == 1 %}
{% set max_page = [pagination.pages, 5] | min %}
{{ Page(pagination, route, 1, label="first", disabled=True) }}
{{ Page(pagination, route, pagination.page - 1, label="prev", disabled=True) }}
{{ Page(pagination, route, 1, label="first", disabled=True, workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.page - 1, label="prev", disabled=True, workspace_id=workspace_id) }}
{% for i in range(1, max_page + 1) %}
{{ Page(pagination, route, i) }}
{{ Page(pagination, route, i, workspace_id=workspace_id) }}
{% endfor %}
{{ Page(pagination, route, pagination.page + 1, label="next") }}
{{ Page(pagination, route, pagination.pages, label="last") }}
{{ Page(pagination, route, pagination.page + 1, label="next", workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.pages, label="last", workspace_id=workspace_id) }}
{% elif pagination.page == pagination.pages %}
{{ Page(pagination, route, 1, label="first") }}
{{ Page(pagination, route, pagination.page - 1, label="prev") }}
{{ Page(pagination, route, 1, label="first", workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.page - 1, label="prev", workspace_id=workspace_id) }}
{% for i in range(pagination.pages - 4, pagination.pages + 1) %}
{{ Page(pagination, route, i) }}
{{ Page(pagination, route, i, workspace_id=workspace_id) }}
{% endfor %}
{{ Page(pagination, route, pagination.page + 1, label="next", disabled=True) }}
{{ Page(pagination, route, pagination.pages, label="last", disabled=True) }}
{{ Page(pagination, route, pagination.page + 1, label="next", disabled=True, workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.pages, label="last", disabled=True, workspace_id=workspace_id) }}
{% else %}
{% set window = pagination | pageWindow %}
{{ Page(pagination, route, 1, label="first") }}
{{ Page(pagination, route, pagination.page - 1, label="prev") }}
{{ Page(pagination, route, 1, label="first", workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.page - 1, label="prev", workspace_id=workspace_id) }}
{% for i in range(window.0, window.1 + 1) %}
{{ Page(pagination, route, i) }}
{{ Page(pagination, route, i, workspace_id=workspace_id) }}
{% endfor %}
{{ Page(pagination, route, pagination.page + 1, label="next") }}
{{ Page(pagination, route, pagination.pages, label="last") }}
{{ Page(pagination, route, pagination.page + 1, label="next", workspace_id=workspace_id) }}
{{ Page(pagination, route, pagination.pages, label="last", workspace_id=workspace_id) }}
{% endif %}
</div>
{%- endmacro %}

3
templates/navigation/workspace_navigation.html
View File

@@ -56,8 +56,7 @@
) }}
{% endif %}
<!-- TODO: diff permission -->
{% if user_can(permissions.VIEW_USAGE_DOLLARS) %}
{% if user_can(permissions.VIEW_AUDIT_LOG) %}
{{ SidenavItem(
("navigation.workspace_navigation.activity_log" | translate),
href=url_for("workspaces.workspace_activity", workspace_id=workspace.id),

2
templates/workspaces/activity/index.html
View File

@@ -1,4 +1,5 @@
{% extends "workspaces/base.html" %}
{% from "components/pagination.html" import Pagination %}
{% block workspace_content %}
@@ -19,5 +20,6 @@
</ul>
</section>
{{ Pagination(audit_events, 'workspaces.workspace_activity', workspace_id=workspace_id) }}
</div>
{% endblock %}