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

@@ -1,4 +1,4 @@
{% extends "@blockier-templates/tables/users.html.twig" %}
{% extends "@uf-tweaks/tables/users.html.twig" %}
{% block table %}
<table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
@@ -7,10 +7,10 @@
<th class="sorter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-info" data-priority="1">{{translate('USER')}} <i class="fas fa-sort"></i></th>
<th class="filter-metatext" data-column-name="organisations" data-sorter="false" data-column-template="#{{table.id}}-column-organisations" data-priority="2">{{translate("ORGANISATION", 2)}}</th>
{% if 'last_activity' in table.columns %}
<th class="sorter-metanum" data-column-name="last_activity" data-column-template="#{{table.id}}-column-last-activity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fas fa-sort"></i></th>
<th class="sorter-metanum" data-column-name="last_activity" data-column-template="#{{table.id}}-column-lastActivity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fas fa-sort"></i></th>
{% endif %}
{% if 'via_roles' in table.columns %}
<th data-column-template="#{{table.id}}-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
<th data-column-template="#{{table.id}}-column-viaRoles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
{% endif %}
<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>
<th data-column-name="actions" data-column-template="#{{table.id}}-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
@@ -23,6 +23,8 @@
{% block table_cell_templates %}
{{ parent() }}
{{ block('table_cell_template_organisations', 'tables/partials/users/column-organisations.html.twig') }}
{% block table_users_column_organisations %}
{% include 'tables/columns/users-organisations.html.twig' %}
{% endblock %}
{% endblock %}