diff --git a/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php b/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php index a858a8c4..62435f72 100644 --- a/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php +++ b/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php @@ -97,11 +97,10 @@ class PageLayoutView implements PageLayoutViewDrawItemHookInterface $drawItem = false; $region = BackendUtility::getRecord('tx_epproducts_domain_model_region', $row['tx_eptheme_context_region']); $itemContent = 'Google Map
' . $region['name']; - if ((int) $row['tx_eptheme_context_hotel'] > 0) { - $hotel = BackendUtility::getRecord('tx_epproducts_domain_model_hotel', - $row['tx_eptheme_context_hotel']); - $itemContent .= ', ' . $hotel['name']; - } + } elseif ((int) $row['tx_eptheme_context_hotel'] > 0) { + $drawItem = false; + $hotel = BackendUtility::getRecord('tx_epproducts_domain_model_hotel', $row['tx_eptheme_context_hotel']); + $itemContent = 'Google Map
' . $hotel['name']; } break; case 'disturber': diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts index 98af47b8..391d07d7 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts @@ -9,18 +9,15 @@ tt_content.gmap { where.wrap = uid=| pidInList = {$plugin.tx_epproducts.settings.hotelsStoragePid} as = hotel - - dataProcessing { - 10 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor - 10 { - table = tx_epproducts_domain_model_region - where.data = field:region - where.wrap = uid=| - pidInList = {$plugin.tx_epproducts.settings.destinationsStoragePid} - recursive = 2 - as = region - } - } + } + 20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor + 20 { + table = tx_epproducts_domain_model_region + where.data = field:tx_eptheme_context_region + where.wrap = uid=| + pidInList = {$plugin.tx_epproducts.settings.destinationsStoragePid} + recursive = 2 + as = region } } settings.googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html index 0a68a842..ae2ac62a 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Gmap.html @@ -1,17 +1,25 @@ + xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> + + + + + + + + +