Add svg class support for organization logo figures

contao/dca/tl_module.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Contao\Database;
+use Contao\Controller;
 use Contao\StringUtil;
 
 $GLOBALS['TL_DCA']['tl_module']['palettes']['member_organizations'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
@@ -157,3 +158,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
     'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
     'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
 ];
+
+if (isset($GLOBALS['TL_DCA']['tl_module']['fields']['list_layout'])) {
+    $GLOBALS['TL_DCA']['tl_module']['fields']['list_layout']['options_callback'] = static function (): array {
+        $options = Controller::getTemplateGroup('list_');
+
+        if (!isset($options['list_default_organisationen'])) {
+            $options['list_default_organisationen'] = 'list_default_organisationen';
+        }
+
+        return $options;
+    };
+}

contao/templates/frontend/event_filter.html.twig

@@ -2,8 +2,8 @@
     <div class="select-filters">
         <div class="widget-select category">
             <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
-            <select id="tag-filter">
-                <option value="all" data-placeholder="true">Kategorie wählen</option>
+            <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
+                <option value="">Kategorie wählen</option>
                 {% for tag in tagButtons|default([]) %}
                     <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
                 {% endfor %}
@@ -12,8 +12,8 @@
 
         <div class="widget-select places">
             <label for="location-filter" class="visually-hidden">Ort wählen</label>
-            <select id="location-filter">
-                <option value="all" data-placeholder="true">Ort wählen</option>
+            <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
+                <option value="">Ort wählen</option>
                 {% for location in locations|default([]) %}
                     <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
                 {% endfor %}
@@ -22,8 +22,8 @@
 
         <div class="widget-select org">
             <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
-            <select id="org-filter">
-                <option value="all" data-placeholder="true">Veranstalter wählen</option>
+            <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
+                <option value="">Veranstalter wählen</option>
                 {% for organization in organizations|default([]) %}
                     <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
                 {% endfor %}
@@ -31,7 +31,7 @@
         </div>
     </div>
 
-    <button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button>
+    <button type="button" id="eventfilter-reset" class="eventfilter-reset" aria-label="Alle Filter zurücksetzen" aria-controls="{{ targetEventListId|default('eventlist')|e('html_attr') }}" hidden>Filter zurücksetzen</button>
 
     <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
 </div>
@@ -68,23 +68,36 @@
         pointer-events: none;
     }
 
-    #eventfilters .widget-select.active .ss-main {
-        outline: 2px solid currentColor;
-        outline-offset: 2px;
+    #eventfilters .widget-select.active .ts-control {
+        outline: 3px solid currentColor;
+        outline-offset: 3px;
     }
 
-    #eventfilters .ss-main:focus-visible {
-        outline: 2px solid currentColor;
-        outline-offset: 2px;
+    #eventfilters .ts-control:focus-within {
+        outline: 3px solid currentColor;
+        outline-offset: 3px;
     }
 
     #eventfilters .eventfilter-reset[hidden] {
         display: none;
     }
+
+    #eventfilters .ts-wrapper.single .ts-control {
+        background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath fill='none' stroke='%23343a40' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-position: right 0.75rem center;
+        background-size: 16px 12px;
+        padding-right: 2rem;
+    }
+
+    #eventfilters .ts-wrapper.single .ts-control > input {
+        width: auto;
+    }
+
 </style>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css">
-<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2/dist/css/tom-select.css">
+<script src="https://cdn.jsdelivr.net/npm/tom-select@2/dist/js/tom-select.complete.min.js"></script>
 
 <script type="module">
     const filters = document.getElementById('eventfilters');
@@ -114,28 +127,62 @@
 
     const animationMs = 220;
     let hideTimers = new WeakMap();
-    let currentFilter = { type: 'all', value: 'all' };
+    let currentFilter = { type: 'all', value: '' };
     let suppressedChangeEvents = 0;
 
-    const initSlimSelect = (selectElement) => {
-        if (!selectElement || 'undefined' === typeof window.SlimSelect) {
+    const initTomSelect = (selectElement) => {
+        if (!selectElement || 'undefined' === typeof window.TomSelect) {
             return null;
         }
 
-        return new window.SlimSelect({
-            select: selectElement,
-            settings: {
-                showSearch: false,
-                allowDeselect: false,
+        let shouldBlurOnChange = false;
+
+        return new window.TomSelect(selectElement, {
+            create: false,
+            sortField: {
+                field: 'text',
+                direction: 'asc',
+            },
+            render: {
+                no_results() {
+                    return '<div class="no-results" role="option" aria-disabled="true">Keine Ergebnisse gefunden</div>';
+                },
+                no_more_results() {
+                    return '<div class="no-more-results" role="option" aria-disabled="true">Keine weiteren Ergebnisse</div>';
+                },
+            },
+            onInitialize() {
+                const markPointerInteraction = () => {
+                    shouldBlurOnChange = true;
+                };
+
+                const markKeyboardInteraction = () => {
+                    shouldBlurOnChange = false;
+                };
+
+                this.control.addEventListener('pointerdown', markPointerInteraction);
+                this.control.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.control.addEventListener('keydown', markKeyboardInteraction);
+                this.dropdown.addEventListener('pointerdown', markPointerInteraction);
+                this.dropdown.addEventListener('touchstart', markPointerInteraction, { passive: true });
+                this.dropdown.addEventListener('keydown', markKeyboardInteraction);
+            },
+            onChange() {
+                if (!shouldBlurOnChange) {
+                    return;
+                }
+
+                this.blur();
+                shouldBlurOnChange = false;
             },
         });
     };
 
-    const tagSlim = initSlimSelect(tagSelect);
-    const locationSlim = initSlimSelect(locationSelect);
-    const orgSlim = initSlimSelect(orgSelect);
+    const tagTom = initTomSelect(tagSelect);
+    const locationTom = initTomSelect(locationSelect);
+    const orgTom = initTomSelect(orgSelect);
 
-    const setSelectValue = (selectElement, slimInstance, value) => {
+    const setSelectValue = (selectElement, tomInstance, value) => {
         if (!selectElement) {
             return;
         }
@@ -147,8 +194,8 @@
         suppressedChangeEvents += 1;
 
         try {
-            if (slimInstance) {
-                slimInstance.setSelected(value);
+            if (tomInstance) {
+                tomInstance.setValue(value, true);
             } else {
                 selectElement.value = value;
             }
@@ -190,9 +237,9 @@
     };
 
     const setActiveControl = ({ type, value }) => {
-        const hasActiveTag = type === 'tag' && value !== 'all';
-        const hasActiveLocation = type === 'location' && value !== 'all';
-        const hasActiveOrg = type === 'org' && value !== 'all';
+        const hasActiveTag = type === 'tag' && Boolean(value);
+        const hasActiveLocation = type === 'location' && Boolean(value);
+        const hasActiveOrg = type === 'org' && Boolean(value);
 
         tagWidget?.classList.toggle('active', hasActiveTag);
         locationWidget?.classList.toggle('active', hasActiveLocation);
@@ -209,7 +256,7 @@
         .filter(Boolean);
 
     const matches = (eventItem, filterState) => {
-        if (filterState.value === 'all') {
+        if (!filterState.value || filterState.type === 'all') {
             return true;
         }
 
@@ -225,10 +272,6 @@
             return parseIdList(eventItem.dataset.org).includes(filterState.value);
         }
 
-        if (filterState.type === 'all') {
-            return true;
-        }
-
         return true;
     };
 
@@ -280,12 +323,12 @@
 
         const selectedValue = tagSelect.value;
 
-        setSelectValue(locationSelect, locationSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(locationSelect, locationTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'tag', value: selectedValue.replace('tag-', '') },
         );
     });
@@ -297,12 +340,12 @@
 
         const selectedValue = locationSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'location', value: selectedValue.replace('location-', '') },
         );
     });
@@ -314,22 +357,22 @@
 
         const selectedValue = orgSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(locationSelect, locationTom, '');
 
         applyFilter(
-            selectedValue === 'all'
-                ? { type: 'all', value: 'all' }
+            !selectedValue
+                ? { type: 'all', value: '' }
                 : { type: 'org', value: selectedValue.replace('org-', '') },
         );
     });
 
     resetButton?.addEventListener('click', () => {
-        setSelectValue(tagSelect, tagSlim, 'all');
-        setSelectValue(locationSelect, locationSlim, 'all');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(tagSelect, tagTom, '');
+        setSelectValue(locationSelect, locationTom, '');
+        setSelectValue(orgSelect, orgTom, '');
 
-        applyFilter({ type: 'all', value: 'all' });
+        applyFilter({ type: 'all', value: '' });
     });
 
     applyFilter(currentFilter);

src/EventListener/OrganizationListingTemplateDataListener.php

@@ -10,12 +10,14 @@ use Contao\Template;
 use Doctrine\DBAL\ArrayParameterType;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
+use Psr\Log\LoggerInterface;
 
 #[AsHook('parseTemplate', method: 'onParseTemplate')]
 class OrganizationListingTemplateDataListener
 {
     public function __construct(
         private readonly Connection $connection,
+        private readonly ?LoggerInterface $logger = null,
     ) {
     }
 
@@ -49,26 +51,79 @@ class OrganizationListingTemplateDataListener
             return;
         }
 
-        $organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
-        $organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap(array_values(array_unique(array_values($rowToOrganizationIdMap))));
+        $organizationIds = array_values(array_unique(array_values($rowToOrganizationIdMap)));
+        $organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
+        $organizationLogoMap = $this->fetchOrganizationLogoMap($organizationIds);
+
+        $organizationTagLabelMap = [];
+        $rowTagIdsList = [];
+
+        foreach ($organizationTagMap as $tagData) {
+            foreach (($tagData['ids'] ?? []) as $index => $tagId) {
+                $label = trim((string) (($tagData['labels'][$index] ?? '') ?: ''));
+
+                if ('' !== $tagId && '' !== $label && !isset($organizationTagLabelMap[(string) $tagId])) {
+                    $organizationTagLabelMap[(string) $tagId] = $label;
+                }
+            }
+        }
 
         foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
-            $tagData = $organizationTagMap[$organizationId] ?? ['labels' => [], 'slugs' => []];
-            $logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
-
             if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
                 continue;
             }
 
-            $tbody[$rowIndex]['tag_labels']['content'] = implode(', ', $tagData['labels']);
-            $tbody[$rowIndex]['tag_slugs']['content'] = implode(',', $tagData['slugs']);
-            $tbody[$rowIndex]['tags']['content'] = implode(', ', $tagData['labels']);
+            $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
+            $logoData = $organizationLogoMap[$organizationId] ?? ['uuid' => '', 'isSvg' => false];
+            $logoUuid = (string) ($logoData['uuid'] ?? '');
+            $logoIsSvg = (bool) ($logoData['isSvg'] ?? false);
+            $tagIdsCsv = implode(',', $tagData['ids']);
+            $tagLabelsCsv = implode(', ', $tagData['labels']);
+
+            $tbody[$rowIndex]['tag_ids']['content'] = $tagIdsCsv;
+            $tbody[$rowIndex]['tag_labels']['content'] = $tagLabelsCsv;
+            $tbody[$rowIndex]['tags']['content'] = $tagLabelsCsv;
 
             if ('' !== $logoUuid) {
                 $tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
+                $tbody[$rowIndex]['logo_is_svg']['content'] = $logoIsSvg ? '1' : '';
             }
         }
 
+        foreach ($tbody as $rowIndex => $row) {
+            if (!\is_array($row)) {
+                $rowTagIdsList[] = '';
+                continue;
+            }
+
+            $organizationId = $rowToOrganizationIdMap[(int) $rowIndex] ?? 0;
+            $rowTagIdsList[] = ($organizationId > 0 && isset($organizationTagMap[$organizationId]))
+                ? implode(',', $organizationTagMap[$organizationId]['ids'] ?? [])
+                : '';
+        }
+
+        if (null !== $this->logger) {
+            $rowsWithoutTagIds = 0;
+
+            foreach ($rowToOrganizationIdMap as $organizationId) {
+                if (!isset($organizationTagMap[$organizationId]) || [] === ($organizationTagMap[$organizationId]['ids'] ?? [])) {
+                    ++$rowsWithoutTagIds;
+                }
+            }
+
+            if ($rowsWithoutTagIds > 0) {
+                $this->logger->warning('Organization listing enrichment found rows without tag IDs.', [
+                    'template' => (string) $template->getName(),
+                    'totalRows' => \count($tbody),
+                    'mappedRows' => \count($rowToOrganizationIdMap),
+                    'rowsWithoutTagIds' => $rowsWithoutTagIds,
+                ]);
+            }
+        }
+
+        $template->organization_tag_label_map = $organizationTagLabelMap;
+        $template->organization_row_tag_ids_list = $rowTagIdsList;
+
         $template->tbody = $tbody;
     }
 
@@ -76,6 +131,10 @@ class OrganizationListingTemplateDataListener
     private function extractOrganizationId(array $row): int
     {
         foreach (['id', 'organization_id', 'org_id'] as $fieldName) {
+            if (isset($row[$fieldName]) && \is_scalar($row[$fieldName]) && ctype_digit((string) $row[$fieldName])) {
+                return (int) $row[$fieldName];
+            }
+
             $value = $this->extractRowFieldContent($row, $fieldName);
 
             if ('' !== $value && ctype_digit($value)) {
@@ -83,27 +142,21 @@ class OrganizationListingTemplateDataListener
             }
         }
 
-        $urlCandidates = [];
-
         foreach ($row as $column) {
             if (!\is_array($column)) {
                 continue;
             }
 
-            if (isset($column['url']) && \is_scalar($column['url'])) {
-                $urlCandidates[] = (string) $column['url'];
-            }
+            foreach (['url', 'href'] as $urlField) {
+                if (!isset($column[$urlField]) || !\is_scalar($column[$urlField])) {
+                    continue;
+                }
 
-            if (isset($column['href']) && \is_scalar($column['href'])) {
-                $urlCandidates[] = (string) $column['href'];
-            }
-        }
+                $organizationId = $this->extractIdFromUrl((string) $column[$urlField]);
 
-        foreach ($urlCandidates as $url) {
-            $organizationId = $this->extractIdFromUrl($url);
-
-            if ($organizationId > 0) {
-                return $organizationId;
+                if ($organizationId > 0) {
+                    return $organizationId;
+                }
             }
         }
 
@@ -113,7 +166,15 @@ class OrganizationListingTemplateDataListener
     /** @param array<string, mixed> $row */
     private function extractRowFieldContent(array $row, string $fieldName): string
     {
-        if (!isset($row[$fieldName]) || !\is_array($row[$fieldName])) {
+        if (!isset($row[$fieldName])) {
+            return '';
+        }
+
+        if (\is_scalar($row[$fieldName])) {
+            return trim((string) $row[$fieldName]);
+        }
+
+        if (!\is_array($row[$fieldName])) {
             return '';
         }
 
@@ -152,7 +213,7 @@ class OrganizationListingTemplateDataListener
     }
 
     /** @param list<int> $organizationIds
-     *  @return array<int, array{labels: list<string>, slugs: list<string>}>
+     *  @return array<int, array{ids: list<string>, labels: list<string>}>
      */
     private function fetchOrganizationTagMap(array $organizationIds): array
     {
@@ -161,11 +222,27 @@ class OrganizationListingTemplateDataListener
         }
 
         $rows = $this->connection->executeQuery(
-            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label FROM tl_tags_rel r INNER JOIN tl_tags t ON t.id = r.tag_id WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?) ORDER BY r.pid ASC, r.tag_id ASC',
+            'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+             FROM tl_tags_rel r
+             INNER JOIN tl_tags t ON t.id = r.tag_id
+             WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
+             ORDER BY r.pid ASC, r.tag_id ASC',
             ['tl_organization', 'tags', $organizationIds],
             [ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
         )->fetchAllAssociative();
 
+        if ([] === $rows) {
+            $rows = $this->connection->executeQuery(
+                'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
+                 FROM tl_tags_rel r
+                 INNER JOIN tl_tags t ON t.id = r.tag_id
+                 WHERE r.ptable = ? AND r.pid IN (?)
+                 ORDER BY r.pid ASC, r.tag_id ASC',
+                ['tl_organization', $organizationIds],
+                [ParameterType::STRING, ArrayParameterType::INTEGER],
+            )->fetchAllAssociative();
+        }
+
         $map = [];
         $seen = [];
 
@@ -174,43 +251,37 @@ class OrganizationListingTemplateDataListener
             $tagId = (int) ($row['tag_id'] ?? 0);
             $label = trim((string) ($row['label'] ?? ''));
 
-            if ($organizationId <= 0 || $tagId <= 0 || '' === $label) {
-                continue;
-            }
-
-            if (isset($seen[$organizationId][$tagId])) {
+            if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
                 continue;
             }
 
             $seen[$organizationId][$tagId] = true;
+            $map[$organizationId]['ids'][] = (string) $tagId;
             $map[$organizationId]['labels'][] = $label;
-
-            $slug = $this->slugify($label);
-
-            if ('' !== $slug) {
-                $map[$organizationId]['slugs'][] = $slug;
-            }
         }
 
         foreach ($map as $organizationId => $tagData) {
+            $map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
             $map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
-            $map[$organizationId]['slugs'] = array_values(array_unique($tagData['slugs'] ?? []));
         }
 
         return $map;
     }
 
     /** @param list<int> $organizationIds
-     *  @return array<int, string>
+     *  @return array<int, array{uuid: string, isSvg: bool}>
      */
-    private function fetchOrganizationLogoUuidMap(array $organizationIds): array
+    private function fetchOrganizationLogoMap(array $organizationIds): array
     {
         if ([] === $organizationIds) {
             return [];
         }
 
         $rows = $this->connection->executeQuery(
-            'SELECT o.id AS organization_id, o.logo AS logo_uuid FROM tl_organization o WHERE o.id IN (?)',
+            'SELECT o.id AS organization_id, o.logo AS logo_uuid, f.extension AS file_extension, f.path AS file_path
+             FROM tl_organization o
+             LEFT JOIN tl_files f ON f.uuid = o.logo
+             WHERE o.id IN (?)',
             [$organizationIds],
             [ArrayParameterType::INTEGER],
         )->fetchAllAssociative();
@@ -220,12 +291,22 @@ class OrganizationListingTemplateDataListener
         foreach ($rows as $row) {
             $organizationId = (int) ($row['organization_id'] ?? 0);
             $logoUuid = $this->normalizeUuid($row['logo_uuid'] ?? null);
+            $extension = strtolower(trim((string) ($row['file_extension'] ?? '')));
+
+            if ('' === $extension && isset($row['file_path']) && \is_scalar($row['file_path'])) {
+                $extension = strtolower((string) pathinfo((string) $row['file_path'], PATHINFO_EXTENSION));
+            }
+
+            $isSvg = 'svg' === $extension;
 
             if ($organizationId <= 0 || '' === $logoUuid) {
                 continue;
             }
 
-            $map[$organizationId] = $logoUuid;
+            $map[$organizationId] = [
+                'uuid' => $logoUuid,
+                'isSvg' => $isSvg,
+            ];
         }
 
         return $map;
@@ -258,24 +339,4 @@ class OrganizationListingTemplateDataListener
         return '';
     }
 
-    private function slugify(string $value): string
-    {
-        $value = trim(mb_strtolower($value));
-
-        if ('' === $value) {
-            return '';
-        }
-
-        $value = strtr($value, [
-            'ä' => 'ae',
-            'ö' => 'oe',
-            'ü' => 'ue',
-            'ß' => 'ss',
-        ]);
-
-        $value = preg_replace('/[^a-z0-9]+/u', '-', $value) ?? '';
-        $value = trim($value, '-');
-
-        return $value;
-    }
 }

templates/list_default_organisationen.html.twig

@@ -1,258 +0,0 @@
-{% extends '@Contao/block_searchable.html.twig' %}
-
-{% set wrapperAttributes = attrs()
-    .addClass(['ce_table', 'listing'])
-    .mergeWith(wrapperAttributes|default)
-%}
-
-{% block content %}
-
-    {% set legacyTagLabels = {
-        '10': 'Sport',
-        '11': 'Kultur',
-        '12': 'Politik',
-        '13': 'Soziales',
-        '14': 'Freizeit',
-        '15': 'Bildung',
-        '16': 'Religion',
-        '17': 'Natur',
-        '18': 'Gesellschaft'
-    } %}
-
-    {% if searchable %}
-        <div class="list_search">
-            <form method="get">
-                <div class="formbody">
-                    <input type="hidden" name="order_by" value="{{ order_by }}">
-                    <input type="hidden" name="sort" value="{{ sort }}">
-                    {% if per_page %}
-                        <input type="hidden" name="per_page" value="{{ per_page }}">
-                    {% endif %}
-                    <div class="widget widget-select">
-                        <label for="ctrl_search" class="invisible">{{ fields_label }}</label>
-                        <select name="search" id="ctrl_search" class="select">
-                            {{ search_fields|raw }}
-                        </select>
-                    </div>
-                    <div class="widget widget-text">
-                        <label for="ctrl_for" class="invisible">{{ keywords_label }}</label>
-                        <input type="text" name="for" id="ctrl_for" class="text" value="{{ for }}">
-                    </div>
-                    <div class="widget widget-submit">
-                        <button type="submit" class="submit">{{ search_label }}</button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    {% endif %}
-
-    {% if per_page %}
-        <div class="list_per_page">
-            <form method="get">
-                <div class="formbody">
-                    <input type="hidden" name="order_by" value="{{ order_by }}">
-                    <input type="hidden" name="sort" value="{{ sort }}">
-                    <input type="hidden" name="search" value="{{ search }}">
-                    <input type="hidden" name="for" value="{{ for }}">
-                    <div class="widget widget-select">
-                        <label for="ctrl_per_page" class="invisible">{{ per_page_label }}</label>
-                        <select name="per_page" id="ctrl_per_page" class="select">
-                            <option value="10"{% if 10 == per_page %} selected{% endif %}>10</option>
-                            <option value="20"{% if 20 == per_page %} selected{% endif %}>20</option>
-                            <option value="30"{% if 30 == per_page %} selected{% endif %}>30</option>
-                            <option value="50"{% if 50 == per_page %} selected{% endif %}>50</option>
-                            <option value="100"{% if 100 == per_page %} selected{% endif %}>100</option>
-                            <option value="250"{% if 250 == per_page %} selected{% endif %}>250</option>
-                            <option value="500"{% if 500 == per_page %} selected{% endif %}>500</option>
-                        </select>
-                    </div>
-                    <div class="widget widget-submit">
-                        <button type="submit" class="submit">{{ per_page_label }}</button>
-                    </div>
-                </div>
-            </form>
-        </div>
-    {% endif %}
-
-    {% if searchable and for and not tbody|default %}
-        {{ no_results }}
-    {% else %}
-        {% set tagOptions = {} %}
-
-        {% for row in tbody|default([]) %}
-            {% set tagsRaw = row.tag_labels.content|default(row.tags.content|default(''))|striptags %}
-            {% set tagsPrepared = tagsRaw|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': '', ';': ',', '|': ',', '/': ',', ', ': ',', ' ,': ','}) %}
-            {% set tagParts = tagsPrepared is not empty ? tagsPrepared|split(',') : [] %}
-
-            {% for part in tagParts %}
-                {% set tagValue = part|striptags|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': ''})|trim %}
-
-                {% if legacyTagLabels[tagValue] is defined %}
-                    {% set tagLabel = legacyTagLabels[tagValue] %}
-                {% elseif tagValue matches '/^\\d+$/' %}
-                    {% set tagLabel = '' %}
-                {% elseif tagValue matches '/^[\\p{L}\\p{N}\\s._,&+\\-\\/]+$/u' %}
-                    {% set tagLabel = tagValue %}
-                {% else %}
-                    {% set tagLabel = '' %}
-                {% endif %}
-
-                {% if tagLabel is not empty %}
-                    {% set tagSlug = tagLabel|lower|replace({'ä': 'ae', 'ö': 'oe', 'ü': 'ue', 'ß': 'ss', ' ': '-', '/': '-', '&': '-', '+': '-', '.': '', ',': '', '(': '', ')': '', '"': '', "'": ''}) %}
-
-                    {% if tagSlug is not empty and tagOptions[tagSlug] is not defined %}
-                        {% set tagOptions = tagOptions|merge({ (tagSlug): tagLabel }) %}
-                    {% endif %}
-                {% endif %}
-            {% endfor %}
-        {% endfor %}
-
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.css">
-
-        <div id="orgfilters" class="controls filters">
-            <label for="org-tag-filter" class="visually-hidden">Nach Typ filtern</label>
-            <select id="org-tag-filter" class="select" data-placeholder="Typ wählen">
-                <option value="">Alle</option>
-                {% for slug, label in tagOptions %}
-                    <option value="{{ slug }}">{{ label }}</option>
-                {% endfor %}
-            </select>
-            <button type="button" id="org-filter-reset" class="submit" style="display:none;">Filter zurücksetzen</button>
-        </div>
-
-        <div id="org">
-            <div id="org-list">
-                {% for row in tbody|default([]) %}
-                    {% set tagSlugsRaw = row.tag_slugs.content|default('')|trim %}
-                    {% set tagsRaw = row.tag_labels.content|default(row.tags.content|default(''))|striptags %}
-                    {% set tagsPrepared = tagsRaw|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': '', ';': ',', '|': ',', '/': ',', ', ': ',', ' ,': ','}) %}
-                    {% set tagParts = tagsPrepared is not empty ? tagsPrepared|split(',') : [] %}
-
-                    {% set tagClasses = [] %}
-                    {% set tagSlugs = [] %}
-
-                    {% if tagSlugsRaw is not empty %}
-                        {% for slug in tagSlugsRaw|split(',') %}
-                            {% set cleanedSlug = slug|trim %}
-
-                            {% if cleanedSlug is not empty %}
-                                {% set tagSlugs = tagSlugs|merge([cleanedSlug]) %}
-                                {% set tagClasses = tagClasses|merge(['tag-' ~ cleanedSlug]) %}
-                            {% endif %}
-                        {% endfor %}
-                    {% endif %}
-
-                    {% for part in tagParts if tagSlugsRaw is empty %}
-                        {% set tagValue = part|striptags|replace({'&nbsp;': '', '&amp;nbsp;': '', ' ': ''})|trim %}
-
-                        {% if legacyTagLabels[tagValue] is defined %}
-                            {% set tagLabel = legacyTagLabels[tagValue] %}
-                        {% elseif tagValue matches '/^\\d+$/' %}
-                            {% set tagLabel = '' %}
-                        {% elseif tagValue matches '/^[\\p{L}\\p{N}\\s._,&+\\-\\/]+$/u' %}
-                            {% set tagLabel = tagValue %}
-                        {% else %}
-                            {% set tagLabel = '' %}
-                        {% endif %}
-
-                        {% if tagLabel is not empty %}
-                            {% set tagSlug = tagLabel|lower|replace({'ä': 'ae', 'ö': 'oe', 'ü': 'ue', 'ß': 'ss', ' ': '-', '/': '-', '&': '-', '+': '-', '.': '', ',': '', '(': '', ')': '', '"': '', "'": ''}) %}
-
-                            {% if tagSlug is not empty %}
-                                {% set tagClasses = tagClasses|merge(['tag-' ~ tagSlug]) %}
-                                {% set tagSlugs = tagSlugs|merge([tagSlug]) %}
-                            {% endif %}
-                        {% endif %}
-                    {% endfor %}
-
-                    {% set title = row.title.content|default('') %}
-                    {% set logoUuid = row.logo_uuid.content|default('')|trim %}
-                    {% set lastCol = row|last %}
-
-                    <div class="org-item{% if tagClasses|length %} {{ tagClasses|join(' ') }}{% endif %}"{% if tagSlugs|length %} data-tags="{{ tagSlugs|join(',') }}"{% endif %}>
-                        <div class="wrapper">
-                            {% if logoUuid is not empty %}
-                                <div class="logo">{{ ('{{figure::' ~ logoUuid ~ '}}')|insert_tag_raw }}</div>
-                            {% endif %}
-
-                            {% if title is not empty %}
-                                <div class="title">{{ title|sanitize_html }}</div>
-                            {% endif %}
-
-                            {% if details and lastCol and lastCol.url|default %}
-                                <a class="details" href="{{ lastCol.url }}" title="{{ title|striptags }} - Details"></a>
-                            {% endif %}
-                        </div>
-                    </div>
-                {% endfor %}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if pagination is defined %}
-        {{ pagination|raw }}
-    {% endif %}
-
-    <script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
-    <script>
-        (function () {
-            const selectElement = document.querySelector('#org-tag-filter');
-            const resetButton = document.querySelector('#org-filter-reset');
-            const items = Array.from(document.querySelectorAll('#org-list .org-item'));
-
-            if (!selectElement || !items.length || typeof SlimSelect === 'undefined') {
-                return;
-            }
-
-            const slim = new SlimSelect({
-                select: selectElement,
-                settings: {
-                    allowDeselect: true,
-                    showSearch: false,
-                    placeholderText: 'Alle'
-                }
-            });
-
-            const applyFilter = function (selectedTag) {
-                const activeTag = selectedTag || '';
-
-                if (!activeTag) {
-                    items.forEach(function (item) {
-                        item.style.removeProperty('display');
-                    });
-
-                    if (resetButton) {
-                        resetButton.style.display = 'none';
-                    }
-
-                    return;
-                }
-
-                items.forEach(function (item) {
-                    const itemTags = (item.getAttribute('data-tags') || '').split(',').filter(Boolean);
-                    item.style.display = itemTags.includes(activeTag) ? '' : 'none';
-                });
-
-                if (resetButton) {
-                    resetButton.style.display = activeTag ? '' : 'none';
-                }
-            };
-
-            selectElement.addEventListener('change', function () {
-                applyFilter(selectElement.value || '');
-            });
-
-            if (resetButton) {
-                resetButton.addEventListener('click', function () {
-                    slim.setSelected('');
-                    applyFilter('');
-                });
-            }
-
-            if (selectElement.value) {
-                applyFilter(selectElement.value);
-            }
-        })();
-    </script>
-
-{% endblock %}