Change table template hierarchy structure

This commit is contained in:
2023-06-06 15:10:02 +01:00
parent b8cb04cd14
commit 5bbceeac9a
26 changed files with 296 additions and 315 deletions

View File

@@ -7,36 +7,26 @@
{% extends "tables/table-paginated.html.twig" %}
{% use 'tables/partials/organisations/column-info.html.twig' %}
{% use 'tables/partials/organisations/column-description.html.twig' %}
{% use 'tables/partials/organisations/column-status.html.twig' %}
{% use 'tables/partials/organisations/column-member_count.html.twig' %}
{% use 'tables/partials/organisations/column-admin_count.html.twig' %}
{% use 'tables/partials/organisations/column-join.html.twig' %}
{% use 'tables/partials/organisations/column-actions.html.twig' %}
{% block table %}
<table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
<thead>
<tr>
<th class="sorter-metatext filter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-info" data-priority="1">{{translate('ORGANISATION')}} <i class="fas fa-sort"></i></th>
{% if 'description' not in table.hidden_columns %}
<th class="sorter-metatext filter-metatext" data-column-name="description" data-column-template="#{{table.id}}-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fas fa-sort"></i></th>
{% if 'description' in table.columns %}
<th class="sorter-metatext filter-metatext" data-column-name="description" data-column-template="#{{table.id}}-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fas fa-sort"></i></th>
{% endif %}
{% if 'status' in table.columns %}
<th class="filter-select filter-metatext" data-column-name="status" data-column-template="#{{table.id}}-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>
{% endif %}
{% if checkAccess('view_organisation_members') %}
<th class="sorter-metanum" data-column-name="member_count" data-column-template="#{{table.id}}-column-memberCount" data-priority="2" style="min-width: 180px">{{translate("ORGANISATION.MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="admin_count" data-column-template="#{{table.id}}-column-adminCount" data-priority="2">{{translate("ORGANISATION.ADMIN_COUNT")}} <i class="fas fa-sort"></i></th>
{% endif %}
{% if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) -%}
<th class="filter-select filter-metatext" data-column-name="status" data-column-template="#{{table.id}}-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>
{% endif -%}
{% if checkAccess('view_organisation_members') -%}
<th class="sorter-metanum" data-column-name="member_count" data-column-template="#{{table.id}}-column-member_count" data-priority="2" style="min-width: 180px">{{translate("ORGANISATION.MEMBER_COUNT")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="admin_count" data-column-template="#{{table.id}}-column-admin_count" data-priority="2">{{translate("ORGANISATION.ADMIN_COUNT")}} <i class="fas fa-sort"></i></th>
{% endif -%}
{% if 'join' in table.columns %}
<th data-column-template="#{{table.id}}-column-join" data-column-name="join" data-sorter="false" data-filter="false" data-priority="3">{{translate("JOIN")}}/{{translate("LEAVE")}}</th>
<th data-column-template="#{{table.id}}-column-join" data-column-name="join" data-sorter="false" data-filter="false" data-priority="3">{{translate("JOIN")}}/{{translate("LEAVE")}}</th>
{% endif %}
{% if 'actions' in table.columns %}
{% if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) -%}
<th data-column-template="#{{table.id}}-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
{% endif -%}
<th data-column-template="#{{table.id}}-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
{% endif %}
</tr>
</thead>
@@ -46,13 +36,27 @@
{% endblock %}
{% block table_cell_templates %}
{{ block('table_cell_template_info') }}
{{ block('table_cell_template_description') }}
{{ block('table_cell_template_status') }}
{{ block('table_cell_template_member_count') }}
{{ block('table_cell_template_admin_count') }}
{{ block('table_cell_template_join') }}
{{ block('table_cell_template_actions') }}
{% block table_organisations_column_info %}
{% include "tables/columns/organisations-info.html.twig" %}
{% endblock %}
{% block table_organisations_column_description %}
{% include "tables/columns/organisations-description.html.twig" %}
{% endblock %}
{% block table_organisations_column_status %}
{% include "tables/columns/organisations-status.html.twig" %}
{% endblock %}
{% block table_organisations_column_member_count %}
{% include "tables/columns/organisations-member_count.html.twig" %}
{% endblock %}
{% block table_organisations_column_admin_count %}
{% include "tables/columns/organisations-admin_count.html.twig" %}
{% endblock %}
{% block table_organisations_column_join %}
{% include "tables/columns/organisations-join.html.twig" %}
{% endblock %}
{% block table_organisations_column_actions %}
{% include "tables/columns/organisations-actions.html.twig" %}
{% endblock %}
{% endblock %}