From 8409b30ba15b926b7e3b1c6c6bf05585e1e2d998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 20 Sep 2018 11:48:45 +0200 Subject: [PATCH] Adjust to new link wizard --- .../Classes/Controller/AjaxDateController.php | 15 +++++++------ .../Classes/Controller/MapController.php | 14 +++++++------ .../Service/SearchResultUrlService.php | 21 ++++++++++++++++++- web/typo3conf/ext/ep_products/ext_tables.sql | 16 +++++++------- .../ViewHelpers/Uri/ProductViewHelper.php | 17 ++++++++------- .../Private/Partials/Breadcrumb.html | 2 +- .../Private/Partials/City/Teaser.html | 4 ++-- .../Private/Partials/Concept/Teaser.html | 4 ++-- .../Private/Partials/ContactBar.html | 2 +- .../Private/Partials/Disturber/Large.html | 7 ++++++- .../Partials/Disturber/LastChance.html | 2 +- .../Private/Partials/Disturber/Reminder.html | 4 ++-- .../Private/Partials/Disturber/Small.html | 2 +- .../Private/Partials/EventDisturber.html | 2 +- .../Resources/Private/Partials/Faq.html | 4 +++- .../Resources/Private/Partials/Footer.html | 6 +++--- .../Private/Partials/HeaderSlider.html | 4 ++-- .../Private/Partials/HeaderSliderSmall.html | 4 ++-- .../Private/Partials/Hotel/Teaser.html | 4 ++-- .../Partials/Hotel/TeaserExtended.html | 4 ++-- .../Private/Partials/Hotel/TeaserSimple.html | 4 ++-- .../Resources/Private/Partials/Mainnav.html | 10 ++++----- .../Private/Partials/Menu/Type-3.html | 2 +- .../Partials/Product/HeaderDetail.html | 2 +- .../Private/Partials/Product/Teaser.html | 6 +++--- .../Private/Partials/Product/TeaserWide.html | 2 +- .../Resources/Private/Partials/Rating.html | 2 +- .../Private/Partials/Region/Teaser.html | 4 ++-- .../Private/Partials/RegionAward.html | 4 ++-- .../Private/Partials/Teaser/OneColumn.html | 4 ++-- .../Private/Partials/Teaser/TwoColumn.html | 4 ++-- .../FluidStyledContent/DealOfTheWeek.html | 2 +- .../FluidStyledContent/MenuSection.html | 2 +- .../FluidStyledContent/MenuSubpages.html | 5 +++-- .../FluidStyledContent/TeaserCountry.html | 4 ++-- .../Private/Templates/Form/FullForm.html | 4 ++-- .../Private/Templates/Form/SimpleForm.html | 4 ++-- .../Private/Templates/News/News/Detail.html | 4 ++-- .../Private/Templates/Product/Detail.html | 12 +++++------ .../Private/Templates/Search/Searchbar.html | 2 +- .../Private/Templates/Snowreport/List.html | 4 ++-- web/typo3conf/ext/ep_theme/ext_tables.sql | 2 +- web/typo3conf/ext/ep_track/ext_tables.sql | 2 +- 43 files changed, 132 insertions(+), 97 deletions(-) diff --git a/web/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php b/web/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php index 2796d69b..1e8634a9 100644 --- a/web/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php +++ b/web/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php @@ -35,7 +35,9 @@ use EP\EpProducts\Service\DateService; use EP\EpProducts\Service\FilterService; use EP\EpProducts\Service\ResellerService; use EP\EpProducts\Traits\RequestArgumentTypeConversionTrait; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; class AjaxDateController extends ActionController { @@ -115,12 +117,13 @@ class AjaxDateController extends ActionController if ($product->getAltProduct()) { $altProduct = $product->getAltProduct(); if ($this->productRepository->hasDates($altProduct)) { - $altProductLink = $this->uriBuilder - ->reset() - ->setTargetPageUid($altProduct->getDetailPage()) - ->setCreateAbsoluteUri(true) - ->build() - ; + /** @var ContentObjectRenderer $contentObject */ + $contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class); + $altProductLink = $contentObject->typoLink_URL( + [ + 'parameter' => $altProduct->getDetailPage(), + ] + ); $altLabel = $product->getAltLabel(); } } diff --git a/web/typo3conf/ext/ep_products/Classes/Controller/MapController.php b/web/typo3conf/ext/ep_products/Classes/Controller/MapController.php index b28ff5f5..f9c5d7b9 100644 --- a/web/typo3conf/ext/ep_products/Classes/Controller/MapController.php +++ b/web/typo3conf/ext/ep_products/Classes/Controller/MapController.php @@ -33,6 +33,7 @@ use EP\EpProducts\Domain\Repository\ProductRepository; use EP\EpProducts\Service\HotelService; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; +use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; class MapController extends ActionController { @@ -112,11 +113,12 @@ class MapController extends ActionController */ protected function getUriForPageUid($pageUid) { - return $this->uriBuilder - ->reset() - ->setTargetPageUid($pageUid) - ->setCreateAbsoluteUri(true) - ->build() - ; + /** @var ContentObjectRenderer $contentObject */ + $contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class); + return $contentObject->typoLink_URL( + [ + 'parameter' => $pageUid, + ] + ); } } diff --git a/web/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php b/web/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php index 9a5ae270..42e53e2d 100644 --- a/web/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php +++ b/web/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php @@ -70,7 +70,7 @@ class SearchResultUrlService implements SingletonInterface { foreach ($conceptData['items'] as $key => $item) { - $detailPageUid = $item['product']['detailPage'] ?: $defaultDetailPageUid; + $detailPageUid = $this->getProductPageUid($item['product']['detailPage'], $defaultDetailPageUid); $arguments = [ 'product' => $item['product']['uid'], 'hotel' => $item['hotel']['uid'], @@ -90,4 +90,23 @@ class SearchResultUrlService implements SingletonInterface $searchResult->setData($data); } + + /** + * @param mixed $uid + * @param int $defaultUid + * @return int + */ + protected function getProductPageUid($uid, $defaultUid) + { + if (is_numeric($uid)) { + return $uid; + } + + if (strpos($uid, 't3://') !== false) { + parse_str(parse_url($uid, PHP_URL_QUERY), $arguments); + return $arguments['uid']; + } + + return $defaultUid; + } } diff --git a/web/typo3conf/ext/ep_products/ext_tables.sql b/web/typo3conf/ext/ep_products/ext_tables.sql index cd7c4290..b15f2c37 100644 --- a/web/typo3conf/ext/ep_products/ext_tables.sql +++ b/web/typo3conf/ext/ep_products/ext_tables.sql @@ -17,7 +17,7 @@ CREATE TABLE tx_epproducts_domain_model_product ( code varchar(255) DEFAULT '' NOT NULL, feature varchar(255) DEFAULT '' NOT NULL, bus_pro_id int(11) unsigned NOT NULL default '0', - detail_page int(11) unsigned NOT NULL default '0', + detail_page varchar(255) DEFAULT '' NOT NULL, description text NOT NULL, teaser text NOT NULL, teaser_long text NOT NULL, @@ -116,7 +116,7 @@ CREATE TABLE tx_epproducts_domain_model_date ( product_subline varchar(255) DEFAULT '' NOT NULL, product_fact varchar(255) DEFAULT '' NOT NULL, product_searchable tinyint(4) unsigned DEFAULT '0' NOT NULL, - product_detail_page int(11) unsigned NOT NULL default '0', + product_detail_page varchar(255) DEFAULT '' NOT NULL, product_keywords text NOT NULL, product_teaser text NOT NULL, product_feature varchar(255) DEFAULT '' NOT NULL, @@ -144,7 +144,7 @@ CREATE TABLE tx_epproducts_domain_model_date ( hotel_type tinyint(4) unsigned DEFAULT '0' NOT NULL, hotel_keywords text NOT NULL, hotel_teaser text NOT NULL, - hotel_detail_page int(11) unsigned NOT NULL default '0', + hotel_detail_page varchar(255) DEFAULT '' NOT NULL, earlybird tinyint(4) unsigned DEFAULT '0' NOT NULL, low_contingent tinyint(4) unsigned DEFAULT '0' NOT NULL, rooms int(11) unsigned DEFAULT '0', @@ -191,7 +191,7 @@ CREATE TABLE tx_epproducts_domain_model_hotel ( earlybird tinyint(4) unsigned DEFAULT '0' NOT NULL, low_contingent tinyint(4) unsigned DEFAULT '0' NOT NULL, show_as_teaser tinyint(4) unsigned DEFAULT '0' NOT NULL, - detail_page int(11) unsigned NOT NULL default '0', + detail_page varchar(255) DEFAULT '' NOT NULL, name varchar(255) DEFAULT '' NOT NULL, headline varchar(255) DEFAULT '' NOT NULL, description text NOT NULL, @@ -356,7 +356,7 @@ CREATE TABLE tx_epproducts_domain_model_concept ( code varchar(255) DEFAULT '' NOT NULL, description text NOT NULL, description_extended text NOT NULL, - detail_page int(11) DEFAULT '0' NOT NULL, + detail_page varchar(255) DEFAULT '' NOT NULL, products int(11) DEFAULT '0' NOT NULL, teaser text NOT NULL, headline varchar(255) DEFAULT '' NOT NULL, @@ -402,7 +402,7 @@ CREATE TABLE tx_epproducts_domain_model_country ( uid int(11) NOT NULL auto_increment, pid int(11) DEFAULT '0' NOT NULL, - detail_page int(11) unsigned NOT NULL default '0', + detail_page varchar(255) DEFAULT '' NOT NULL, code char(2) DEFAULT '' NOT NULL, name varchar(255) DEFAULT '' NOT NULL, name_internal varchar(255) DEFAULT '' NOT NULL, @@ -460,7 +460,7 @@ CREATE TABLE tx_epproducts_domain_model_region ( uid int(11) NOT NULL auto_increment, pid int(11) DEFAULT '0' NOT NULL, - detail_page int(11) unsigned NOT NULL default '0', + detail_page varchar(255) DEFAULT '' NOT NULL, exclude_from_teasergroups tinyint(4) unsigned DEFAULT '0' NOT NULL, name varchar(255) DEFAULT '' NOT NULL, name_internal varchar(255) DEFAULT '' NOT NULL, @@ -534,7 +534,7 @@ CREATE TABLE tx_epproducts_domain_model_city ( uid int(11) NOT NULL auto_increment, pid int(11) DEFAULT '0' NOT NULL, - detail_page int(11) unsigned NOT NULL default '0', + detail_page varchar(255) DEFAULT '' NOT NULL, exclude_from_teasergroups tinyint(4) unsigned DEFAULT '0' NOT NULL, name varchar(255) DEFAULT '' NOT NULL, name_internal varchar(255) DEFAULT '' NOT NULL, diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php index ca7b388f..e49c02a2 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php @@ -29,7 +29,9 @@ namespace EP\EpTheme\ViewHelpers\Uri; use EP\EpProducts\Domain\Model\Hotel; use EP\EpProducts\Domain\Model\Product; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; @@ -62,14 +64,15 @@ class ProductViewHelper extends AbstractViewHelper ) { $product = $arguments['product']; + if ($product->getDetailPage()) { - return $renderingContext - ->getControllerContext() - ->getUriBuilder() - ->reset() - ->setTargetPageUid($product->getDetailPage()) - ->build() - ; + /** @var ContentObjectRenderer $contentObject */ + $contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class); + return $contentObject->typoLink_URL( + [ + 'parameter' => $product->getDetailPage(), + ] + ); } $pageUid = $arguments['defaultDetailPageUid']; diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Breadcrumb.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Breadcrumb.html index 68598d50..77f5f6d8 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Breadcrumb.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Breadcrumb.html @@ -7,7 +7,7 @@ {item.title -> v:format.replace(substring: '#', replacement: ' ')} - {item.title -> v:format.replace(substring: '#', replacement: ' ')} + {item.title -> v:format.replace(substring: '#', replacement: ' ')} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html index fdc10091..5551d6db 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html @@ -5,7 +5,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
- + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html index a1c38772..1e990d16 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html @@ -5,7 +5,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
@@ -16,7 +16,7 @@ {concept.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
- + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html index bb53e895..6013371d 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/ContactBar.html @@ -1,6 +1,6 @@ {namespace v=FluidTYPO3\Vhs\ViewHelpers}
- +
Merkliste ({{ watchlistCount }})
 diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html index 0ac7f06b..b62e294f 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html @@ -32,7 +32,12 @@
-
{button.container.label}
+
+ + {button.container.label} + +
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html index 29ba5859..b7a770ea 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html @@ -9,7 +9,7 @@
{data.bodytext -> f:format.html()}
{data.flexForm.buttons -> v:iterator.first() -> v:variable.set(name: 'button')} - {button.container.label -> f:format.raw()} + {button.container.label -> f:format.raw()}
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html index 6e527dd5..2ec58674 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html @@ -8,7 +8,7 @@
{data.header}
- + {teaserImage.alternative} @@ -22,7 +22,7 @@
{data.bodytext -> f:format.html()}
- {button.container.label -> f:format.raw()} + {button.container.label -> f:format.raw()}
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html index dd155270..36f8ccbc 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html @@ -25,7 +25,7 @@
-
{button.container.label}
+
{button.container.label}
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html index 7c42b632..ebcdaf86 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html @@ -10,7 +10,7 @@
- {buttonLabel -> f:format.raw()} + {buttonLabel -> f:format.raw()}
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html index 44bd09c0..66d17265 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Faq.html @@ -24,7 +24,9 @@
- Weitere Reiseinfos findet ihr hier + + Weitere Reiseinfos findet ihr hier +
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html index 699e63e6..833932fb 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html @@ -20,7 +20,7 @@
  • {submenuitem.title}
    • -
  • {submenuitem.title}
    • +
  • {submenuitem.title}
    •  @@ -75,8 +75,8 @@
    - Impressum - AGB + Impressum + AGB
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html index 38ecfefc..169ddfc6 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html @@ -13,11 +13,11 @@ {slide.headline} {slide.subline} - {slide.button} + {slide.button} - {slide.button} + {slide.button} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html index dc82712a..819d73e9 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html @@ -13,12 +13,12 @@ {slide.headline}
    {slide.subline} - {slide.button} + {slide.button} - {slide.button} + {slide.button} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html index b348514d..fdc15eb2 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html @@ -5,7 +5,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
    -     +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserExtended.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserExtended.html index 66d95075..af66a3bf 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserExtended.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserExtended.html @@ -3,7 +3,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
    -     +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserSimple.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserSimple.html index 0aba6669..6d58e078 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserSimple.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/TeaserSimple.html @@ -3,7 +3,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
    -     +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html index 5c91f7cf..dd55972d 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html @@ -33,7 +33,7 @@ - + @@ -62,7 +62,7 @@ - @@ -84,7 +84,7 @@ - + {f:if(condition: '{subitem.tx_eptheme_context_country_code}', then: '{f:image(src: \'{ep:flagiconSource(countryCode: subitem.tx_eptheme_context_country_code)}\', alt: subitem.tx_eptheme_context_country_code)}')}{subitem.title} @@ -107,7 +107,7 @@
  • {subsubitem.title}
    • -
  • {subsubitem.title}
    • +
  • {subsubitem.title}
    •  @@ -121,7 +121,7 @@ Anrufen Whatsapp - FAQ + FAQ     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-3.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-3.html index a8e646ec..3adb4025 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-3.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-3.html @@ -9,7 +9,7 @@
  • - {contentElement.header}
    • diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html index 2094d9ef..a69a3450 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/HeaderDetail.html @@ -70,7 +70,7 @@ arguments="{filterSettings: '{filterSettings -> ep:filterSettingsEncoder()}'}">zurück zum Suchergebnis - zurück + zurück     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html index 3925f581..8976203e 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html @@ -21,12 +21,12 @@ - - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html index b55ce2d1..14dfa3e0 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/TeaserWide.html @@ -10,7 +10,7 @@ - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Rating.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Rating.html index 00143d4e..dd08b63c 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Rating.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Rating.html @@ -1,6 +1,6 @@ {namespace ep=EP\EpTheme\ViewHelpers} - +

    {label}

    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html index 08a818fe..cd324670 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html @@ -5,7 +5,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +
    f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
    -     +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionAward.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionAward.html index 23d78cda..ca12c197 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionAward.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/RegionAward.html @@ -3,7 +3,7 @@

    {region.awardLabel -> v:or(alternative: 'Auszeichnung')}

    - + - +
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html index 16bf000b..6440ee3b 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html @@ -8,9 +8,9 @@ - + - +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html index 10d25fcf..2f31e4c1 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html @@ -9,9 +9,9 @@ - + - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html index 0ba860d9..5acf500b 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html @@ -48,7 +48,7 @@
    - Details + Details Details diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSection.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSection.html index ef287172..b4cc5cff 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSection.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSection.html @@ -11,7 +11,7 @@
  • - {element.data.header}
    • diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html index ada9e7fc..c449f374 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html @@ -8,9 +8,10 @@
    • - + {page.title} - +
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html index 48d3a866..2eef2e7e 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserCountry.html @@ -7,7 +7,7 @@ - +
    f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
    -     +     diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html index 3420ff4b..6a8711a3 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/FullForm.html @@ -80,9 +80,9 @@
    - Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html index b8d8e792..d65ba212 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Form/SimpleForm.html @@ -39,9 +39,9 @@
    - Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html index 7b6823fa..06806d6a 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/News/News/Detail.html @@ -71,9 +71,9 @@ - + - +
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html index 33eb80f8..645f25fa 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html @@ -101,11 +101,11 @@
    - - +
    @@ -121,10 +121,10 @@

    Gruppenrabatt bis zu 100€ möglich

    -

    Für Gruppen bis 15 Personen könnt ihr hier direkt buchen. +

    Für Gruppen bis 15 Personen könnt ihr hier direkt buchen. Für Gruppen ab 16 Personen erstellen wir euch ein konkretes Angebot zu günstigen Gruppenkonditionen zu dieser Reise. Anfrage via Tel. 0221 - 272 276 18 oder mit einer - Kurzanfrage!

    + Kurzanfrage!

         @@ -200,11 +200,11 @@
    - - +
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html index 9a1a0099..406765ef 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html @@ -44,7 +44,7 @@ @selected="updatePax" :pax-options="filterOptions.pax" :pax="searchParams.pax" - groups-uri="{f:uri.page(pageUid: settings.groupsPageUid)}" + groups-uri="{f:uri.typolink(parameter: settings.groupsPageUid)}" >
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Snowreport/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Snowreport/List.html index 28a26e7f..a655f910 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Snowreport/List.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Snowreport/List.html @@ -19,8 +19,8 @@ - {snowreport.regionName}
    - {snowreport.countryName} + {snowreport.regionName}
    + {snowreport.countryName} diff --git a/web/typo3conf/ext/ep_theme/ext_tables.sql b/web/typo3conf/ext/ep_theme/ext_tables.sql index ea3329ff..2e53ebca 100644 --- a/web/typo3conf/ext/ep_theme/ext_tables.sql +++ b/web/typo3conf/ext/ep_theme/ext_tables.sql @@ -10,7 +10,7 @@ CREATE TABLE tx_eptheme_domain_model_slide ( headline varchar(255) DEFAULT '' NOT NULL, subline varchar(255) DEFAULT '' NOT NULL, button varchar(255) DEFAULT '' NOT NULL, - page_uid int(11) unsigned NOT NULL default '0', + page_uid varchar(255) DEFAULT '' NOT NULL, image int(11) unsigned NOT NULL default '0', page int(11) unsigned DEFAULT '0', sorting int(11) unsigned DEFAULT '0' NOT NULL, diff --git a/web/typo3conf/ext/ep_track/ext_tables.sql b/web/typo3conf/ext/ep_track/ext_tables.sql index d8878237..35a4a6cb 100644 --- a/web/typo3conf/ext/ep_track/ext_tables.sql +++ b/web/typo3conf/ext/ep_track/ext_tables.sql @@ -9,7 +9,7 @@ CREATE TABLE tx_eptrack_domain_model_redirect ( label varchar(255) DEFAULT '' NOT NULL, redirect_from varchar(255) DEFAULT '' NOT NULL, - target_page_uid int(11) unsigned DEFAULT '0' NOT NULL, + target_page_uid varchar(255) DEFAULT '' NOT NULL, tracking_code varchar(255) DEFAULT '' NOT NULL, response_code char(3) DEFAULT '301' NOT NULL, utm_source varchar(255) DEFAULT '' NOT NULL,