mummert/eventmanager-bundle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Map: organization popup links and backend page selector

Browse Source
This commit is contained in:
Jürgen Mummert
2026-02-26 22:11:55 +01:00
parent 51a92ea45e
commit 229f99ea19
7 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contao/dca/tl_module.php
+9 -1
View File
@@ -9,7 +9,7 @@ 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,organizationTypeTags,mapShowExternalOrganizations,mapShowEvents,mapInitialDisplay,mapEventColor,mapOrganizationColor,mapPitch,mapCenterMode;{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';
@@ -191,6 +191,14 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['mapShowOrganizations'] = [
'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,
contao/languages/de/tl_module.php
+1
View File
@@ -14,6 +14,7 @@ $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Eventlisten-ID (DOM)', 'W
$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.'];
contao/languages/en/tl_module.php
+1
View File
@@ -14,6 +14,7 @@ $GLOBALS['TL_LANG']['tl_module']['eventListDomId'] = ['Event list ID (DOM)', 'Se
$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.'];
contao/templates/frontend/event_map.html.twig
+5 -1
View File
@@ -105,7 +105,11 @@
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=20260226h"></script>
<script type="module" src="/bundles/mummertmediaeventmanager/assets/map-module.js?v=20260226i"></script>
public/assets/map-module.js
+14
View File
@@ -438,6 +438,20 @@ const popupHtmlFor = (item) => {
].join('');
}
if (item.type === 'organisation') {
const title = sanitizeDisplayText(item.title || '');
const detailUrl = String(item.extra?.detailUrl || '').trim();
const hasDetailUrl = /^(https?:\/\/|\/)/i.test(detailUrl);
const detailLink = hasDetailUrl
? `<div><a href="${escapeHtml(detailUrl)}">mehr Infos</a></div>`
: '';
return [
`<strong>${title}</strong>`,
detailLink,
].join('');
}
return `<strong>${sanitizeDisplayText(item.title)}</strong>`;
};
src/Controller/Frontend/EventMapController.php
+29 -1
View File
@@ -8,6 +8,7 @@ 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;
@@ -52,6 +53,8 @@ class EventMapController extends AbstractFrontendModuleController
$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);
@@ -88,7 +91,7 @@ class EventMapController extends AbstractFrontendModuleController
$template->set('mapCenterZoom', (int) ($model->mapCenterZoom ?? 12));
$template->set('mapPitch', $mapPitch);
$template->set('mapItemsJson', json_encode(
$this->mapModuleDataProvider->getMapItems($showOrganizations, $showEvents, $showExternalOrganizations, $selectedOrganizationTagIds),
$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));
@@ -147,4 +150,29 @@ class EventMapController extends AbstractFrontendModuleController
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/Service/MapModuleDataProvider.php
+15 -1
View File
@@ -31,7 +31,7 @@ class MapModuleDataProvider
/**
* @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 = []): array
public function getMapItems(bool $includeOrganizations = true, bool $includeEvents = true, bool $includeExternalOrganizations = false, array $selectedOrganizationTagIds = [], string $organizationListBaseUrl = ''): array
{
if (!$includeOrganizations && !$includeEvents) {
return [];
@@ -102,6 +102,7 @@ class MapModuleDataProvider
'extra' => [
'organizationTagIds' => $tagData['ids'],
'organizationTagLabels' => $tagData['labels'],
'detailUrl' => $this->buildOrganizationDetailUrl($organizationListBaseUrl, $id),
],
];
}
@@ -498,6 +499,19 @@ class MapModuleDataProvider
}
}
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
*/