Add TipTap editor and switch tags to event/organization edit

config/services.yaml

@@ -14,3 +14,5 @@ services:
     tags:
       - { name: contao.callback, table: tl_organization, target: config.onbeforesubmit, method: onBeforeSubmit }
       - { name: contao.callback, table: tl_location, target: config.onbeforesubmit, method: onBeforeSubmit }
+
+  MummertMedia\EventManagerBundle\Service\MapModuleDataProvider: ~

contao/dca/tl_module.php

@@ -9,9 +9,43 @@ 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';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['member_events'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['event_filter'] = '{title_legend},name,headline,type;{eventmanager_legend},cal_calendar,eventListDomId;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['eventmanager_map'] = '{title_legend},name,headline,type;{eventmanager_legend},mapShowOrganizations,mapOrganizationListPage,organizationTypeTags,mapShowExternalOrganizations,mapShowEvents,mapInitialDisplay,mapEventColor,mapOrganizationColor,mapPitch,mapCenterMode;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['organization_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,logoFolder,organizationTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['event_edit'] = '{title_legend},name,headline,type;{eventmanager_legend},listPage,eventFolder,termsPage,frontendAuthorId,frontendArchiveId,eventTypeTags;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
 
+$getUsedOrganizationTagOptions = static function (): array {
+    $database = Database::getInstance();
+    $labelExpression = $database->fieldExists('title', 'tl_tags')
+        ? "COALESCE(NULLIF(t.title, ''), t.tag)"
+        : 't.tag';
+
+    $rows = $database
+        ->prepare(sprintf(
+            'SELECT DISTINCT t.id, %1$s AS label
+             FROM tl_tags_rel r
+             INNER JOIN tl_tags t ON t.id=r.tag_id
+             WHERE r.ptable=? AND (r.field=? OR r.field IS NULL OR r.field = \'\')
+             ORDER BY label ASC',
+            $labelExpression,
+        ))
+        ->execute('tl_organization', 'tags')
+        ->fetchAllAssoc();
+
+    $options = [];
+
+    foreach ($rows as $row) {
+        $label = trim((string) ($row['label'] ?? ''));
+
+        if ('' === $label) {
+            continue;
+        }
+
+        $options[(int) $row['id']] = $label;
+    }
+
+    return $options;
+};
+
 $GLOBALS['TL_DCA']['tl_module']['fields']['editPage'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_module']['editPage'],
     'exclude' => true,
@@ -72,20 +106,7 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['organizationTypeTags'] = [
     'label' => &$GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'],
     'exclude' => true,
     'inputType' => 'checkbox',
-    'options_callback' => static function () {
+    'options_callback' => $getUsedOrganizationTagOptions,
-        $rows = Database::getInstance()
-            ->prepare('SELECT DISTINCT t.id, t.tag FROM tl_tags t LEFT JOIN tl_tags_rel r ON r.tag_id=t.id AND r.ptable=? AND r.field=? ORDER BY t.tag ASC')
-            ->execute('tl_organization', 'tags')
-            ->fetchAllAssoc();
-
-        $options = [];
-
-        foreach ($rows as $row) {
-            $options[(int) $row['id']] = (string) $row['tag'];
-        }
-
-        return $options;
-    },
     'eval' => ['multiple' => true, 'tl_class' => 'clr'],
     'sql' => ['type' => 'blob', 'notnull' => false],
     'save_callback' => [
@@ -159,6 +180,120 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
     'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
 ];
 
+$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'mapCenterMode';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'mapInitialDisplay';
+$GLOBALS['TL_DCA']['tl_module']['subpalettes']['mapCenterMode_custom'] = 'mapCenterLat,mapCenterLng,mapCenterZoom';
+$GLOBALS['TL_DCA']['tl_module']['subpalettes']['mapInitialDisplay_organization_tag'] = 'mapInitialOrganizationTagId';
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowOrganizations'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationListPage'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'],
+    'exclude' => true,
+    'inputType' => 'pageTree',
+    'eval' => ['fieldType' => 'radio', 'mandatory' => false, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'integer', 'unsigned' => true, 'default' => 0],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowExternalOrganizations'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapShowEvents'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'],
+    'exclude' => true,
+    'inputType' => 'checkbox',
+    'eval' => ['tl_class' => 'w50 m12'],
+    'sql' => ['type' => 'string', 'length' => 1, 'fixed' => true, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapInitialDisplay'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'],
+    'exclude' => true,
+    'inputType' => 'select',
+    'options' => ['random', 'events', 'organization_tag'],
+    'reference' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'],
+    'eval' => ['mandatory' => true, 'submitOnChange' => true, 'tl_class' => 'w50', 'includeBlankOption' => false],
+    'sql' => ['type' => 'string', 'length' => 32, 'default' => 'random'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapInitialOrganizationTagId'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'],
+    'exclude' => true,
+    'inputType' => 'select',
+    'options_callback' => $getUsedOrganizationTagOptions,
+    'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'integer', 'unsigned' => true, 'default' => 0],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapEventColor'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapEventColor'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapOrganizationColor'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 7, 'rgxp' => 'hexcolor', 'colorpicker' => true, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 7, 'default' => '#BC5067'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterMode'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'],
+    'exclude' => true,
+    'inputType' => 'select',
+    'options' => ['markers', 'custom'],
+    'reference' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'],
+    'eval' => ['submitOnChange' => true, 'mandatory' => true, 'tl_class' => 'clr w50', 'includeBlankOption' => false],
+    'sql' => ['type' => 'string', 'length' => 16, 'default' => 'markers'],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLat'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterLng'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['maxlength' => 32, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'string', 'length' => 32, 'default' => ''],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapCenterZoom'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 12],
+];
+
+$GLOBALS['TL_DCA']['tl_module']['fields']['mapPitch'] = [
+    'label' => &$GLOBALS['TL_LANG']['tl_module']['mapPitch'],
+    'exclude' => true,
+    'inputType' => 'text',
+    'eval' => ['rgxp' => 'digit', 'maxlength' => 2, 'tl_class' => 'w50'],
+    'sql' => ['type' => 'smallint', 'unsigned' => true, 'default' => 0],
+];
+
 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_');

contao/languages/de/modules.php

@@ -10,4 +10,5 @@ $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['Meine Organisationen', 'L
 $GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Organisation bearbeiten', 'Bearbeitungsformular für eine Organisation.'];
 $GLOBALS['TL_LANG']['FMD']['member_events'] = ['Meine Veranstaltungen', 'Listet Veranstaltungen der zugeordneten Organisationen auf.'];
 $GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Eventfilter', 'Filter für kommende Veranstaltungen (Tags, Orte, Veranstalter).'];
+$GLOBALS['TL_LANG']['FMD']['eventmanager_map'] = ['Eventkarte', 'Zeigt Veranstaltungsorte, Organisationen und Events auf einer Karte an.'];
 $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Veranstaltung bearbeiten', 'Bearbeitungsformular für eine Veranstaltung.'];

contao/languages/de/tl_module.php

@@ -13,3 +13,25 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['ID des Newsarchivs', '
 $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'Wählen Sie die ID der Eventliste, die durch das Event-Filter-Modul gefiltert werden soll.'];
 $GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Anzuzeigende Organisationstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Organisationstyp-Tags. Leer = alle.'];
 $GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Anzuzeigende Veranstaltungstypen', 'Optional: Begrenzen Sie die im Frontend anzeigbaren Veranstaltungstyp-Tags. Leer = alle.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Organisationen anzeigen', 'Wenn aktiviert, werden Organisations-Marker auf der Karte dargestellt.'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Seite für Organisationsliste', 'Optional: Seite, auf der die Organisationsliste liegt. Wird für den Link „mehr Infos“ im Organisations-Popup verwendet.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Externe Organisationen anzeigen', 'Wenn aktiviert, werden externe Organisationen (isExternal=1) zusätzlich auf der Karte dargestellt. Standard: nein.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Veranstaltungen anzeigen', 'Wenn aktiviert, werden Event- (inkl. Orts-) Marker auf der Karte dargestellt.'];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initiale Anzeige', 'Definiert, welche Marker beim Laden der Karte initial angezeigt werden.'];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'] = [
+	'random' => 'Zufällig',
+	'events' => 'Veranstaltungen',
+	'organization_tag' => 'Organisation mit Tag',
+];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'] = ['Initialer Organisationstag', 'Wählen Sie den Tag, der initial angezeigt werden soll (nur bei „Organisation mit Tag“).'];
+$GLOBALS['TL_LANG']['tl_module']['mapEventColor'] = ['Event-Farbe (Kreise/Linien)', 'Farbe für Event-Cluster, Event-Punkte und Spiderfy-Verbindungslinien (Hex, z. B. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organisationsfarbe', 'Einheitliche Farbe für alle Organisations-Marker (Hex, z. B. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Karten-Zentrierung', 'Wählen Sie, ob die Karte anhand der Marker oder mit festen Koordinaten zentriert werden soll.'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
+	'markers' => 'Anhand der Marker (alle Marker sichtbar)',
+	'custom' => 'Feste Geodaten + Zoom-Level',
+];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Breitengrad (Center)', 'Breitengrad für die feste Kartenzentrierung, z. B. 51.0538'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Längengrad (Center)', 'Längengrad für die feste Kartenzentrierung, z. B. 13.3080'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Zoom-Level (Center)', 'Zoom-Level für die feste Kartenzentrierung (z. B. 12).'];
+$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch (Neigung)', 'Kartenneigung in Grad (0-85). Standard bei leerer Angabe: 0.'];

contao/languages/en/modules.php

@@ -10,4 +10,5 @@ $GLOBALS['TL_LANG']['FMD']['member_organizations'] = ['My organizations', 'Lists
 $GLOBALS['TL_LANG']['FMD']['organization_edit'] = ['Edit organization', 'Edit form for one organization.'];
 $GLOBALS['TL_LANG']['FMD']['member_events'] = ['My events', 'Lists events of the member organizations.'];
 $GLOBALS['TL_LANG']['FMD']['event_filter'] = ['Event filter', 'Filters upcoming events (tags, locations, organizers).'];
+$GLOBALS['TL_LANG']['FMD']['eventmanager_map'] = ['Event map', 'Displays locations, organizations and events on a map.'];
 $GLOBALS['TL_LANG']['FMD']['event_edit'] = ['Edit event', 'Edit form for one event.'];

contao/languages/en/tl_module.php

@@ -13,3 +13,25 @@ $GLOBALS['TL_LANG']['tl_module']['frontendArchiveId'] = ['News archive ID', 'Arc
 $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Select the event list ID that should be filtered by the event filter module.'];
 $GLOBALS['TL_LANG']['tl_module']['organizationTypeTags'] = ['Displayed organization types', 'Optional: Limit which organization type tags can be selected in the frontend. Empty = all.'];
 $GLOBALS['TL_LANG']['tl_module']['eventTypeTags'] = ['Displayed event types', 'Optional: Limit which event type tags can be selected in the frontend. Empty = all.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowOrganizations'] = ['Show organizations', 'If enabled, organization markers are rendered on the map.'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationListPage'] = ['Organization list page', 'Optional: page containing the organization list. Used for the "more info" link in organization popups.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowExternalOrganizations'] = ['Show external organizations', 'If enabled, external organizations (isExternal=1) are additionally rendered on the map. Default: no.'];
+$GLOBALS['TL_LANG']['tl_module']['mapShowEvents'] = ['Show events', 'If enabled, event markers (including related locations) are rendered on the map.'];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay'] = ['Initial display', 'Defines which markers are initially shown when the map is loaded.'];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialDisplay_options'] = [
+	'random' => 'Random',
+	'events' => 'Events',
+	'organization_tag' => 'Organization with tag',
+];
+$GLOBALS['TL_LANG']['tl_module']['mapInitialOrganizationTagId'] = ['Initial organization tag', 'Select the tag to be initially shown (only for "Organization with tag").'];
+$GLOBALS['TL_LANG']['tl_module']['mapEventColor'] = ['Event color (circles/lines)', 'Color for event clusters, event points and spiderfy connector lines (hex, e.g. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapOrganizationColor'] = ['Organization color', 'Unified color for all organization markers (hex, e.g. #BC5067).'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode'] = ['Map centering', 'Choose whether the map should center by markers or fixed coordinates.'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterMode_options'] = [
+	'markers' => 'By markers (fit all visible markers)',
+	'custom' => 'Fixed coordinates + zoom level',
+];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterLat'] = ['Center latitude', 'Latitude for fixed map centering, e.g. 51.0538'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterLng'] = ['Center longitude', 'Longitude for fixed map centering, e.g. 13.3080'];
+$GLOBALS['TL_LANG']['tl_module']['mapCenterZoom'] = ['Center zoom level', 'Zoom level for fixed map centering (e.g. 12).'];
+$GLOBALS['TL_LANG']['tl_module']['mapPitch'] = ['Pitch', 'Map pitch in degrees (0-85). Default when empty: 0.'];

contao/templates/frontend/event_edit.html.twig

@@ -10,11 +10,222 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/themes/airbnb.css">
     <link rel="stylesheet" href="https://unpkg.com/filepond/dist/filepond.min.css">
     <link rel="stylesheet" href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css">
+    <style>
+      .module-event-edit .event-editor-toolbar {
+        display: flex;
+        flex-wrap: wrap;
+        gap: .5rem;
+        margin: .5rem 0;
+      }
+
+      .module-event-edit .event-editor-toolbar button {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 2.2rem;
+        padding: .4rem .65rem;
+        border: 1px solid #cbd5e1;
+        border-radius: .375rem;
+        background: #f8fafc;
+        color: #1f2937;
+        font-size: .9rem;
+        font-weight: 600;
+        cursor: pointer;
+        line-height: 1;
+      }
+
+      .module-event-edit .event-editor-toolbar button img {
+        width: 1rem;
+        height: 1rem;
+        display: block;
+        filter: brightness(0) saturate(100%) invert(18%) sepia(18%) saturate(522%) hue-rotate(177deg) brightness(94%) contrast(91%);
+        transition: filter .15s ease;
+      }
+
+      .module-event-edit .event-editor-toolbar button:hover {
+        background: #eef2ff;
+        border-color: #a5b4fc;
+      }
+
+      .module-event-edit .event-editor-toolbar button:hover img {
+        filter: brightness(0) saturate(100%) invert(24%) sepia(57%) saturate(2496%) hue-rotate(231deg) brightness(87%) contrast(105%);
+      }
+
+      .module-event-edit .event-editor-toolbar button.is-active {
+        background: #4f46e5;
+        border-color: #4338ca;
+        color: #fff;
+      }
+
+      .module-event-edit .event-editor-toolbar button.is-active img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(0%) saturate(7486%) hue-rotate(63deg) brightness(106%) contrast(101%);
+      }
+
+      .module-event-edit .event-editor-toolbar button:disabled {
+        opacity: .45;
+        cursor: not-allowed;
+        background: #f1f5f9;
+        border-color: #d1d5db;
+        color: #6b7280;
+      }
+
+      .module-event-edit .event-editor-toolbar button:disabled img {
+        filter: brightness(0) saturate(100%) invert(49%) sepia(8%) saturate(616%) hue-rotate(175deg) brightness(91%) contrast(88%);
+      }
+
+      .module-event-edit .event-editor {
+        border: 1px solid #cbd5e1;
+        border-radius: .375rem;
+        padding: .75rem;
+        min-height: 14rem;
+        background: #fff;
+      }
+
+      .module-event-edit .event-editor .ProseMirror {
+        outline: none;
+        min-height: 12rem;
+      }
+
+      .module-event-edit .event-editor-counter {
+        margin-top: .5rem;
+        font-size: .85rem;
+        color: #475569;
+      }
+
+      .module-event-edit .event-editor-counter.is-over-limit {
+        color: #b91c1c;
+        font-weight: 600;
+      }
+
+      .module-event-edit .event-editor-shortcuts {
+        margin-top: .6rem;
+        font-size: .85rem;
+        color: #334155;
+      }
+
+      .module-event-edit .event-editor-shortcuts ul {
+        margin: .25rem 0 0;
+        padding-left: 1.1rem;
+      }
+
+      .module-event-edit .ns-tag-switches {
+        display: grid;
+        gap: .5rem;
+        margin-top: .35rem;
+      }
+
+      .module-event-edit .ns-tag-switch-item {
+        display: flex;
+        align-items: center;
+        gap: .65rem;
+      }
+
+      .module-event-edit .ns-tag-switch-item label {
+        margin: 0;
+      }
+
+      .module-event-edit .visually-hidden {
+        position: absolute !important;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip: rect(0, 0, 0, 0);
+        border: 0;
+        white-space: nowrap;
+      }
+
+      .module-event-edit .ns-tag-switch-input {
+        appearance: none;
+        width: 2.5rem;
+        height: 1.4rem;
+        border-radius: 999px;
+        border: 1px solid #94a3b8;
+        background: #e2e8f0;
+        position: relative;
+        cursor: pointer;
+        transition: background-color .15s ease;
+      }
+
+      .module-event-edit .ns-tag-switch-input::after {
+        content: '';
+        position: absolute;
+        top: .1rem;
+        left: .12rem;
+        width: 1rem;
+        height: 1rem;
+        border-radius: 999px;
+        background: #fff;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
+        transition: transform .15s ease;
+      }
+
+      .module-event-edit .ns-tag-switch-input:checked {
+        background: #4f46e5;
+        border-color: #4338ca;
+      }
+
+      .module-event-edit .ns-tag-switch-input:checked::after {
+        transform: translateX(1.05rem);
+      }
+
+      .module-event-edit .ns-tag-switch-input:focus-visible {
+        outline: 2px solid #1d4ed8;
+        outline-offset: 2px;
+      }
+
+      .module-event-edit .filepond--root {
+        width: 400px;
+        height: 600px;
+      }
+
+      .module-event-edit .filepond--root .filepond--drop-label {
+        height: 100%;
+        inset: 0;
+      }
+
+      .module-event-edit .filepond--root .filepond--drop-label label {
+        display: block;
+        width: auto;
+        float: none;
+        margin: 0;
+        padding: 0;
+        text-align: center;
+        font-weight: inherit;
+      }
+
+      .module-event-edit .filepond--root .filepond--drop-label,
+      .module-event-edit .filepond--root .filepond--drop-label label,
+      .module-event-edit .filepond--root .filepond--file-action-button {
+        pointer-events: auto;
+      }
+
+      .module-event-edit .filepond--root .filepond--image-preview-wrapper {
+        background: #f7f7f7;
+      }
+
+      .module-event-edit .filepond--root .filepond--panel-root,
+      .module-event-edit .filepond--root .filepond--item-panel,
+      .module-event-edit .filepond--root .filepond--image-preview {
+        background-color: #f7f7f7 !important;
+      }
+
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-idle,
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-success,
+      .module-event-edit .filepond--root .filepond--image-preview-overlay-failure {
+        background: rgba(255, 255, 255, 0.65);
+      }
+    </style>
     <script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
     <script src="https://cdn.jsdelivr.net/npm/flatpickr/dist/l10n/de.js"></script>
     <script src="https://unpkg.com/filepond/dist/filepond.min.js"></script>
     <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.js"></script>
+    <script src="https://unpkg.com/filepond-plugin-image-resize/dist/filepond-plugin-image-resize.min.js"></script>
+    <script src="https://unpkg.com/filepond-plugin-image-transform/dist/filepond-plugin-image-transform.min.js"></script>
+    <script type="module" src="{{ asset('bundles/mummertmediaeventmanager/editor.js') }}?v=1"></script>
+    <script src="{{ asset('bundles/mummertmediaeventmanager/editor-fallback.js') }}?v=1"></script>
 
     {{ form_start(form, { action: app.request.uri, attr: { 'aria-live': 'polite' } }) }}
       <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
@@ -32,9 +243,119 @@
         {{ form_row(form.organization_ids) }}
       {% endif %}
       {{ form_row(form.location_id) }}
-      {{ form_row(form.tags) }}
+
-      {{ form_row(form.teaser) }}
+      <fieldset class="widget" aria-describedby="event-tags-help event-tags-errors">
-      {{ form_row(form.description) }}
+        <legend>{{ form.tags.vars.label }}</legend>
+        <p id="event-tags-help" class="event-editor-shortcuts">Mehrfachauswahl möglich. Mit Leertaste ein- und ausschalten.</p>
+        <div class="ns-tag-switches">
+          {% for tagField in form.tags %}
+            {% set tagLabelId = tagField.vars.id ~ '-label' %}
+            <div class="ns-tag-switch-item">
+              {{ form_widget(tagField, { attr: { 'aria-describedby': tagField.vars.id ~ '-state', 'aria-labelledby': tagLabelId } }) }}
+              {{ form_label(tagField, null, { label_attr: { id: tagLabelId } }) }}
+              <span
+                id="{{ tagField.vars.id }}-state"
+                class="visually-hidden"
+                data-switch-state-for="{{ tagField.vars.id }}"
+              >
+                {{ tagField.vars.checked ? 'Ein' : 'Aus' }}
+              </span>
+            </div>
+          {% endfor %}
+        </div>
+        <div id="event-tags-errors">{{ form_errors(form.tags) }}</div>
+      </fieldset>
+
+      <div class="widget">
+        {{ form_label(form.teaser, null, { label_attr: { id: form.teaser.vars.id ~ '-label' } }) }}
+
+        <div
+          class="event-editor-toolbar"
+          data-mm-editor-toolbar="{{ form.teaser.vars.id }}"
+          role="toolbar"
+          aria-label="Formatierungswerkzeuge Beschreibung"
+          aria-orientation="horizontal"
+          aria-describedby="{{ form.teaser.vars.id }}-shortcuts"
+          aria-controls="{{ form.teaser.vars.id }}-editor"
+        >
+          <button type="button" data-action="paragraph" title="Absatz">
+            <img src="{{ asset('bundles/newssubmission/icons/paragraph.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Absatz</span>
+          </button>
+          <button type="button" data-action="h2" title="Überschrift H2">
+            <img src="{{ asset('bundles/newssubmission/icons/h2.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">H2</span>
+          </button>
+          <button type="button" data-action="h3" title="Überschrift H3">
+            <img src="{{ asset('bundles/newssubmission/icons/h3.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">H3</span>
+          </button>
+          <button type="button" data-action="bold" title="Fett (Strg/Cmd+B)" aria-keyshortcuts="Control+B Meta+B">
+            <img src="{{ asset('bundles/newssubmission/icons/bold.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Fett</span>
+          </button>
+          <button type="button" data-action="italic" title="Kursiv (Strg/Cmd+I)" aria-keyshortcuts="Control+I Meta+I">
+            <img src="{{ asset('bundles/newssubmission/icons/italic.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Kursiv</span>
+          </button>
+          <button type="button" data-action="underline" title="Unterstrichen (Strg/Cmd+U)" aria-keyshortcuts="Control+U Meta+U">
+            <img src="{{ asset('bundles/newssubmission/icons/underline.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Unterstrichen</span>
+          </button>
+          <button type="button" data-action="bulletList" title="Liste">
+            <img src="{{ asset('bundles/newssubmission/icons/ul.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Liste</span>
+          </button>
+          <button type="button" data-action="orderedList" title="Nummerierte Liste">
+            <img src="{{ asset('bundles/newssubmission/icons/ol.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Nummerierte Liste</span>
+          </button>
+          <button type="button" data-action="indent" title="Einzug vergrößern">
+            <img src="{{ asset('bundles/newssubmission/icons/indent.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Einzug vergrößern</span>
+          </button>
+          <button type="button" data-action="outdent" title="Einzug verkleinern">
+            <img src="{{ asset('bundles/newssubmission/icons/outdent.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Einzug verkleinern</span>
+          </button>
+          <button type="button" data-action="undo" title="Rückgängig (Strg/Cmd+Z)" aria-keyshortcuts="Control+Z Meta+Z">
+            <img src="{{ asset('bundles/newssubmission/icons/undo.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Rückgängig</span>
+          </button>
+          <button type="button" data-action="redo" title="Wiederholen (Strg/Cmd+Shift+Z)" aria-keyshortcuts="Control+Shift+Z Meta+Shift+Z">
+            <img src="{{ asset('bundles/newssubmission/icons/redo.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Wiederholen</span>
+          </button>
+        </div>
+
+        <div id="{{ form.teaser.vars.id }}-shortcuts" class="event-editor-shortcuts">
+          <strong>Tastaturkürzel:</strong>
+          <ul>
+            <li><span aria-hidden="true">Strg/Cmd+B</span> – Fett</li>
+            <li><span aria-hidden="true">Strg/Cmd+I</span> – Kursiv</li>
+            <li><span aria-hidden="true">Strg/Cmd+U</span> – Unterstrichen</li>
+            <li><span aria-hidden="true">Strg/Cmd+Z</span> – Rückgängig</li>
+            <li><span aria-hidden="true">Strg/Cmd+Shift+Z</span> – Wiederholen</li>
+            <li>Pfeiltasten links/rechts in der Toolbar – zwischen Buttons wechseln</li>
+          </ul>
+        </div>
+
+        <div
+          id="{{ form.teaser.vars.id }}-editor"
+          class="event-editor"
+          data-mm-editor="tiptap"
+          data-textarea-id="{{ form.teaser.vars.id }}"
+          data-editor-label="Beschreibung"
+          role="textbox"
+          aria-multiline="true"
+          aria-labelledby="{{ form.teaser.vars.id }}-label"
+          aria-describedby="{{ form.teaser.vars.id }}-shortcuts {{ form.teaser.vars.id }}-counter {{ form.teaser.vars.id }}-errors"
+        ></div>
+        <div id="{{ form.teaser.vars.id }}-counter" class="event-editor-counter" data-mm-editor-counter-for="{{ form.teaser.vars.id }}" role="status" aria-live="polite"></div>
+        {{ form_widget(form.teaser, { attr: { class: 'js-event-teaser-source', rows: 8, 'aria-hidden': 'true', tabindex: '-1' } }) }}
+        <div id="{{ form.teaser.vars.id }}-errors">{{ form_errors(form.teaser) }}</div>
+      </div>
+
       {{ form_row(form.url) }}
       {{ form_row(form.addImage) }}
 
@@ -59,7 +380,7 @@
       (function () {
         const locationSelect = document.querySelector('select.js-location-choice');
         const organizationSelect = document.querySelector('select.js-organization-choice');
-        const typeSelect = document.querySelector('select.js-event-tags-choice');
+        const tagSwitches = document.querySelectorAll('input.ns-tag-switch-input[role="switch"]');
 
         if (organizationSelect && typeof window.Choices === 'function') {
           new window.Choices(organizationSelect, {
@@ -86,18 +407,21 @@
           });
         }
 
-        if (typeSelect && typeof window.Choices === 'function') {
+        const syncSwitchState = (input) => {
-          new window.Choices(typeSelect, {
+          const isChecked = !!input.checked;
-            searchEnabled: false,
+          input.setAttribute('aria-checked', isChecked ? 'true' : 'false');
-            shouldSort: false,
+
-            removeItemButton: true,
+          const stateNode = document.querySelector(`[data-switch-state-for="${input.id}"]`);
-            itemSelectText: '',
+
-            placeholder: true,
+          if (stateNode) {
-            placeholderValue: typeSelect.dataset.placeholder || 'Typen suchen …',
+            stateNode.textContent = isChecked ? 'Ein' : 'Aus';
-            noResultsText: 'Keine Treffer',
+          }
-            noChoicesText: 'Keine Optionen verfügbar'
+        };
-          });
+
-        }
+        tagSwitches.forEach((input) => {
+          syncSwitchState(input);
+          input.addEventListener('change', () => syncSwitchState(input));
+        });
 
         if (typeof window.flatpickr === 'function') {
           const dateInputs = document.querySelectorAll('input.js-flatpickr-date');
@@ -212,14 +536,46 @@
           if (typeof window.FilePondPluginImagePreview !== 'undefined') {
             window.FilePond.registerPlugin(window.FilePondPluginImagePreview);
           }
+          if (typeof window.FilePondPluginImageResize !== 'undefined') {
+            window.FilePond.registerPlugin(window.FilePondPluginImageResize);
+          }
+          if (typeof window.FilePondPluginImageTransform !== 'undefined') {
+            window.FilePond.registerPlugin(window.FilePondPluginImageTransform);
+          }
 
           const filePondOptions = {
             instantUpload: false,
             storeAsFile: true,
             allowMultiple: false,
             allowReplace: true,
+            stylePanelAspectRatio: 0.6666667,
+            styleItemPanelAspectRatio: 0.6666667,
             credits: false,
             acceptedFileTypes: ['image/*'],
+            allowImageResize: true,
+            imageResizeUpscale: false,
+            allowImageTransform: true,
+            onaddfile: function (error, fileItem) {
+              if (error || !fileItem || typeof fileItem.setMetadata !== 'function') {
+                return;
+              }
+
+              const fileType = fileItem.fileType || (fileItem.file && fileItem.file.type) || '';
+
+              if (fileType === 'image/svg+xml') {
+                fileItem.setMetadata('resize', null);
+                return;
+              }
+
+              fileItem.setMetadata('resize', {
+                mode: 'contain',
+                upscale: false,
+                size: {
+                  width: 2000,
+                  height: 2000
+                }
+              });
+            },
             labelIdle: 'Bild hierher ziehen oder <span class="filepond--label-action">durchsuchen</span>'
           };
 

contao/templates/frontend/event_filter.html.twig

@@ -2,37 +2,38 @@
     <div class="select-filters">
         <div class="widget-select category">
             <label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
-            <select id="tag-filter">
+            <select id="tag-filter" placeholder="Kategorie wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Kategorie wählen</option>
+                <option value="">Kategorie wählen</option>
                 {% for tag in tagButtons|default([]) %}
                     <option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
                 {% endfor %}
             </select>
+            <button type="button" class="eventfilter-clear" data-eventfilter-clear="tag" aria-label="Kategorie-Filter zurücksetzen" hidden><span class="icon-cross"></span></button>
         </div>
 
         <div class="widget-select places">
             <label for="location-filter" class="visually-hidden">Ort wählen</label>
-            <select id="location-filter">
+            <select id="location-filter" placeholder="Ort wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Ort wählen</option>
+                <option value="">Ort wählen</option>
                 {% for location in locations|default([]) %}
                     <option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
                 {% endfor %}
             </select>
+            <button type="button" class="eventfilter-clear" data-eventfilter-clear="location" aria-label="Ort-Filter zurücksetzen" hidden><span class="icon-cross"></span></button>
         </div>
 
         <div class="widget-select org">
             <label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
-            <select id="org-filter">
+            <select id="org-filter" placeholder="Veranstalter wählen" autocomplete="off">
-                <option value="all" data-placeholder="true">Veranstalter wählen</option>
+                <option value="">Veranstalter wählen</option>
                 {% for organization in organizations|default([]) %}
                     <option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
                 {% endfor %}
             </select>
+            <button type="button" class="eventfilter-clear" data-eventfilter-clear="org" aria-label="Veranstalter-Filter zurücksetzen" hidden><span class="icon-cross"></span></button>
         </div>
     </div>
 
-    <button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button>
-
     <p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
 </div>
 
@@ -68,28 +69,46 @@
         pointer-events: none;
     }
 
-    #eventfilters .widget-select.active .ss-main {
+    #eventfilters .widget-select.active select {
-        outline: 2px solid currentColor;
+        outline: 3px solid currentColor;
-        outline-offset: 2px;
+        outline-offset: 3px;
     }
 
-    #eventfilters .ss-main:focus-visible {
+    #eventfilters .widget-select.active::before {
-        outline: 2px solid currentColor;
-        outline-offset: 2px;
-    }
-
-    #eventfilters .eventfilter-reset[hidden] {
         display: none;
     }
 
-    #eventfilters .ss-content,
+    #eventfilters select:focus-visible {
-    #eventfilters .ss-list {
+        outline: 3px solid currentColor;
-        overscroll-behavior: contain;
+        outline-offset: 3px;
     }
-</style>
 
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.css">
+    #eventfilters .widget-select {
-<script src="https://cdn.jsdelivr.net/npm/slim-select@3/dist/slimselect.min.js"></script>
+        position: relative;
+    }
+
+    #eventfilters .eventfilter-clear {
+        position: absolute;
+        top: 50%;
+        right: 0;
+        transform: translateY(-50%);
+        margin: 0;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border: 0;
+        background: transparent;
+        color: inherit;
+        cursor: pointer;
+        padding: 1em;
+        line-height: 1;
+    }
+
+    #eventfilters .eventfilter-clear[hidden] {
+        display: none;
+    }
+
+</style>
 
 <script type="module">
     const filters = document.getElementById('eventfilters');
@@ -114,33 +133,122 @@
     const tagWidget = tagSelect?.closest('.widget-select');
     const locationWidget = locationSelect?.closest('.widget-select');
     const orgWidget = orgSelect?.closest('.widget-select');
-    const resetButton = filters.querySelector('#eventfilter-reset');
+    const clearTagButton = filters.querySelector('[data-eventfilter-clear="tag"]');
+    const clearLocationButton = filters.querySelector('[data-eventfilter-clear="location"]');
+    const clearOrgButton = filters.querySelector('[data-eventfilter-clear="org"]');
     const status = filters.querySelector('#eventfilter-status');
+    const stateStorageKey = 'event-filter-state';
+    const stateQueryKey = 'event_filter';
 
     const animationMs = 220;
     let hideTimers = new WeakMap();
-    let currentFilter = { type: 'all', value: 'all' };
+    let currentFilter = { type: 'all', value: '' };
     let suppressedChangeEvents = 0;
 
-    const initSlimSelect = (selectElement) => {
+    const hasOptionValue = (selectElement, value) => {
-        if (!selectElement || 'undefined' === typeof window.SlimSelect) {
+        if (!selectElement) {
-            return null;
+            return false;
         }
 
-        return new window.SlimSelect({
+        return Array.from(selectElement.options).some((option) => option.value === value);
-            select: selectElement,
-            settings: {
-                showSearch: false,
-                allowDeselect: false,
-            },
-        });
     };
 
-    const tagSlim = initSlimSelect(tagSelect);
+    const rawValueToFilterState = (rawValue) => {
-    const locationSlim = initSlimSelect(locationSelect);
+        const value = (rawValue || '').trim();
-    const orgSlim = initSlimSelect(orgSelect);
 
-    const setSelectValue = (selectElement, slimInstance, value) => {
+        if (!value) {
+            return { type: 'all', value: '' };
+        }
+
+        if (value.startsWith('tag-') && hasOptionValue(tagSelect, value)) {
+            return { type: 'tag', value: value.replace('tag-', '') };
+        }
+
+        if (value.startsWith('location-') && hasOptionValue(locationSelect, value)) {
+            return { type: 'location', value: value.replace('location-', '') };
+        }
+
+        if (value.startsWith('org-') && hasOptionValue(orgSelect, value)) {
+            return { type: 'org', value: value.replace('org-', '') };
+        }
+
+        return { type: 'all', value: '' };
+    };
+
+    const filterStateToRawValue = (filterState) => {
+        if (!filterState.value || filterState.type === 'all') {
+            return '';
+        }
+
+        if (filterState.type === 'tag') {
+            return `tag-${filterState.value}`;
+        }
+
+        if (filterState.type === 'location') {
+            return `location-${filterState.value}`;
+        }
+
+        if (filterState.type === 'org') {
+            return `org-${filterState.value}`;
+        }
+
+        return '';
+    };
+
+    const readUrlState = () => {
+        const url = new URL(window.location.href);
+        return (url.searchParams.get(stateQueryKey) || '').trim();
+    };
+
+    const writeUrlState = (value) => {
+        const url = new URL(window.location.href);
+
+        if (value) {
+            url.searchParams.set(stateQueryKey, value);
+        } else {
+            url.searchParams.delete(stateQueryKey);
+        }
+
+        window.history.replaceState(window.history.state, '', url);
+    };
+
+    const readStoredState = () => {
+        try {
+            return (window.sessionStorage.getItem(stateStorageKey) || '').trim();
+        } catch (error) {
+            return '';
+        }
+    };
+
+    const writeStoredState = (value) => {
+        try {
+            if (value) {
+                window.sessionStorage.setItem(stateStorageKey, value);
+            } else {
+                window.sessionStorage.removeItem(stateStorageKey);
+            }
+        } catch (error) {
+            // noop
+        }
+    };
+
+    const syncState = (filterState) => {
+        const rawValue = filterStateToRawValue(filterState);
+        writeStoredState(rawValue);
+        writeUrlState(rawValue);
+    };
+
+    const applyControlState = (filterState) => {
+        const tagValue = filterState.type === 'tag' ? `tag-${filterState.value}` : '';
+        const locationValue = filterState.type === 'location' ? `location-${filterState.value}` : '';
+        const orgValue = filterState.type === 'org' ? `org-${filterState.value}` : '';
+
+        setSelectValue(tagSelect, tagValue);
+        setSelectValue(locationSelect, locationValue);
+        setSelectValue(orgSelect, orgValue);
+    };
+
+    const setSelectValue = (selectElement, value) => {
         if (!selectElement) {
             return;
         }
@@ -152,11 +260,7 @@
         suppressedChangeEvents += 1;
 
         try {
-            if (slimInstance) {
+            selectElement.value = value;
-                slimInstance.setSelected(value);
-            } else {
-                selectElement.value = value;
-            }
         } finally {
             queueMicrotask(() => {
                 suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
@@ -195,17 +299,33 @@
     };
 
     const setActiveControl = ({ type, value }) => {
-        const hasActiveTag = type === 'tag' && value !== 'all';
+        const hasActiveTag = type === 'tag' && Boolean(value);
-        const hasActiveLocation = type === 'location' && value !== 'all';
+        const hasActiveLocation = type === 'location' && Boolean(value);
-        const hasActiveOrg = type === 'org' && value !== 'all';
+        const hasActiveOrg = type === 'org' && Boolean(value);
 
         tagWidget?.classList.toggle('active', hasActiveTag);
         locationWidget?.classList.toggle('active', hasActiveLocation);
         orgWidget?.classList.toggle('active', hasActiveOrg);
 
-        if (resetButton) {
+        if (clearTagButton) {
-            resetButton.hidden = !(hasActiveTag || hasActiveLocation || hasActiveOrg);
+            clearTagButton.hidden = !hasActiveTag;
         }
+
+        if (clearLocationButton) {
+            clearLocationButton.hidden = !hasActiveLocation;
+        }
+
+        if (clearOrgButton) {
+            clearOrgButton.hidden = !hasActiveOrg;
+        }
+    };
+
+    const resetAllFilters = () => {
+        setSelectValue(tagSelect, '');
+        setSelectValue(locationSelect, '');
+        setSelectValue(orgSelect, '');
+
+        applyFilter({ type: 'all', value: '' });
     };
 
     const parseIdList = (rawValue) => (rawValue ?? '')
@@ -214,7 +334,7 @@
         .filter(Boolean);
 
     const matches = (eventItem, filterState) => {
-        if (filterState.value === 'all') {
+        if (!filterState.value || filterState.type === 'all') {
             return true;
         }
 
@@ -230,10 +350,6 @@
             return parseIdList(eventItem.dataset.org).includes(filterState.value);
         }
 
-        if (filterState.type === 'all') {
-            return true;
-        }
-
         return true;
     };
 
@@ -276,6 +392,7 @@
         });
 
         updateStatus(filterState);
+        syncState(filterState);
     };
 
     tagSelect?.addEventListener('change', () => {
@@ -285,12 +402,12 @@
 
         const selectedValue = tagSelect.value;
 
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(locationSelect, '');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(orgSelect, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'tag', value: selectedValue.replace('tag-', '') },
         );
     });
@@ -302,12 +419,12 @@
 
         const selectedValue = locationSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
+        setSelectValue(tagSelect, '');
-        setSelectValue(orgSelect, orgSlim, 'all');
+        setSelectValue(orgSelect, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'location', value: selectedValue.replace('location-', '') },
         );
     });
@@ -319,143 +436,30 @@
 
         const selectedValue = orgSelect.value;
 
-        setSelectValue(tagSelect, tagSlim, 'all');
+        setSelectValue(tagSelect, '');
-        setSelectValue(locationSelect, locationSlim, 'all');
+        setSelectValue(locationSelect, '');
 
         applyFilter(
-            selectedValue === 'all'
+            !selectedValue
-                ? { type: 'all', value: 'all' }
+                ? { type: 'all', value: '' }
                 : { type: 'org', value: selectedValue.replace('org-', '') },
         );
     });
 
-    resetButton?.addEventListener('click', () => {
+    clearTagButton?.addEventListener('click', resetAllFilters);
-        setSelectValue(tagSelect, tagSlim, 'all');
+    clearLocationButton?.addEventListener('click', resetAllFilters);
-        setSelectValue(locationSelect, locationSlim, 'all');
+    clearOrgButton?.addEventListener('click', resetAllFilters);
-        setSelectValue(orgSelect, orgSlim, 'all');
 
-        applyFilter({ type: 'all', value: 'all' });
+    const urlState = readUrlState();
+    const storedState = readStoredState();
+    const initialState = rawValueToFilterState(urlState || storedState);
+
+    applyControlState(initialState);
+    applyFilter(initialState);
+
+    window.addEventListener('popstate', () => {
+        const stateFromUrl = rawValueToFilterState(readUrlState());
+        applyControlState(stateFromUrl);
+        applyFilter(stateFromUrl);
     });
-
-    const getDropdownFromTarget = (target) => {
-        if (!(target instanceof Element)) {
-            return null;
-        }
-
-        return target.closest('.ss-content, .ss-list');
-    };
-
-    const getOpenDropdown = () => {
-        const openContent = document.querySelector('.ss-content.ss-open');
-
-        if (openContent) {
-            return openContent;
-        }
-
-        const openMain = document.querySelector('.ss-main.ss-open');
-
-        if (!openMain) {
-            return null;
-        }
-
-        const scope = openMain.parentElement || document;
-        return scope.querySelector('.ss-content');
-    };
-
-    const getScrollContainer = (targetDropdown) => {
-        const openDropdown = getOpenDropdown();
-
-        if (!openDropdown) {
-            return null;
-        }
-
-        if (!targetDropdown) {
-            return openDropdown;
-        }
-
-        const contentContainer = targetDropdown.closest('.ss-content');
-        return contentContainer || openDropdown;
-    };
-
-    const shouldBlockBoundaryScroll = (scrollContainer, delta) => {
-        if (!scrollContainer) {
-            return false;
-        }
-
-        if (scrollContainer.scrollHeight <= scrollContainer.clientHeight) {
-            return true;
-        }
-
-        if (delta === 0) {
-            return false;
-        }
-
-        const top = scrollContainer.scrollTop;
-        const height = scrollContainer.clientHeight;
-        const scrollHeight = scrollContainer.scrollHeight;
-
-        const atTop = top <= 0;
-        const atBottom = top + height >= scrollHeight - 1;
-
-        return (atTop && delta < 0) || (atBottom && delta > 0);
-    };
-
-    let lastTouchY = null;
-
-    document.addEventListener('wheel', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        const scrollContainer = getScrollContainer(dropdown);
-
-        if (!scrollContainer) {
-            return;
-        }
-
-        if (shouldBlockBoundaryScroll(scrollContainer, event.deltaY)) {
-            event.preventDefault();
-        }
-
-        event.stopPropagation();
-    }, { passive: false, capture: true });
-
-    document.addEventListener('touchstart', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        const scrollContainer = getScrollContainer(dropdown);
-
-        if (!scrollContainer || event.touches.length === 0) {
-            lastTouchY = null;
-            return;
-        }
-
-        lastTouchY = event.touches[0].clientY;
-    }, { passive: true, capture: true });
-
-    document.addEventListener('touchmove', (event) => {
-        const dropdown = getDropdownFromTarget(event.target);
-        const scrollContainer = getScrollContainer(dropdown);
-
-        if (!scrollContainer || event.touches.length === 0 || lastTouchY === null) {
-            return;
-        }
-
-        const currentTouchY = event.touches[0].clientY;
-        const delta = lastTouchY - currentTouchY;
-
-        if (shouldBlockBoundaryScroll(scrollContainer, delta)) {
-            event.preventDefault();
-        }
-
-        event.stopPropagation();
-
-        lastTouchY = currentTouchY;
-    }, { passive: false, capture: true });
-
-    document.addEventListener('touchend', () => {
-        lastTouchY = null;
-    }, { passive: true, capture: true });
-
-    document.addEventListener('touchcancel', () => {
-        lastTouchY = null;
-    }, { passive: true, capture: true });
-
-    applyFilter(currentFilter);
 </script>

contao/templates/frontend/event_map.html.twig

@@ -0,0 +1,115 @@
+{% set tags = mapOrganizationTags|default([]) %}
+{% set showOrganizations = mapShowOrganizations|default(false) %}
+{% set showEvents = mapShowEvents|default(false) %}
+{% set showTagButtons = showOrganizations and tags is iterable and tags|length > 0 %}
+{% set showEventButton = showOrganizations and showEvents %}
+{% set showFilterButtons = showTagButtons or showEventButton %}
+
+<section
+    id="{{ mapFilterWrapperId|e('html_attr') }}"
+    class="eventmanager-map-filter"
+    data-map-filter-wrapper="1"
+    role="region"
+    aria-label="Kartenfilter"
+>
+    {% if showFilterButtons %}
+        <button
+            type="button"
+            class="eventmanager-map-filter__toggle is-expanded"
+            data-map-filter-toggle="1"
+            aria-expanded="true"
+            aria-controls="{{ mapFilterGroupId|e('html_attr') }}"
+        >
+            <span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--expand">Filter einblenden</span>
+            <span class="eventmanager-map-filter__toggle-label eventmanager-map-filter__toggle-label--collapse">Filter ausblenden</span>
+        </button>
+    {% endif %}
+
+    <div
+        id="{{ mapFilterGroupId|e('html_attr') }}"
+        class="eventmanager-map-filter__group"
+        role="group"
+        aria-label="Organisationstypen"
+    >
+        {% if showTagButtons %}
+            {% for tag in tags %}
+                <button
+                    type="button"
+                    class="eventmanager-map-filter__tag"
+                    data-map-tag-filter="{{ tag.id|e('html_attr') }}"
+                    aria-pressed="false"
+                >{{ tag.label|e }}</button>
+            {% endfor %}
+        {% endif %}
+        {% if showEventButton %}
+            <button
+                type="button"
+                class="eventmanager-map-filter__tag"
+                data-map-event-toggle="1"
+                aria-pressed="false"
+            >Veranstaltungen</button>
+        {% endif %}
+
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag"
+            data-map-style-mode="street"
+            aria-pressed="true"
+        >Straße</button>
+
+        <button
+            type="button"
+            class="eventmanager-map-filter__tag"
+            data-map-style-mode="satellite"
+            aria-pressed="false"
+        >Satellit</button>
+    </div>
+</section>
+
+<div
+    id="{{ mapContainerId|e('html_attr') }}"
+    class="eventmanager-map"
+    data-eventmanager-map="1"
+    data-map-filter-wrapper-id="{{ mapFilterWrapperId|default('')|e('html_attr') }}"
+    data-map-style="{{ mapStyleUrl|e('html_attr') }}"
+    data-map-data-id="{{ mapDataElementId|e('html_attr') }}"
+    data-map-event-color="{{ mapEventColor|default('#BC5067')|e('html_attr') }}"
+    data-map-organization-color="{{ mapOrganizationColor|default('#BC5067')|e('html_attr') }}"
+    data-map-initial-display="{{ mapInitialDisplay|default('all')|e('html_attr') }}"
+    data-map-initial-tag-id="{{ mapInitialTagId|default(0)|e('html_attr') }}"
+    data-map-center-mode="{{ mapCenterMode|default('markers')|e('html_attr') }}"
+    data-map-center-lat="{{ mapCenterLat|default('')|e('html_attr') }}"
+    data-map-center-lng="{{ mapCenterLng|default('')|e('html_attr') }}"
+    data-map-center-zoom="{{ mapCenterZoom|default(12)|e('html_attr') }}"
+    data-map-pitch="{{ mapPitch|default(0)|e('html_attr') }}"
+></div>
+
+<style>
+    .eventmanager-map-filter {
+        display: grid;
+        gap: .5rem;
+        margin-bottom: .75rem;
+    }
+
+    .eventmanager-map-filter__group {
+        display: flex;
+        flex-wrap: wrap;
+        gap: .5rem;
+    }
+
+    .eventmanager-map-filter__tag[aria-pressed="true"] {
+        font-weight: 600;
+    }
+
+    .eventmanager-map {
+        width: 100%;
+        min-height: 420px;
+    }
+
+    .maplibregl-popup {
+        z-index: 2147483647;
+    }
+</style>
+
+<script type="application/json" id="{{ mapDataElementId|e('html_attr') }}">{{ mapItemsJson|raw }}</script>
+<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260227b"></script>

contao/templates/frontend/member_events.html.twig

@@ -16,30 +16,32 @@
           </span>
 
           {% if isEditor %}
-            <form method="post" style="display:inline;" aria-label="Sichtbarkeit für {{ item.title }} ändern">
+            <div class="member-events-actions">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+              <form method="post" style="display:inline;" aria-label="Sichtbarkeit für {{ item.title }} ändern">
-              <input type="hidden" name="action" value="toggle_published">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="action" value="toggle_published">
-              <button type="submit" aria-label="{{ item.published ? 'Auf inaktiv setzen' : 'Auf aktiv setzen' }} für {{ item.title }}">{{ item.published ? 'aktiv' : 'inaktiv' }}</button>
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-            </form>
+                <button type="submit" aria-label="{{ item.published ? 'Auf inaktiv setzen' : 'Auf aktiv setzen' }} für {{ item.title }}">{{ item.published ? 'aktiv' : 'inaktiv' }}</button>
+              </form>
 
-            {% if item.editUrl %}
+              {% if item.editUrl %}
-              <a href="{{ item.editUrl }}" aria-label="{{ item.title }} bearbeiten">Bearbeiten</a>
+                <a href="{{ item.editUrl }}" aria-label="{{ item.title }} bearbeiten">Bearbeiten</a>
-            {% endif %}
+              {% endif %}
 
-            <form method="post" style="display:inline;" aria-label="{{ item.title }} duplizieren">
+              <form method="post" style="display:inline;" data-confirm-message="{{ ('Möchten Sie das Event \"' ~ item.title ~ '\" wirklich duplizieren?')|e('html_attr') }}" aria-label="{{ item.title }} duplizieren">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="action" value="duplicate">
+                <input type="hidden" name="action" value="duplicate">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-              <button type="submit" aria-label="{{ item.title }} duplizieren">Duplizieren</button>
+                <button type="submit" aria-label="{{ item.title }} duplizieren">Duplizieren</button>
-            </form>
+              </form>
 
-            <form method="post" style="display:inline;" onsubmit="return confirm('wirklich löschen?');" aria-label="{{ item.title }} löschen">
+              <form method="post" style="display:inline;" data-confirm-message="{{ ('Möchten Sie das Event \"' ~ item.title ~ '\" wirklich löschen?')|e('html_attr') }}" aria-label="{{ item.title }} löschen">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="action" value="delete">
+                <input type="hidden" name="action" value="delete">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-              <button type="submit" aria-label="{{ item.title }} löschen">Löschen</button>
+                <button type="submit" aria-label="{{ item.title }} löschen">Löschen</button>
-            </form>
+              </form>
+            </div>
           {% endif %}
         </li>
       {% endfor %}
@@ -54,6 +56,8 @@
     </form>
   {% endif %}
 
+  <script src="/bundles/mummertmediaeventmanager/assets/member-events-confirm.js?v=20260301a"></script>
+
   <h2>Vergangene Veranstaltungen</h2>
   {% if pastEvents is empty %}
     <p>Keine vergangenen Veranstaltungen gefunden.</p>
@@ -69,30 +73,32 @@
           </span>
 
           {% if isEditor %}
-            <form method="post" style="display:inline;" aria-label="Sichtbarkeit für {{ item.title }} ändern">
+            <div class="member-events-actions">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+              <form method="post" style="display:inline;" aria-label="Sichtbarkeit für {{ item.title }} ändern">
-              <input type="hidden" name="action" value="toggle_published">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="action" value="toggle_published">
-              <button type="submit" aria-label="{{ item.published ? 'Auf inaktiv setzen' : 'Auf aktiv setzen' }} für {{ item.title }}">{{ item.published ? 'aktiv' : 'inaktiv' }}</button>
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-            </form>
+                <button type="submit" aria-label="{{ item.published ? 'Auf inaktiv setzen' : 'Auf aktiv setzen' }} für {{ item.title }}">{{ item.published ? 'aktiv' : 'inaktiv' }}</button>
+              </form>
 
-            {% if item.editUrl %}
+              {% if item.editUrl %}
-              <a href="{{ item.editUrl }}" aria-label="{{ item.title }} bearbeiten">Bearbeiten</a>
+                <a href="{{ item.editUrl }}" aria-label="{{ item.title }} bearbeiten">Bearbeiten</a>
-            {% endif %}
+              {% endif %}
 
-            <form method="post" style="display:inline;" aria-label="{{ item.title }} duplizieren">
+              <form method="post" style="display:inline;" data-confirm-message="{{ ('Möchten Sie das Event \"' ~ item.title ~ '\" wirklich duplizieren?')|e('html_attr') }}" aria-label="{{ item.title }} duplizieren">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="action" value="duplicate">
+                <input type="hidden" name="action" value="duplicate">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-              <button type="submit" aria-label="{{ item.title }} duplizieren">Duplizieren</button>
+                <button type="submit" aria-label="{{ item.title }} duplizieren">Duplizieren</button>
-            </form>
+              </form>
 
-            <form method="post" style="display:inline;" onsubmit="return confirm('wirklich löschen?');" aria-label="{{ item.title }} löschen">
+              <form method="post" style="display:inline;" data-confirm-message="{{ ('Möchten Sie das Event \"' ~ item.title ~ '\" wirklich löschen?')|e('html_attr') }}" aria-label="{{ item.title }} löschen">
-              <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
+                <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
-              <input type="hidden" name="action" value="delete">
+                <input type="hidden" name="action" value="delete">
-              <input type="hidden" name="event_id" value="{{ item.id }}">
+                <input type="hidden" name="event_id" value="{{ item.id }}">
-              <button type="submit" aria-label="{{ item.title }} löschen">Löschen</button>
+                <button type="submit" aria-label="{{ item.title }} löschen">Löschen</button>
-            </form>
+              </form>
+            </div>
           {% endif %}
         </li>
       {% endfor %}

contao/templates/frontend/organization_edit.html.twig

@@ -5,17 +5,348 @@
     <p role="alert">{{ error }}</p>
     <p><a href="{{ backUrl }}">Zurück</a></p>
   {% elseif form is defined and form %}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/choices.js/public/assets/styles/choices.min.css">
     <link rel="stylesheet" href="https://unpkg.com/filepond/dist/filepond.min.css">
     <link rel="stylesheet" href="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css">
-    <script src="https://cdn.jsdelivr.net/npm/choices.js/public/assets/scripts/choices.min.js"></script>
+    <style>
+      .module-organization-edit .event-editor-toolbar {
+        display: flex;
+        flex-wrap: wrap;
+        gap: .5rem;
+        margin: .5rem 0;
+      }
+
+      .module-organization-edit .event-editor-toolbar button {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        min-width: 2.2rem;
+        padding: .4rem .65rem;
+        border: 1px solid #cbd5e1;
+        border-radius: .375rem;
+        background: #f8fafc;
+        color: #1f2937;
+        font-size: .9rem;
+        font-weight: 600;
+        cursor: pointer;
+        line-height: 1;
+      }
+
+      .module-organization-edit .event-editor-toolbar button img {
+        width: 1rem;
+        height: 1rem;
+        display: block;
+        filter: brightness(0) saturate(100%) invert(18%) sepia(18%) saturate(522%) hue-rotate(177deg) brightness(94%) contrast(91%);
+        transition: filter .15s ease;
+      }
+
+      .module-organization-edit .event-editor-toolbar button:hover {
+        background: #eef2ff;
+        border-color: #a5b4fc;
+      }
+
+      .module-organization-edit .event-editor-toolbar button:hover img {
+        filter: brightness(0) saturate(100%) invert(24%) sepia(57%) saturate(2496%) hue-rotate(231deg) brightness(87%) contrast(105%);
+      }
+
+      .module-organization-edit .event-editor-toolbar button.is-active {
+        background: #4f46e5;
+        border-color: #4338ca;
+        color: #fff;
+      }
+
+      .module-organization-edit .event-editor-toolbar button.is-active img {
+        filter: brightness(0) saturate(100%) invert(100%) sepia(0%) saturate(7486%) hue-rotate(63deg) brightness(106%) contrast(101%);
+      }
+
+      .module-organization-edit .event-editor-toolbar button:disabled {
+        opacity: .45;
+        cursor: not-allowed;
+        background: #f1f5f9;
+        border-color: #d1d5db;
+        color: #6b7280;
+      }
+
+      .module-organization-edit .event-editor-toolbar button:disabled img {
+        filter: brightness(0) saturate(100%) invert(49%) sepia(8%) saturate(616%) hue-rotate(175deg) brightness(91%) contrast(88%);
+      }
+
+      .module-organization-edit .event-editor {
+        border: 1px solid #cbd5e1;
+        border-radius: .375rem;
+        padding: .75rem;
+        min-height: 14rem;
+        background: #fff;
+      }
+
+      .module-organization-edit .event-editor .ProseMirror {
+        outline: none;
+        min-height: 12rem;
+      }
+
+      .module-organization-edit .event-editor-counter {
+        margin-top: .5rem;
+        font-size: .85rem;
+        color: #475569;
+      }
+
+      .module-organization-edit .event-editor-counter.is-over-limit {
+        color: #b91c1c;
+        font-weight: 600;
+      }
+
+      .module-organization-edit .event-editor-shortcuts {
+        margin-top: .6rem;
+        font-size: .85rem;
+        color: #334155;
+      }
+
+      .module-organization-edit .event-editor-shortcuts ul {
+        margin: .25rem 0 0;
+        padding-left: 1.1rem;
+      }
+
+      .module-organization-edit .ns-tag-switches {
+        display: grid;
+        gap: .5rem;
+        margin-top: .35rem;
+      }
+
+      .module-organization-edit .ns-tag-switch-item {
+        display: flex;
+        align-items: center;
+        gap: .65rem;
+      }
+
+      .module-organization-edit .ns-tag-switch-item label {
+        margin: 0;
+      }
+
+      .module-organization-edit .visually-hidden {
+        position: absolute !important;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip: rect(0, 0, 0, 0);
+        border: 0;
+        white-space: nowrap;
+      }
+
+      .module-organization-edit .ns-tag-switch-input {
+        appearance: none;
+        width: 2.5rem;
+        height: 1.4rem;
+        border-radius: 999px;
+        border: 1px solid #94a3b8;
+        background: #e2e8f0;
+        position: relative;
+        cursor: pointer;
+        transition: background-color .15s ease;
+      }
+
+      .module-organization-edit .ns-tag-switch-input::after {
+        content: '';
+        position: absolute;
+        top: .1rem;
+        left: .12rem;
+        width: 1rem;
+        height: 1rem;
+        border-radius: 999px;
+        background: #fff;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, .2);
+        transition: transform .15s ease;
+      }
+
+      .module-organization-edit .ns-tag-switch-input:checked {
+        background: #4f46e5;
+        border-color: #4338ca;
+      }
+
+      .module-organization-edit .ns-tag-switch-input:checked::after {
+        transform: translateX(1.05rem);
+      }
+
+      .module-organization-edit .ns-tag-switch-input:focus-visible {
+        outline: 2px solid #1d4ed8;
+        outline-offset: 2px;
+      }
+
+      .module-organization-edit .filepond--root {
+        width: 400px;
+        height: 400px;
+      }
+
+      .module-organization-edit .filepond--root .filepond--drop-label {
+        height: 100%;
+        inset: 0;
+      }
+
+      .module-organization-edit .filepond--root .filepond--drop-label label {
+        display: block;
+        width: auto;
+        float: none;
+        margin: 0;
+        padding: 0;
+        text-align: center;
+        font-weight: inherit;
+      }
+
+      .module-organization-edit .filepond--root .filepond--drop-label,
+      .module-organization-edit .filepond--root .filepond--drop-label label,
+      .module-organization-edit .filepond--root .filepond--file-action-button {
+        pointer-events: auto;
+      }
+
+      .module-organization-edit .filepond--root .filepond--image-preview-wrapper {
+        background: #f7f7f7;
+      }
+
+      .module-organization-edit .filepond--root .filepond--panel-root,
+      .module-organization-edit .filepond--root .filepond--item-panel,
+      .module-organization-edit .filepond--root .filepond--image-preview {
+        background-color: #f7f7f7 !important;
+      }
+
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-idle,
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-success,
+      .module-organization-edit .filepond--root .filepond--image-preview-overlay-failure {
+        background: rgba(255, 255, 255, 0.65);
+      }
+    </style>
     <script src="https://unpkg.com/filepond/dist/filepond.min.js"></script>
     <script src="https://unpkg.com/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.js"></script>
+    <script src="https://unpkg.com/filepond-plugin-image-resize/dist/filepond-plugin-image-resize.min.js"></script>
+    <script src="https://unpkg.com/filepond-plugin-image-transform/dist/filepond-plugin-image-transform.min.js"></script>
+    <script type="module" src="{{ asset('bundles/mummertmediaeventmanager/editor.js') }}?v=1"></script>
+    <script src="{{ asset('bundles/mummertmediaeventmanager/editor-fallback.js') }}?v=1"></script>
 
     {{ form_start(form, { attr: { 'aria-live': 'polite' } }) }}
       <input type="hidden" name="REQUEST_TOKEN" value="{{ requestToken }}">
       <input type="hidden" id="remove_logo" name="remove_logo" value="0">
-      {{ form_widget(form) }}
+      {{ form_row(form.title) }}
+      {{ form_row(form.street) }}
+      {{ form_row(form.street2) }}
+      {{ form_row(form.postal) }}
+      {{ form_row(form.city) }}
+      {{ form_row(form.phone) }}
+      {{ form_row(form.email) }}
+      {{ form_row(form.website) }}
+
+      <div class="widget">
+        {{ form_label(form.description, null, { label_attr: { id: form.description.vars.id ~ '-label' } }) }}
+
+        <div
+          class="event-editor-toolbar"
+          data-mm-editor-toolbar="{{ form.description.vars.id }}"
+          role="toolbar"
+          aria-label="Formatierungswerkzeuge Beschreibung"
+          aria-orientation="horizontal"
+          aria-describedby="{{ form.description.vars.id }}-shortcuts"
+          aria-controls="{{ form.description.vars.id }}-editor"
+        >
+          <button type="button" data-action="paragraph" title="Absatz">
+            <img src="{{ asset('bundles/newssubmission/icons/paragraph.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Absatz</span>
+          </button>
+          <button type="button" data-action="h2" title="Überschrift H2">
+            <img src="{{ asset('bundles/newssubmission/icons/h2.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">H2</span>
+          </button>
+          <button type="button" data-action="h3" title="Überschrift H3">
+            <img src="{{ asset('bundles/newssubmission/icons/h3.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">H3</span>
+          </button>
+          <button type="button" data-action="bold" title="Fett (Strg/Cmd+B)" aria-keyshortcuts="Control+B Meta+B">
+            <img src="{{ asset('bundles/newssubmission/icons/bold.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Fett</span>
+          </button>
+          <button type="button" data-action="italic" title="Kursiv (Strg/Cmd+I)" aria-keyshortcuts="Control+I Meta+I">
+            <img src="{{ asset('bundles/newssubmission/icons/italic.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Kursiv</span>
+          </button>
+          <button type="button" data-action="underline" title="Unterstrichen (Strg/Cmd+U)" aria-keyshortcuts="Control+U Meta+U">
+            <img src="{{ asset('bundles/newssubmission/icons/underline.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Unterstrichen</span>
+          </button>
+          <button type="button" data-action="bulletList" title="Liste">
+            <img src="{{ asset('bundles/newssubmission/icons/ul.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Liste</span>
+          </button>
+          <button type="button" data-action="orderedList" title="Nummerierte Liste">
+            <img src="{{ asset('bundles/newssubmission/icons/ol.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Nummerierte Liste</span>
+          </button>
+          <button type="button" data-action="indent" title="Einzug vergrößern">
+            <img src="{{ asset('bundles/newssubmission/icons/indent.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Einzug vergrößern</span>
+          </button>
+          <button type="button" data-action="outdent" title="Einzug verkleinern">
+            <img src="{{ asset('bundles/newssubmission/icons/outdent.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Einzug verkleinern</span>
+          </button>
+          <button type="button" data-action="undo" title="Rückgängig (Strg/Cmd+Z)" aria-keyshortcuts="Control+Z Meta+Z">
+            <img src="{{ asset('bundles/newssubmission/icons/undo.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Rückgängig</span>
+          </button>
+          <button type="button" data-action="redo" title="Wiederholen (Strg/Cmd+Shift+Z)" aria-keyshortcuts="Control+Shift+Z Meta+Shift+Z">
+            <img src="{{ asset('bundles/newssubmission/icons/redo.svg') }}" alt="" aria-hidden="true">
+            <span class="visually-hidden">Wiederholen</span>
+          </button>
+        </div>
+
+        <div id="{{ form.description.vars.id }}-shortcuts" class="event-editor-shortcuts">
+          <strong>Tastaturkürzel:</strong>
+          <ul>
+            <li><span aria-hidden="true">Strg/Cmd+B</span> – Fett</li>
+            <li><span aria-hidden="true">Strg/Cmd+I</span> – Kursiv</li>
+            <li><span aria-hidden="true">Strg/Cmd+U</span> – Unterstrichen</li>
+            <li><span aria-hidden="true">Strg/Cmd+Z</span> – Rückgängig</li>
+            <li><span aria-hidden="true">Strg/Cmd+Shift+Z</span> – Wiederholen</li>
+            <li>Pfeiltasten links/rechts in der Toolbar – zwischen Buttons wechseln</li>
+          </ul>
+        </div>
+
+        <div
+          id="{{ form.description.vars.id }}-editor"
+          class="event-editor"
+          data-mm-editor="tiptap"
+          data-textarea-id="{{ form.description.vars.id }}"
+          data-editor-label="Beschreibung"
+          role="textbox"
+          aria-multiline="true"
+          aria-labelledby="{{ form.description.vars.id }}-label"
+          aria-describedby="{{ form.description.vars.id }}-shortcuts {{ form.description.vars.id }}-counter {{ form.description.vars.id }}-errors"
+        ></div>
+        <div id="{{ form.description.vars.id }}-counter" class="event-editor-counter" data-mm-editor-counter-for="{{ form.description.vars.id }}" role="status" aria-live="polite"></div>
+        {{ form_widget(form.description, { attr: { class: 'js-organization-description-source', rows: 8, 'aria-hidden': 'true', tabindex: '-1' } }) }}
+        <div id="{{ form.description.vars.id }}-errors">{{ form_errors(form.description) }}</div>
+      </div>
+
+      <fieldset class="widget" aria-describedby="organization-tags-help organization-tags-errors">
+        <legend>{{ form.tags.vars.label }}</legend>
+        <p id="organization-tags-help" class="event-editor-shortcuts">Mehrfachauswahl möglich. Mit Leertaste ein- und ausschalten.</p>
+        <div class="ns-tag-switches">
+          {% for tagField in form.tags %}
+            {% set tagLabelId = tagField.vars.id ~ '-label' %}
+            <div class="ns-tag-switch-item">
+              {{ form_widget(tagField, { attr: { 'aria-describedby': tagField.vars.id ~ '-state', 'aria-labelledby': tagLabelId } }) }}
+              {{ form_label(tagField, null, { label_attr: { id: tagLabelId } }) }}
+              <span
+                id="{{ tagField.vars.id }}-state"
+                class="visually-hidden"
+                data-switch-state-for="{{ tagField.vars.id }}"
+              >
+                {{ tagField.vars.checked ? 'Ein' : 'Aus' }}
+              </span>
+            </div>
+          {% endfor %}
+        </div>
+        <div id="organization-tags-errors">{{ form_errors(form.tags) }}</div>
+      </fieldset>
+
+      {{ form_row(form.logoUpload) }}
+
       <div class="actions" aria-label="Formularaktionen">
         <button type="submit" id="save-btn" disabled>Speichern</button>
         <button type="submit" id="save-back-btn" name="save_back" value="1" disabled>Speichern und Zurück</button>
@@ -25,20 +356,23 @@
 
     <script>
       (function () {
-        const typeSelect = document.querySelector('select.js-organization-tags-choice');
+        const tagSwitches = document.querySelectorAll('input.ns-tag-switch-input[role="switch"]');
 
-        if (typeSelect && typeof window.Choices === 'function') {
+        const syncSwitchState = (input) => {
-          new window.Choices(typeSelect, {
+          const isChecked = !!input.checked;
-            searchEnabled: false,
+          input.setAttribute('aria-checked', isChecked ? 'true' : 'false');
-            shouldSort: false,
+
-            removeItemButton: true,
+          const stateNode = document.querySelector(`[data-switch-state-for="${input.id}"]`);
-            itemSelectText: '',
+
-            placeholder: true,
+          if (stateNode) {
-            placeholderValue: typeSelect.dataset.placeholder || 'Typ auswählen …',
+            stateNode.textContent = isChecked ? 'Ein' : 'Aus';
-            noResultsText: 'Keine Treffer',
+          }
-            noChoicesText: 'Keine Optionen verfügbar'
+        };
-          });
+
-        }
+        tagSwitches.forEach((input) => {
+          syncSwitchState(input);
+          input.addEventListener('change', () => syncSwitchState(input));
+        });
 
         const currentLogoPath = {{ (currentLogoPath is defined and currentLogoPath) ? ('/' ~ currentLogoPath)|json_encode|raw : 'null' }};
         const logoInput = document.querySelector('input.js-logo-upload');
@@ -73,14 +407,46 @@
           if (typeof window.FilePondPluginImagePreview !== 'undefined') {
             window.FilePond.registerPlugin(window.FilePondPluginImagePreview);
           }
+          if (typeof window.FilePondPluginImageResize !== 'undefined') {
+            window.FilePond.registerPlugin(window.FilePondPluginImageResize);
+          }
+          if (typeof window.FilePondPluginImageTransform !== 'undefined') {
+            window.FilePond.registerPlugin(window.FilePondPluginImageTransform);
+          }
 
           const filePondOptions = {
             instantUpload: false,
             storeAsFile: true,
             allowMultiple: false,
             allowReplace: true,
+            stylePanelAspectRatio: 1,
+            styleItemPanelAspectRatio: 1,
             credits: false,
             acceptedFileTypes: ['image/*'],
+            allowImageResize: true,
+            imageResizeUpscale: false,
+            allowImageTransform: true,
+            onaddfile: function (error, fileItem) {
+              if (error || !fileItem || typeof fileItem.setMetadata !== 'function') {
+                return;
+              }
+
+              const fileType = fileItem.fileType || (fileItem.file && fileItem.file.type) || '';
+
+              if (fileType === 'image/svg+xml') {
+                fileItem.setMetadata('resize', null);
+                return;
+              }
+
+              fileItem.setMetadata('resize', {
+                mode: 'contain',
+                upscale: false,
+                size: {
+                  width: 800,
+                  height: 800
+                }
+              });
+            },
             labelIdle: 'Logo hierher ziehen oder <span class="filepond--label-action">durchsuchen</span>'
           };
 

public/assets/member-events-confirm.js

@@ -0,0 +1,28 @@
+(function () {
+    var decodeHtmlEntities = function (value) {
+        var textarea = document.createElement('textarea');
+        textarea.innerHTML = String(value || '');
+
+        return textarea.value;
+    };
+
+    var handleSubmit = function (event) {
+        var target = event.target;
+
+        if (!(target instanceof HTMLFormElement)) {
+            return;
+        }
+
+        var message = decodeHtmlEntities(target.getAttribute('data-confirm-message') || '');
+
+        if (!message) {
+            return;
+        }
+
+        if (!window.confirm(message)) {
+            event.preventDefault();
+        }
+    };
+
+    document.addEventListener('submit', handleSubmit, true);
+})();

public/editor-fallback.js

@@ -0,0 +1,112 @@
+(function () {
+  const mounts = document.querySelectorAll('[data-mm-editor="tiptap"]');
+
+  if (!mounts.length) {
+    return;
+  }
+
+  const runFallback = (mount) => {
+    if (!mount || mount.querySelector('.ProseMirror') || mount.getAttribute('data-mm-fallback-ready') === '1') {
+      return;
+    }
+
+    const textareaId = mount.getAttribute('data-textarea-id');
+
+    if (!textareaId) {
+      return;
+    }
+
+    const textarea = document.getElementById(textareaId);
+
+    if (!textarea) {
+      return;
+    }
+
+    const toolbar = document.querySelector('[data-mm-editor-toolbar="' + textareaId + '"]');
+    const form = textarea.closest('form');
+
+    mount.setAttribute('contenteditable', 'true');
+    mount.setAttribute('data-mm-fallback-ready', '1');
+    mount.classList.add('mm-fallback-editor');
+    mount.innerHTML = textarea.value || '<p></p>';
+    textarea.style.display = 'none';
+
+    const syncState = () => {
+      textarea.value = mount.innerHTML;
+    };
+
+    const focusMount = () => {
+      mount.focus();
+    };
+
+    mount.addEventListener('input', syncState);
+    mount.addEventListener('blur', syncState);
+
+    if (toolbar) {
+      toolbar.addEventListener('click', (event) => {
+        const target = event.target.closest('button[data-action]');
+
+        if (!target || target.disabled) {
+          return;
+        }
+
+        event.preventDefault();
+
+        const action = target.getAttribute('data-action');
+
+        focusMount();
+
+        switch (action) {
+          case 'paragraph':
+            document.execCommand('formatBlock', false, 'p');
+            break;
+          case 'h2':
+            document.execCommand('formatBlock', false, 'h2');
+            break;
+          case 'h3':
+            document.execCommand('formatBlock', false, 'h3');
+            break;
+          case 'bold':
+            document.execCommand('bold', false);
+            break;
+          case 'italic':
+            document.execCommand('italic', false);
+            break;
+          case 'underline':
+            document.execCommand('underline', false);
+            break;
+          case 'bulletList':
+            document.execCommand('insertUnorderedList', false);
+            break;
+          case 'orderedList':
+            document.execCommand('insertOrderedList', false);
+            break;
+          case 'indent':
+            document.execCommand('indent', false);
+            break;
+          case 'outdent':
+            document.execCommand('outdent', false);
+            break;
+          case 'undo':
+            document.execCommand('undo', false);
+            break;
+          case 'redo':
+            document.execCommand('redo', false);
+            break;
+          default:
+            break;
+        }
+
+        syncState();
+      });
+    }
+
+    if (form) {
+      form.addEventListener('submit', syncState);
+    }
+  };
+
+  window.setTimeout(() => {
+    mounts.forEach(runFallback);
+  }, 900);
+})();

public/editor.js

@@ -0,0 +1,330 @@
+import { Editor } from 'https://esm.sh/@tiptap/core@3';
+import Document from 'https://esm.sh/@tiptap/extension-document@3';
+import Paragraph from 'https://esm.sh/@tiptap/extension-paragraph@3';
+import Text from 'https://esm.sh/@tiptap/extension-text@3';
+import Heading from 'https://esm.sh/@tiptap/extension-heading@3';
+import Bold from 'https://esm.sh/@tiptap/extension-bold@3';
+import Italic from 'https://esm.sh/@tiptap/extension-italic@3';
+import Underline from 'https://esm.sh/@tiptap/extension-underline@3';
+import BulletList from 'https://esm.sh/@tiptap/extension-bullet-list@3';
+import OrderedList from 'https://esm.sh/@tiptap/extension-ordered-list@3';
+import ListItem from 'https://esm.sh/@tiptap/extension-list-item@3';
+import CharacterCount from 'https://esm.sh/@tiptap/extension-character-count@3';
+import History from 'https://esm.sh/@tiptap/extension-history@3';
+
+const CHARACTER_LIMIT = 30000;
+
+(function () {
+  const editorMounts = document.querySelectorAll('[data-mm-editor="tiptap"]');
+
+  if (!editorMounts.length) {
+    return;
+  }
+
+  const syncState = (editor, textarea) => {
+    textarea.value = editor.getHTML();
+  };
+
+  const updateEditorA11yState = (mount, textarea, textareaId, editor) => {
+    if (!mount || !textareaId || !editor || !textarea) {
+      return;
+    }
+
+    const errorNode = document.getElementById(`${textareaId}-errors`);
+    const hasError = !!(errorNode && errorNode.textContent && errorNode.textContent.trim().length > 0);
+    const plainTextLength = editor.storage?.characterCount?.characters?.() ?? 0;
+    const isEmpty = plainTextLength === 0;
+    const label = mount.getAttribute('data-editor-label') || textarea.getAttribute('aria-label') || 'Text';
+
+    mount.setAttribute('aria-invalid', hasError ? 'true' : 'false');
+    mount.setAttribute('aria-required', textarea.required ? 'true' : 'false');
+
+    const proseMirror = mount.querySelector('.ProseMirror');
+
+    if (!proseMirror) {
+      return;
+    }
+
+    proseMirror.setAttribute('role', 'textbox');
+    proseMirror.setAttribute('aria-multiline', 'true');
+    proseMirror.setAttribute('aria-invalid', hasError ? 'true' : 'false');
+    proseMirror.setAttribute('aria-required', textarea.required ? 'true' : 'false');
+    proseMirror.setAttribute('aria-label', label);
+    proseMirror.setAttribute('data-empty', isEmpty ? 'true' : 'false');
+  };
+
+  const updateCharacterCounter = (counterNode, editor) => {
+    if (!counterNode || !editor?.storage?.characterCount) {
+      return;
+    }
+
+    const used = editor.storage.characterCount.characters();
+    const words = editor.storage.characterCount.words();
+    const remaining = CHARACTER_LIMIT - used;
+
+    counterNode.textContent = `${words.toLocaleString('de-DE')} Wörter · ${used.toLocaleString('de-DE')} / ${CHARACTER_LIMIT.toLocaleString('de-DE')} Zeichen`;
+    counterNode.classList.toggle('is-over-limit', remaining < 0);
+  };
+
+  const setupToolbarKeyboardNavigation = (toolbar) => {
+    if (!toolbar) {
+      return;
+    }
+
+    const getEnabledButtons = () => Array.from(toolbar.querySelectorAll('button[data-action]:not(:disabled)'));
+
+    toolbar.addEventListener('keydown', (event) => {
+      const activeElement = event.target.closest('button[data-action]');
+
+      if (!activeElement) {
+        return;
+      }
+
+      const buttons = getEnabledButtons();
+
+      if (!buttons.length) {
+        return;
+      }
+
+      const currentIndex = buttons.indexOf(activeElement);
+
+      if (currentIndex < 0) {
+        return;
+      }
+
+      let nextIndex = currentIndex;
+
+      switch (event.key) {
+        case 'ArrowRight':
+          nextIndex = (currentIndex + 1) % buttons.length;
+          break;
+        case 'ArrowLeft':
+          nextIndex = (currentIndex - 1 + buttons.length) % buttons.length;
+          break;
+        case 'Home':
+          nextIndex = 0;
+          break;
+        case 'End':
+          nextIndex = buttons.length - 1;
+          break;
+        case 'Enter':
+        case ' ':
+          event.preventDefault();
+          activeElement.click();
+          return;
+        default:
+          return;
+      }
+
+      event.preventDefault();
+      buttons[nextIndex].focus();
+    });
+  };
+
+  const updateToolbarState = (toolbar, editor) => {
+    if (!toolbar) {
+      return;
+    }
+
+    const canIndent = editor.can().chain().focus().sinkListItem('listItem').run();
+    const canOutdent = editor.can().chain().focus().liftListItem('listItem').run();
+    const canUndo = editor.can().chain().focus().undo().run();
+    const canRedo = editor.can().chain().focus().redo().run();
+
+    toolbar.querySelectorAll('button[data-action]').forEach((button) => {
+      const action = button.getAttribute('data-action');
+      let isActive = false;
+      let isDisabled = false;
+
+      switch (action) {
+        case 'paragraph':
+          isActive = editor.isActive('paragraph');
+          break;
+        case 'h2':
+          isActive = editor.isActive('heading', { level: 2 });
+          break;
+        case 'h3':
+          isActive = editor.isActive('heading', { level: 3 });
+          break;
+        case 'bold':
+          isActive = editor.isActive('bold');
+          break;
+        case 'italic':
+          isActive = editor.isActive('italic');
+          break;
+        case 'underline':
+          isActive = editor.isActive('underline');
+          break;
+        case 'bulletList':
+          isActive = editor.isActive('bulletList');
+          break;
+        case 'orderedList':
+          isActive = editor.isActive('orderedList');
+          break;
+        case 'indent':
+          isDisabled = !canIndent;
+          break;
+        case 'outdent':
+          isDisabled = !canOutdent;
+          break;
+        case 'undo':
+          isDisabled = !canUndo;
+          break;
+        case 'redo':
+          isDisabled = !canRedo;
+          break;
+        default:
+          break;
+      }
+
+      button.classList.toggle('is-active', isActive);
+      button.setAttribute('aria-pressed', isActive ? 'true' : 'false');
+      button.disabled = isDisabled;
+      button.setAttribute('aria-disabled', isDisabled ? 'true' : 'false');
+    });
+  };
+
+  editorMounts.forEach((mount) => {
+    const textareaId = mount.getAttribute('data-textarea-id');
+
+    if (!textareaId) {
+      return;
+    }
+
+    const textarea = document.getElementById(textareaId);
+
+    if (!textarea) {
+      return;
+    }
+
+    textarea.style.display = 'none';
+
+    const form = textarea.closest('form');
+    const toolbar = document.querySelector(`[data-mm-editor-toolbar="${textareaId}"]`);
+    const counterNode = document.querySelector(`[data-mm-editor-counter-for="${textareaId}"]`);
+
+    setupToolbarKeyboardNavigation(toolbar);
+
+    const editor = new Editor({
+      element: mount,
+      extensions: [
+        Document,
+        Paragraph,
+        Text,
+        Heading.configure({ levels: [2, 3] }),
+        Bold,
+        Italic,
+        Underline,
+        BulletList,
+        OrderedList,
+        ListItem,
+        History,
+        CharacterCount.configure({
+          limit: CHARACTER_LIMIT,
+        }),
+      ],
+      content: textarea.value || '<p></p>',
+      onCreate({ editor: currentEditor }) {
+        updateToolbarState(toolbar, currentEditor);
+        updateCharacterCounter(counterNode, currentEditor);
+        updateEditorA11yState(mount, textarea, textareaId, currentEditor);
+      },
+      onUpdate({ editor: currentEditor }) {
+        syncState(currentEditor, textarea);
+        updateToolbarState(toolbar, currentEditor);
+        updateCharacterCounter(counterNode, currentEditor);
+        updateEditorA11yState(mount, textarea, textareaId, currentEditor);
+      },
+      onSelectionUpdate({ editor: currentEditor }) {
+        updateToolbarState(toolbar, currentEditor);
+        updateEditorA11yState(mount, textarea, textareaId, currentEditor);
+      },
+    });
+
+    editor.on('transaction', () => {
+      updateToolbarState(toolbar, editor);
+      updateCharacterCounter(counterNode, editor);
+      updateEditorA11yState(mount, textarea, textareaId, editor);
+    });
+
+    editor.on('focus', () => {
+      updateToolbarState(toolbar, editor);
+      updateCharacterCounter(counterNode, editor);
+      updateEditorA11yState(mount, textarea, textareaId, editor);
+    });
+
+    editor.on('blur', () => {
+      updateToolbarState(toolbar, editor);
+      updateCharacterCounter(counterNode, editor);
+      updateEditorA11yState(mount, textarea, textareaId, editor);
+    });
+
+    if (toolbar) {
+      toolbar.addEventListener('click', (event) => {
+        const target = event.target.closest('button[data-action]');
+
+        if (!target || target.disabled) {
+          return;
+        }
+
+        event.preventDefault();
+
+        const action = target.getAttribute('data-action');
+        const chain = editor.chain().focus();
+
+        switch (action) {
+          case 'paragraph':
+            chain.setParagraph().run();
+            break;
+          case 'h2':
+            chain.toggleHeading({ level: 2 }).run();
+            break;
+          case 'h3':
+            chain.toggleHeading({ level: 3 }).run();
+            break;
+          case 'bold':
+            chain.toggleBold().run();
+            break;
+          case 'italic':
+            chain.toggleItalic().run();
+            break;
+          case 'underline':
+            chain.toggleUnderline().run();
+            break;
+          case 'bulletList':
+            chain.toggleBulletList().run();
+            break;
+          case 'orderedList':
+            chain.toggleOrderedList().run();
+            break;
+          case 'indent':
+            chain.sinkListItem('listItem').run();
+            break;
+          case 'outdent':
+            chain.liftListItem('listItem').run();
+            break;
+          case 'undo':
+            chain.undo().run();
+            break;
+          case 'redo':
+            chain.redo().run();
+            break;
+          default:
+            break;
+        }
+
+        syncState(editor, textarea);
+        updateToolbarState(toolbar, editor);
+      });
+    }
+
+    if (form) {
+      form.addEventListener('submit', () => {
+        syncState(editor, textarea);
+        updateEditorA11yState(mount, textarea, textareaId, editor);
+      });
+    }
+
+    updateEditorA11yState(mount, textarea, textareaId, editor);
+  });
+})();

src/Controller/Frontend/EventEditController.php

@@ -103,8 +103,9 @@ class EventEditController extends AbstractFrontendModuleController
             'endTime' => $this->resolveFormEndTime($event),
             'location_id' => (int) ($event['location_id'] ?? 0),
             'tags' => $currentTagIds,
-            'teaser' => (string) ($event['teaser'] ?? ''),
+            'teaser' => '' !== trim((string) ($event['teaser'] ?? ''))
-            'description' => (string) ($event['description'] ?? ''),
+                ? (string) ($event['teaser'] ?? '')
+                : (string) ($event['description'] ?? ''),
             'url' => (string) ($event['url'] ?? ''),
             'photographer' => (string) ($event['photographer'] ?? ''),
             'addImage' => '1' === (string) ($event['addImage'] ?? ''),

src/Controller/Frontend/EventMapController.php

@@ -0,0 +1,178 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MummertMedia\EventManagerBundle\Controller\Frontend;
+
+use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
+use Contao\CoreBundle\DependencyInjection\Attribute\AsFrontendModule;
+use Contao\CoreBundle\Twig\FragmentTemplate;
+use Contao\ModuleModel;
+use Contao\PageModel;
+use Contao\StringUtil;
+use MummertMedia\EventManagerBundle\Service\MapModuleDataProvider;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+#[AsFrontendModule(type: 'eventmanager_map', category: 'eventmanager', template: 'frontend/event_map')]
+class EventMapController extends AbstractFrontendModuleController
+{
+    private const MAP_STYLE_URL = 'https://maps.mummert.media/metadaten/world-light.json';
+    private const DEFAULT_CENTER_MODE = 'markers';
+    private const DEFAULT_EVENT_COLOR = '#BC5067';
+    private const DEFAULT_INITIAL_DISPLAY = 'random';
+
+    /**
+     * @var list<string>
+     */
+    private const ALLOWED_INITIAL_DISPLAYS = ['random', 'events', 'organization_tag'];
+
+    public function __construct(
+        private readonly MapModuleDataProvider $mapModuleDataProvider,
+    ) {
+    }
+
+    protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
+    {
+        $containerId = sprintf('eventmanager-map-%d', (int) ($model->id ?? 0));
+        $dataElementId = sprintf('%s-data', $containerId);
+        $filterWrapperId = sprintf('%s-filter', $containerId);
+        $filterGroupId = sprintf('%s-filter-group', $containerId);
+        $showOrganizations = '1' === (string) ($model->mapShowOrganizations ?? '');
+        $showExternalOrganizations = '1' === (string) ($model->mapShowExternalOrganizations ?? '');
+        $showEvents = '1' === (string) ($model->mapShowEvents ?? '');
+        $selectedOrganizationTagIds = array_values(array_unique(array_filter(
+            array_map('intval', StringUtil::deserialize($model->organizationTypeTags ?? null, true)),
+            static fn (int $tagId): bool => $tagId > 0,
+        )));
+        $availableOrganizationTags = $this->mapModuleDataProvider->getOrganizationTags();
+        $availableOrganizationTagIds = array_map(
+            static fn (array $tag): int => (int) ($tag['id'] ?? 0),
+            $availableOrganizationTags,
+        );
+        $selectedOrganizationTagIds = [] === $selectedOrganizationTagIds
+            ? []
+            : array_values(array_intersect($selectedOrganizationTagIds, $availableOrganizationTagIds));
+        $organizationListPageId = (int) ($model->mapOrganizationListPage ?? 0);
+        $organizationListBaseUrl = $this->buildOrganizationListBaseUrl($organizationListPageId, $request);
+        $initialDisplay = (string) ($model->mapInitialDisplay ?? self::DEFAULT_INITIAL_DISPLAY);
+        $initialOrganizationTagId = (int) ($model->mapInitialOrganizationTagId ?? 0);
+        $centerMode = (string) ($model->mapCenterMode ?? self::DEFAULT_CENTER_MODE);
+        $mapPitch = $this->normalizePitch($model->mapPitch ?? 0);
+        $eventColor = $this->normalizeHexColor((string) ($model->mapEventColor ?? self::DEFAULT_EVENT_COLOR));
+        $organizationColor = $this->normalizeHexColor((string) ($model->mapOrganizationColor ?? $eventColor), $eventColor);
+
+        if (!in_array($centerMode, ['markers', 'custom'], true)) {
+            $centerMode = self::DEFAULT_CENTER_MODE;
+        }
+
+        if (!in_array($initialDisplay, self::ALLOWED_INITIAL_DISPLAYS, true)) {
+            $initialDisplay = self::DEFAULT_INITIAL_DISPLAY;
+        }
+
+        if ($initialOrganizationTagId < 0) {
+            $initialOrganizationTagId = 0;
+        }
+
+        $template->set('mapContainerId', $containerId);
+        $template->set('mapDataElementId', $dataElementId);
+        $template->set('mapFilterWrapperId', $filterWrapperId);
+        $template->set('mapFilterGroupId', $filterGroupId);
+        $template->set('mapStyleUrl', self::MAP_STYLE_URL);
+        $template->set('mapShowOrganizations', $showOrganizations);
+        $template->set('mapShowEvents', $showEvents);
+        $template->set('mapCenterMode', $centerMode);
+        $template->set('mapEventColor', $eventColor);
+        $template->set('mapOrganizationColor', $organizationColor);
+        $template->set('mapInitialDisplay', $initialDisplay);
+        $template->set('mapInitialTagId', $initialOrganizationTagId);
+        $template->set('mapCenterLat', trim((string) ($model->mapCenterLat ?? '')));
+        $template->set('mapCenterLng', trim((string) ($model->mapCenterLng ?? '')));
+        $template->set('mapCenterZoom', (int) ($model->mapCenterZoom ?? 12));
+        $template->set('mapPitch', $mapPitch);
+        $template->set('mapItemsJson', json_encode(
+            $this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations, $selectedOrganizationTagIds, $organizationListBaseUrl),
+            \JSON_HEX_TAG | \JSON_HEX_AMP | \JSON_HEX_APOS | \JSON_HEX_QUOT | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR,
+        ));
+        $template->set('mapOrganizationTags', $this->mapModuleDataProvider->getOrganizationTags($selectedOrganizationTagIds));
+
+        return $template->getResponse();
+    }
+
+    private function normalizeHexColor(string $value, string $fallback = self::DEFAULT_EVENT_COLOR): string
+    {
+        $normalized = strtoupper(trim($value));
+
+        if (preg_match('/^#[0-9A-F]{6}$/', $normalized)) {
+            return $normalized;
+        }
+
+        if (preg_match('/^[0-9A-F]{6}$/', $normalized)) {
+            return '#'.$normalized;
+        }
+
+        if (preg_match('/^#[0-9A-F]{3}$/', $normalized)) {
+            return sprintf(
+                '#%1$s%1$s%2$s%2$s%3$s%3$s',
+                $normalized[1],
+                $normalized[2],
+                $normalized[3],
+            );
+        }
+
+        if (preg_match('/^[0-9A-F]{3}$/', $normalized)) {
+            return sprintf(
+                '#%1$s%1$s%2$s%2$s%3$s%3$s',
+                $normalized[0],
+                $normalized[1],
+                $normalized[2],
+            );
+        }
+
+        return $fallback;
+    }
+
+    private function normalizePitch(mixed $value): int
+    {
+        if (!is_scalar($value)) {
+            return 0;
+        }
+
+        $parsedPitch = (int) round((float) str_replace(',', '.', (string) $value));
+
+        if ($parsedPitch < 0) {
+            return 0;
+        }
+
+        if ($parsedPitch > 85) {
+            return 85;
+        }
+
+        return $parsedPitch;
+    }
+
+    private function buildOrganizationListBaseUrl(int $pageId, Request $request): string
+    {
+        if ($pageId <= 0) {
+            return '';
+        }
+
+        $pageModel = PageModel::findById($pageId);
+
+        if (null === $pageModel) {
+            return '';
+        }
+
+        $frontendUrl = trim((string) $pageModel->getFrontendUrl());
+
+        if ('' === $frontendUrl) {
+            return '';
+        }
+
+        if (preg_match('#^https?://#i', $frontendUrl)) {
+            return $frontendUrl;
+        }
+
+        return rtrim($request->getSchemeAndHttpHost(), '/').'/'.ltrim($frontendUrl, '/');
+    }
+}

src/Controller/Frontend/MemberEventsController.php

@@ -65,7 +65,14 @@ class MemberEventsController extends AbstractFrontendModuleController
                 if ('toggle_published' === $action) {
                     $this->eventRepository->togglePublished($eventId);
                 } elseif ('duplicate' === $action) {
-                    $this->eventRepository->duplicate($eventId);
+                    $newEventId = $this->eventRepository->duplicate($eventId);
+
+                    if ($newEventId > 0 && $editPage instanceof PageModel) {
+                        return new RedirectResponse($this->generateContentUrl($editPage, [
+                            'event' => (string) $newEventId,
+                            'ref' => base64_encode($backUrl),
+                        ]));
+                    }
                 } elseif ('delete' === $action) {
                     $this->eventRepository->delete($eventId);
                 }

src/Controller/Frontend/OrganizationEditController.php

@@ -70,14 +70,13 @@ class OrganizationEditController extends AbstractFrontendModuleController
         $formData = [
             'title' => (string) ($organization['title'] ?? ''),
             'street' => (string) ($organization['street'] ?? ''),
+            'street2' => (string) ($organization['street2'] ?? ''),
             'postal' => (string) ($organization['postal'] ?? ''),
             'city' => (string) ($organization['city'] ?? ''),
-            'state' => (string) ($organization['state'] ?? ''),
-            'country' => (string) ($organization['country'] ?? ''),
             'phone' => (string) ($organization['phone'] ?? ''),
             'email' => (string) ($organization['email'] ?? ''),
             'website' => (string) ($organization['website'] ?? ''),
-            'description' => (string) ($organization['description'] ?? ''),
+            'description' => $this->normalizeTextareaDescription((string) ($organization['description'] ?? '')),
             'tags' => $this->organizationRepository->getTagIdsForOrganization($organizationId),
         ];
 
@@ -219,4 +218,14 @@ class OrganizationEditController extends AbstractFrontendModuleController
 
         return $page instanceof PageModel ? $this->generateContentUrl($page) : '/';
     }
+
+    private function normalizeTextareaDescription(string $value): string
+    {
+        $decoded = html_entity_decode($value, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+        $decoded = preg_replace('/<\s*br\s*\/?>/i', "\n", $decoded) ?? $decoded;
+        $decoded = preg_replace('/<\s*\/p\s*>\s*<\s*p[^>]*>/i', "\n\n", $decoded) ?? $decoded;
+        $decoded = strip_tags($decoded);
+
+        return trim($decoded);
+    }
 }

src/EventListener/OrganizationListingTemplateDataListener.php

@@ -53,7 +53,7 @@ class OrganizationListingTemplateDataListener
 
         $organizationIds = array_values(array_unique(array_values($rowToOrganizationIdMap)));
         $organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
-        $organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap($organizationIds);
+        $organizationLogoMap = $this->fetchOrganizationLogoMap($organizationIds);
 
         $organizationTagLabelMap = [];
         $rowTagIdsList = [];
@@ -74,7 +74,9 @@ class OrganizationListingTemplateDataListener
             }
 
             $tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
-            $logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
+            $logoData = $organizationLogoMap[$organizationId] ?? ['uuid' => '', 'isSvg' => false];
+            $logoUuid = (string) ($logoData['uuid'] ?? '');
+            $logoIsSvg = (bool) ($logoData['isSvg'] ?? false);
             $tagIdsCsv = implode(',', $tagData['ids']);
             $tagLabelsCsv = implode(', ', $tagData['labels']);
 
@@ -84,6 +86,7 @@ class OrganizationListingTemplateDataListener
 
             if ('' !== $logoUuid) {
                 $tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
+                $tbody[$rowIndex]['logo_is_svg']['content'] = $logoIsSvg ? '1' : '';
             }
         }
 
@@ -266,16 +269,19 @@ class OrganizationListingTemplateDataListener
     }
 
     /** @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();
@@ -285,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;

src/Form/EventType.php

@@ -119,17 +119,19 @@ class EventType extends AbstractType
                 ],
             ])
             ->add('tags', ChoiceType::class, [
-                'label' => 'Typen',
+                'label' => 'Kategorien',
                 'choices' => $options['tag_choices'],
+                'expanded' => true,
                 'multiple' => true,
                 'required' => false,
-                'attr' => [
+                'choice_attr' => static function (): array {
-                    'class' => 'js-event-tags-choice',
+                    return [
-                    'data-placeholder' => 'Typen suchen …',
+                        'role' => 'switch',
-                ],
+                        'class' => 'ns-tag-switch-input',
+                    ];
+                },
             ])
-            ->add('teaser', TextareaType::class, ['label' => 'Teaser', 'required' => false])
+            ->add('teaser', TextareaType::class, ['label' => 'Beschreibung', 'required' => false])
-            ->add('description', TextareaType::class, ['label' => 'Beschreibung', 'required' => false])
             ->add('url', UrlType::class, [
                 'label' => 'Link (extern)',
                 'required' => false,

src/Form/OrganizationType.php

@@ -20,23 +20,25 @@ class OrganizationType extends AbstractType
         $builder
             ->add('title', TextType::class, ['label' => 'Titel', 'required' => true])
             ->add('street', TextType::class, ['label' => 'Straße', 'required' => false])
+            ->add('street2', TextType::class, ['label' => 'Weitere Adressangaben', 'required' => false])
             ->add('postal', TextType::class, ['label' => 'PLZ', 'required' => false])
             ->add('city', TextType::class, ['label' => 'Ort', 'required' => false])
-            ->add('state', TextType::class, ['label' => 'Bundesland', 'required' => false])
-            ->add('country', TextType::class, ['label' => 'Land', 'required' => false])
             ->add('phone', TextType::class, ['label' => 'Telefon', 'required' => false])
             ->add('email', EmailType::class, ['label' => 'E-Mail', 'required' => false])
             ->add('website', TextType::class, ['label' => 'Webseite', 'required' => false])
             ->add('description', TextareaType::class, ['label' => 'Beschreibung', 'required' => false])
             ->add('tags', ChoiceType::class, [
-                'label' => 'Typen',
+                'label' => 'Kategorien',
                 'choices' => $options['tag_choices'],
+                'expanded' => true,
                 'multiple' => true,
                 'required' => false,
-                'attr' => [
+                'choice_attr' => static function (): array {
-                    'class' => 'js-organization-tags-choice',
+                    return [
-                    'data-placeholder' => 'Typ auswählen …',
+                        'role' => 'switch',
-                ],
+                        'class' => 'ns-tag-switch-input',
+                    ];
+                },
             ])
             ->add('logoUpload', FileType::class, [
                 'label' => 'Logo hochladen',

src/Service/EventRepository.php

@@ -84,7 +84,8 @@ class EventRepository
         unset($row['id']);
 
         if (array_key_exists('title', $row)) {
-            $row['title'] = trim((string) $row['title'].' (Kopie)');
+            $normalizedTitle = html_entity_decode((string) $row['title'], ENT_QUOTES | ENT_HTML5, 'UTF-8');
+            $row['title'] = trim($normalizedTitle.' (Kopie)');
         }
 
         if (array_key_exists('alias', $row)) {

src/Service/MapModuleDataProvider.php

@@ -0,0 +1,567 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MummertMedia\EventManagerBundle\Service;
+
+use Contao\CalendarEventsModel;
+use Contao\CoreBundle\Framework\ContaoFramework;
+use Contao\CoreBundle\Routing\ContentUrlGenerator;
+use Doctrine\DBAL\ArrayParameterType;
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Query\QueryBuilder;
+use Symfony\Component\Routing\Exception\ExceptionInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+
+class MapModuleDataProvider
+{
+    /**
+     * @var array<string,array<string,true>>
+     */
+    private array $tableColumns = [];
+
+    public function __construct(
+        private readonly Connection $connection,
+        private readonly ContaoFramework $framework,
+        private readonly ContentUrlGenerator $urlGenerator,
+    ) {
+    }
+
+    /**
+        * @return list<array{type:string,markerType:string,id:int,title:string,latitude:float,longitude:float,extra:array<string,mixed>}>
+     */
+    public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = [], string $organizationListBaseUrl = ''): array
+    {
+        if (!$includeOrganizations && !$includeEvents) {
+            return [];
+        }
+
+        $selectedOrganizationTagIds = array_values(array_unique(array_map(
+            static fn (int|string $tagId): string => (string) (int) $tagId,
+            array_filter($selectedOrganizationTagIds, static fn (int|string $tagId): bool => (int) $tagId > 0),
+        )));
+
+        $locationTable = $this->resolveExistingTable(['tl_location']);
+        $organizationTable = $this->resolveExistingTable(['tl_organization', 'tl_organisation']);
+        $locationGeoColumns = null !== $locationTable ? $this->resolveGeoColumns($locationTable) : null;
+
+        if (null === $locationTable || null === $locationGeoColumns) {
+            return [];
+        }
+
+        $items = [];
+        $seen = [];
+        $organizationRows = $includeOrganizations
+            ? $this->fetchOrganizationRows($organizationTable, $locationTable, $locationGeoColumns, $includeExternalOrganizations)
+            : [];
+        $organizationTagMap = $this->fetchOrganizationTagMap(array_values(array_unique(array_map(
+            static fn (array $row): int => (int) ($row['id'] ?? 0),
+            $organizationRows,
+        ))));
+
+        if ($includeOrganizations) {
+            foreach ($organizationRows as $row) {
+                $id = (int) ($row['id'] ?? 0);
+
+                if ($id <= 0 || isset($seen['organisation'][$id])) {
+                    continue;
+                }
+
+                $locationId = (int) ($row['location_id'] ?? 0);
+
+                if ($locationId > 0) {
+                    $coords = $this->extractCoordinates($row['location_latitude'] ?? null, $row['location_longitude'] ?? null);
+
+                    if (null === $coords) {
+                        continue;
+                    }
+                } else {
+                    $coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
+                }
+
+                if (null === $coords) {
+                    continue;
+                }
+
+                $seen['organisation'][$id] = true;
+                $tagData = $organizationTagMap[$id] ?? ['ids' => [], 'labels' => []];
+
+                if ([] !== $selectedOrganizationTagIds
+                    && [] === array_intersect($selectedOrganizationTagIds, $tagData['ids'] ?? [])) {
+                    continue;
+                }
+
+                $items[] = [
+                    'type' => 'organisation',
+                    'markerType' => $this->buildOrganizationMarkerType($tagData['ids']),
+                    'id' => $id,
+                    'title' => trim((string) ($row['title'] ?? '')),
+                    'latitude' => $coords['latitude'],
+                    'longitude' => $coords['longitude'],
+                    'extra' => [
+                        'organizationTagIds' => $tagData['ids'],
+                        'organizationTagLabels' => $tagData['labels'],
+                        'detailUrl' => $this->buildOrganizationDetailUrl($organizationListBaseUrl, $id),
+                    ],
+                ];
+            }
+        }
+
+        if ($includeEvents) {
+            foreach ($this->fetchEventRows($locationTable, $locationGeoColumns) as $row) {
+                $id = (int) ($row['event_id'] ?? 0);
+
+                if ($id <= 0 || isset($seen['event'][$id])) {
+                    continue;
+                }
+
+                $coords = $this->extractCoordinates($row['latitude'] ?? null, $row['longitude'] ?? null);
+
+                if (null === $coords) {
+                    continue;
+                }
+
+                $seen['event'][$id] = true;
+                $items[] = [
+                    'type' => 'event',
+                    'markerType' => 'event',
+                    'id' => $id,
+                    'title' => trim((string) ($row['event_title'] ?? '')),
+                    'latitude' => $coords['latitude'],
+                    'longitude' => $coords['longitude'],
+                    'extra' => [
+                        'locationTitle' => trim((string) ($row['location_title'] ?? '')),
+                        'startDate' => $this->formatStartDateTime(
+                            (int) ($row['startDate'] ?? 0),
+                            (string) ($row['addTime'] ?? ''),
+                            (int) ($row['startTime'] ?? 0),
+                        ),
+                        'detailUrl' => $this->resolveEventDetailUrl($id),
+                    ],
+                ];
+            }
+        }
+
+        return $items;
+    }
+
+    /**
+     * @return list<array{id:int,label:string}>
+     */
+    public function getOrganizationTags(array $selectedTagIds = []): array
+    {
+        if (!$this->tableExists('tl_tags') || !$this->tableExists('tl_tags_rel')) {
+            return [];
+        }
+
+        $selectedTagIds = array_values(array_unique(array_filter(
+            array_map('intval', $selectedTagIds),
+            static fn (int $tagId): bool => $tagId > 0,
+        )));
+
+        $columns = $this->getColumnMap('tl_tags');
+        $labelColumn = isset($columns['title']) ? 'title' : (isset($columns['tag']) ? 'tag' : null);
+
+        if (null === $labelColumn) {
+            return [];
+        }
+
+        $qb = $this->connection->createQueryBuilder();
+        $qb
+            ->select('DISTINCT t.id', sprintf('t.%s AS label', $labelColumn))
+            ->from('tl_tags_rel', 'r')
+            ->innerJoin('r', 'tl_tags', 't', 't.id = r.tag_id')
+            ->andWhere('r.ptable = :organization_ptable')
+            ->andWhere('(r.field = :organization_field OR r.field IS NULL OR r.field = \'\')')
+            ->setParameter('organization_ptable', 'tl_organization')
+            ->setParameter('organization_field', 'tags')
+            ->orderBy(sprintf('t.%s', $labelColumn), 'ASC');
+
+        if ([] !== $selectedTagIds) {
+            $qb
+                ->andWhere('t.id IN (:selectedTagIds)')
+                ->setParameter('selectedTagIds', $selectedTagIds, ArrayParameterType::INTEGER);
+        }
+
+        if (isset($columns['invisible'])) {
+            $qb->andWhere("(t.invisible IS NULL OR t.invisible = '' OR t.invisible = '0')");
+        }
+
+        $rows = $qb->executeQuery()->fetchAllAssociative();
+        $tags = [];
+        $seen = [];
+
+        foreach ($rows as $row) {
+            $id = (int) ($row['id'] ?? 0);
+            $label = trim((string) ($row['label'] ?? ''));
+
+            if ($id <= 0 || '' === $label || isset($seen[$id])) {
+                continue;
+            }
+
+            $seen[$id] = true;
+            $tags[] = [
+                'id' => $id,
+                'label' => $label,
+            ];
+        }
+
+        return $tags;
+    }
+
+    /**
+     * @param list<int> $organizationIds
+     * @return array<int, array{ids: list<string>, labels: list<string>}>
+     */
+    private function fetchOrganizationTagMap(array $organizationIds): array
+    {
+        $organizationIds = array_values(array_unique(array_filter($organizationIds, static fn (int $id): bool => $id > 0)));
+
+        if ([] === $organizationIds || !$this->tableExists('tl_tags_rel') || !$this->tableExists('tl_tags')) {
+            return [];
+        }
+
+        $tagColumns = $this->getColumnMap('tl_tags');
+        $tagLabelColumn = isset($tagColumns['title']) ? 'title' : (isset($tagColumns['tag']) ? 'tag' : null);
+
+        if (null === $tagLabelColumn) {
+            return [];
+        }
+
+        $rows = $this->connection->executeQuery(
+            sprintf(
+                'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
+                $tagLabelColumn,
+            ),
+            ['tl_organization', 'tags', $organizationIds],
+            [ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
+        )->fetchAllAssociative();
+
+        if ([] === $rows) {
+            $rows = $this->connection->executeQuery(
+                sprintf(
+                    'SELECT r.pid AS organization_id, r.tag_id, t.%s 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',
+                    $tagLabelColumn,
+                ),
+                ['tl_organization', $organizationIds],
+                [ParameterType::STRING, ArrayParameterType::INTEGER],
+            )->fetchAllAssociative();
+        }
+
+        $map = [];
+        $seen = [];
+
+        foreach ($rows as $row) {
+            $organizationId = (int) ($row['organization_id'] ?? 0);
+            $tagId = (int) ($row['tag_id'] ?? 0);
+            $label = trim((string) ($row['label'] ?? ''));
+
+            if ($organizationId <= 0 || $tagId <= 0 || isset($seen[$organizationId][$tagId])) {
+                continue;
+            }
+
+            $seen[$organizationId][$tagId] = true;
+            $map[$organizationId]['ids'][] = (string) $tagId;
+
+            if ('' !== $label) {
+                $map[$organizationId]['labels'][] = $label;
+            }
+        }
+
+        foreach ($map as $organizationId => $tagData) {
+            $map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
+            $map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
+        }
+
+        return $map;
+    }
+
+    /**
+     * @param list<string> $tagIds
+     */
+    private function buildOrganizationMarkerType(array $tagIds): string
+    {
+        $firstTagId = (string) ($tagIds[0] ?? '');
+
+        if ('' !== $firstTagId && ctype_digit($firstTagId) && (int) $firstTagId > 0) {
+            return sprintf('organisation-tag-%d', (int) $firstTagId);
+        }
+
+        return 'organisation';
+    }
+
+    /**
+     * @return list<array<string,mixed>>
+     */
+    private function fetchOrganizationRows(?string $table, string $locationTable, array $locationGeoColumns, bool $includeExternalOrganizations): array
+    {
+        if (null === $table) {
+            return [];
+        }
+
+        $organizationGeoColumns = $this->resolveGeoColumns($table);
+        $organizationColumns = $this->getColumnMap($table);
+        $hasLocationReference = isset($organizationColumns['location_id']);
+
+        if (null === $organizationGeoColumns && !$hasLocationReference) {
+            return [];
+        }
+
+        $qb = $this->connection->createQueryBuilder();
+        $qb
+            ->select('o.id', 'o.title')
+            ->from($table, 'o')
+            ->orderBy('o.id', 'ASC');
+
+        if (null !== $organizationGeoColumns) {
+            $qb
+                ->addSelect(sprintf('o.%s AS latitude', $organizationGeoColumns['latitude']))
+                ->addSelect(sprintf('o.%s AS longitude', $organizationGeoColumns['longitude']));
+        }
+
+        if ($hasLocationReference) {
+            $qb
+                ->addSelect('o.location_id')
+                ->leftJoin('o', $locationTable, 'ol', 'ol.id = o.location_id')
+                ->addSelect(sprintf('ol.%s AS location_latitude', $locationGeoColumns['latitude']))
+                ->addSelect(sprintf('ol.%s AS location_longitude', $locationGeoColumns['longitude']));
+
+            $this->applyPublicationConstraints($qb, 'ol', $locationTable);
+        }
+
+        if (!$includeExternalOrganizations && isset($organizationColumns['isexternal'])) {
+            $qb->andWhere("(o.isExternal IS NULL OR o.isExternal = '' OR o.isExternal = '0')");
+        }
+
+        $this->applyPublicationConstraints($qb, 'o', $table);
+
+        return $qb->executeQuery()->fetchAllAssociative();
+    }
+
+    /**
+     * @return list<array<string,mixed>>
+     */
+    private function fetchEventRows(string $locationTable, array $locationGeoColumns): array
+    {
+        if (!$this->tableExists('tl_calendar_events')) {
+            return [];
+        }
+
+        $eventColumns = $this->getColumnMap('tl_calendar_events');
+        $today = strtotime('today');
+
+        $qb = $this->connection->createQueryBuilder();
+        $qb
+            ->select(
+                'e.id AS event_id',
+                'e.title AS event_title',
+                'e.startDate',
+                'e.addTime',
+                'e.startTime',
+                'l.title AS location_title',
+                sprintf('l.%s AS latitude', $locationGeoColumns['latitude']),
+                sprintf('l.%s AS longitude', $locationGeoColumns['longitude'])
+            )
+            ->from('tl_calendar_events', 'e')
+            ->innerJoin('e', $locationTable, 'l', 'l.id = e.location_id')
+            ->andWhere('e.location_id > 0')
+            ->orderBy('e.id', 'ASC');
+
+        if (isset($eventColumns['startdate'])) {
+            $qb
+                ->andWhere('e.startDate >= :event_start_date_from')
+                ->setParameter('event_start_date_from', $today);
+        }
+
+        $this->applyPublicationConstraints($qb, 'e', 'tl_calendar_events');
+        $this->applyPublicationConstraints($qb, 'l', $locationTable);
+
+        return $qb->executeQuery()->fetchAllAssociative();
+    }
+
+    private function applyPublicationConstraints(QueryBuilder $qb, string $alias, string $table): void
+    {
+        $columns = $this->getColumnMap($table);
+        $now = time();
+
+        if (isset($columns['published'])) {
+            $qb
+                ->andWhere(sprintf('%s.published = :%s_published', $alias, $alias))
+                ->setParameter(sprintf('%s_published', $alias), '1');
+        }
+
+        if (isset($columns['start'])) {
+            $qb
+                ->andWhere(sprintf('(%1$s.start IS NULL OR %1$s.start = 0 OR %1$s.start <= :%1$s_start_now)', $alias))
+                ->setParameter(sprintf('%s_start_now', $alias), $now);
+        }
+
+        if (isset($columns['stop'])) {
+            $qb
+                ->andWhere(sprintf('(%1$s.stop IS NULL OR %1$s.stop = 0 OR %1$s.stop > :%1$s_stop_now)', $alias))
+                ->setParameter(sprintf('%s_stop_now', $alias), $now);
+        }
+    }
+
+    /**
+     * @return array{latitude:float,longitude:float}|null
+     */
+    private function extractCoordinates(mixed $latitude, mixed $longitude): ?array
+    {
+        if (null === $latitude || null === $longitude) {
+            return null;
+        }
+
+        $lat = trim(str_replace(',', '.', (string) $latitude));
+        $lng = trim(str_replace(',', '.', (string) $longitude));
+
+        if ('' === $lat || '' === $lng || !is_numeric($lat) || !is_numeric($lng)) {
+            return null;
+        }
+
+        $latitudeFloat = (float) $lat;
+        $longitudeFloat = (float) $lng;
+
+        if (
+            ($latitudeFloat < -90.0 || $latitudeFloat > 90.0)
+            || ($longitudeFloat < -180.0 || $longitudeFloat > 180.0)
+            || (0.0 === $latitudeFloat && 0.0 === $longitudeFloat)
+        ) {
+            return null;
+        }
+
+        return [
+            'latitude' => $latitudeFloat,
+            'longitude' => $longitudeFloat,
+        ];
+    }
+
+    private function formatStartDateTime(int $startDate, string $addTime, int $startTime): string
+    {
+        if ($startDate <= 0) {
+            return '';
+        }
+
+        $formattedDate = date('d.m.Y', $startDate);
+
+        if ('1' !== $addTime || $startTime <= 0) {
+            return $formattedDate;
+        }
+
+        return sprintf('%s %s Uhr', $formattedDate, date('H:i', $startTime));
+    }
+
+    private function resolveEventDetailUrl(int $eventId): string
+    {
+        if ($eventId <= 0) {
+            return '';
+        }
+
+        $eventModel = $this->framework
+            ->getAdapter(CalendarEventsModel::class)
+            ->findById($eventId);
+
+        if (null === $eventModel) {
+            return '';
+        }
+
+        try {
+            return (string) $this->urlGenerator->generate($eventModel, [], UrlGeneratorInterface::ABSOLUTE_PATH);
+        } catch (ExceptionInterface) {
+            return '';
+        }
+    }
+
+    private function buildOrganizationDetailUrl(string $baseUrl, int $organizationId): string
+    {
+        $normalizedBaseUrl = trim($baseUrl);
+
+        if ('' === $normalizedBaseUrl || $organizationId <= 0) {
+            return '';
+        }
+
+        $separator = str_contains($normalizedBaseUrl, '?') ? '&' : '?';
+
+        return sprintf('%s%sshow=%d', $normalizedBaseUrl, $separator, $organizationId);
+    }
+
+    /**
+     * @param list<string> $candidates
+     */
+    private function resolveExistingTable(array $candidates): ?string
+    {
+        foreach ($candidates as $candidate) {
+            if ($this->tableExists($candidate)) {
+                return $candidate;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return array{latitude:string,longitude:string}|null
+     */
+    private function resolveGeoColumns(string $table): ?array
+    {
+        $columns = $this->getColumnMap($table);
+
+        if (isset($columns['latitude'], $columns['longitude'])) {
+            return [
+                'latitude' => 'latitude',
+                'longitude' => 'longitude',
+            ];
+        }
+
+        if (isset($columns['lat'], $columns['lng'])) {
+            return [
+                'latitude' => 'lat',
+                'longitude' => 'lng',
+            ];
+        }
+
+        return null;
+    }
+
+    private function tableExists(string $table): bool
+    {
+        try {
+            return $this->connection->createSchemaManager()->tablesExist([$table]);
+        } catch (\Throwable) {
+            return false;
+        }
+    }
+
+    /**
+     * @return array<string,true>
+     */
+    private function getColumnMap(string $table): array
+    {
+        if (isset($this->tableColumns[$table])) {
+            return $this->tableColumns[$table];
+        }
+
+        $columns = [];
+
+        try {
+            foreach ($this->connection->createSchemaManager()->listTableColumns($table) as $name => $column) {
+                $columns[strtolower((string) $name)] = true;
+            }
+        } catch (\Throwable) {
+            $columns = [];
+        }
+
+        $this->tableColumns[$table] = $columns;
+
+        return $columns;
+    }
+}

src/Service/OrganizationRepository.php

@@ -71,10 +71,9 @@ class OrganizationRepository
             [
                 'title' => $data['title'] ?? '',
                 'street' => $data['street'] ?? '',
+                'street2' => $data['street2'] ?? '',
                 'postal' => $data['postal'] ?? '',
                 'city' => $data['city'] ?? '',
-                'state' => $data['state'] ?? '',
-                'country' => $data['country'] ?? '',
                 'phone' => $data['phone'] ?? '',
                 'email' => $data['email'] ?? '',
                 'website' => $data['website'] ?? '',