diff --git a/web/typo3conf/ext/ep_events/Classes/Domain/Model/Offer.php b/web/typo3conf/ext/ep_events/Classes/Domain/Model/Offer.php index 9ad3ee03..034252ed 100644 --- a/web/typo3conf/ext/ep_events/Classes/Domain/Model/Offer.php +++ b/web/typo3conf/ext/ep_events/Classes/Domain/Model/Offer.php @@ -127,28 +127,28 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity * * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference */ - protected $imageHeader = null; + protected $imageHeader; /** * imageTeaser * * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference */ - protected $imageTeaser = null; + protected $imageTeaser; /** * imageTeaserMobile * * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference */ - protected $imageTeaserMobile = null; + protected $imageTeaserMobile; /** * bookingForm * * @var \TYPO3\CMS\Extbase\Domain\Model\FileReference */ - protected $bookingForm = null; + protected $bookingForm; /** * configuratorType @@ -183,35 +183,35 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity * * @var \EP\EpEvents\Domain\Model\Contact */ - protected $contact = null; + protected $contact; /** * hotel * * @var \EP\EpEvents\Domain\Model\Hotel */ - protected $hotel = null; + protected $hotel; /** * location * * @var \EP\EpEvents\Domain\Model\Location */ - protected $location = null; + protected $location; /** * activities * * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EP\EpEvents\Domain\Model\Activity> */ - protected $activities = null; + protected $activities; /** * detailPage * - * @var int + * @var string */ - protected $detailPage = 0; + protected $detailPage; /** * __construct @@ -696,7 +696,7 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity } /** - * @return int + * @return string */ public function getDetailPage() { @@ -704,7 +704,7 @@ class Offer extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity } /** - * @param int $detailPage + * @param string $detailPage */ public function setDetailPage($detailPage) { diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php index 57a02278..7f565675 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php @@ -463,10 +463,8 @@ return [ 'label' => 'Detailseite', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int,required', + 'eval' => 'required', 'renderType' => 'inputLink', - 'softref' => 'typolink' ], ], 'url' => [ diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html index 823b9b19..5c788d4e 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/CategoryEpEvents.html @@ -38,7 +38,7 @@ diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Partials/CookieConsent.html b/web/typo3conf/ext/ep_events/Resources/Private/Partials/CookieConsent.html index fec81c33..a3aec2d0 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Partials/CookieConsent.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Partials/CookieConsent.html @@ -15,7 +15,7 @@ "message": "Wir verwenden Cookies. Durch die Benutzung unserer Website akzeptieren Sie unsere Richtlinien.", "dismiss": "Cookies akzeptieren", "link": "Mehr Infos", - "href": "{f:uri.page(pageUid: settings.dataProtectionPageUid)}" + "href": "{f:uri.typolink(parameter: settings.dataProtectionPageUid)}" } })}); diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Partials/MobileNav.html b/web/typo3conf/ext/ep_events/Resources/Private/Partials/MobileNav.html index f26addbf..f3594d4c 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Partials/MobileNav.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Partials/MobileNav.html @@ -38,6 +38,6 @@ - Anfrage + Anfrage diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeaserLandscape.html b/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeaserLandscape.html index 17ad5acb..108a2d58 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeaserLandscape.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeaserLandscape.html @@ -1,5 +1,5 @@ {namespace ep=EP\EpEvents\ViewHelpers} -
@@ -29,4 +29,4 @@ {offer.header -> f:format.html()} » Mehr erfahren
- + diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeasers.html b/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeasers.html index 449279b3..17f1d96a 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeasers.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Partials/OfferTeasers.html @@ -11,7 +11,7 @@ diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html index f0b6a8a5..c09445aa 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/FluidStyledContent/Tile.html @@ -6,7 +6,7 @@ - +
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html index b3f34e1b..3133a800 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html @@ -151,9 +151,9 @@
- Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
@@ -162,8 +162,8 @@
@@ -174,7 +174,7 @@ placeholder="Name/Firma" additionalAttributes="{v-model: 'formData.name'}"/>
{{formErrors.inquiryname}}
+ v-show="formErrors.inquiryname" v-html="formErrors.inquiryname">
{{formErrors.inquiryemail}}
+ v-show="formErrors.inquiryemail" v-html="formErrors.inquiryemail">
{{formErrors.inquiryphone}}
+ v-show="formErrors.inquiryphone" v-html="formErrors.inquiryphone">
- Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
@@ -212,8 +212,8 @@
@@ -252,9 +252,9 @@
- Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
@@ -263,8 +263,8 @@
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html index f90a6e02..b8100798 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html @@ -90,9 +90,9 @@ additionalAttributes="{v-model: 'formData.message'}"/>
- Ich habe die Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html index 790e2085..c5264778 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html @@ -78,9 +78,9 @@ additionalAttributes="{v-model: 'formData.message'}"/>
- Ich habe die Ich habe die Datenschutzbestimmungen gelesen und akzeptiert. + target="_blank">Datenschutzbestimmungen gelesen und akzeptiert.
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html index 55475010..752ed189 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html @@ -41,7 +41,11 @@ class="topline">Informationen über die Region{offer.location.name} {offer.location.descriptionShort -> f:format.html()} -

zurück zum Suchergebnis

+

+ + zurück zum Suchergebnis + +

diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html index adc1ac7f..5a884cbb 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html @@ -14,9 +14,10 @@ - +
@@ -45,7 +46,7 @@ {offer.header -> f:format.html()} » Mehr erfahren
- +
diff --git a/web/typo3conf/ext/ep_events/ext_tables.sql b/web/typo3conf/ext/ep_events/ext_tables.sql index ab39c06f..8c9a238a 100644 --- a/web/typo3conf/ext/ep_events/ext_tables.sql +++ b/web/typo3conf/ext/ep_events/ext_tables.sql @@ -66,7 +66,7 @@ CREATE TABLE tx_epevents_domain_model_offer ( schedule text NOT NULL, services text NOT NULL, guidelines text NOT NULL, - detail_page int(11) unsigned DEFAULT '0', + detail_page varchar(255) DEFAULT '' NOT NULL, image_header int(11) unsigned NOT NULL default '0', image_teaser int(11) unsigned NOT NULL default '0', image_teaser_mobile int(11) unsigned NOT NULL default '0', @@ -361,6 +361,18 @@ CREATE TABLE pages ( tx_epevents_offer int(11) DEFAULT '0' ); +# +# Table structure for table 'pages_language_overlay' +# +CREATE TABLE pages_language_overlay ( + tx_epevents_configurator_travel_type tinyint(4) DEFAULT '0', + tx_epevents_configurator_hotel_type tinyint(4) DEFAULT '0', + tx_epevents_configurator_destination_type tinyint(4) DEFAULT '0', + tx_epevents_configurator_activity_type tinyint(4) DEFAULT '0', + tx_epevents_traveltype int(11) DEFAULT '0', + tx_epevents_offer int(11) DEFAULT '0' +); + # # Table structure for table 'tt_content' # diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/AbstractDestination.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/AbstractDestination.php index ef49e7a8..1e6551bb 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/AbstractDestination.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/AbstractDestination.php @@ -34,9 +34,9 @@ class AbstractDestination extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity const SEASON_SUMMER = 's'; /** - * @var int + * @var string */ - protected $detailPage = 0; + protected $detailPage; /** * @var string @@ -121,7 +121,7 @@ class AbstractDestination extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity } /** - * @return int + * @return string */ public function getDetailPage() { @@ -129,7 +129,7 @@ class AbstractDestination extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity } /** - * @param int $detailPage + * @param string $detailPage */ public function setDetailPage($detailPage) { diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Concept.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Concept.php index ddb3f285..8d5708a7 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Concept.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Concept.php @@ -76,25 +76,25 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements protected $descriptionExtended = ''; /** - * @var int + * @var string */ - protected $detailPage = 0; + protected $detailPage; /** * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> */ - protected $teaserImages = null; + protected $teaserImages; /** * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Extbase\Domain\Model\FileReference> */ - protected $headerImages = null; + protected $headerImages; /** * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EP\EpProducts\Domain\Model\Product> * @lazy */ - protected $products = null; + protected $products; /** * __construct @@ -256,7 +256,7 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements } /** - * @return int $detailPage + * @return string $detailPage */ public function getDetailPage() { @@ -264,7 +264,7 @@ class Concept extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements } /** - * @param int $detailPage + * @param string $detailPage */ public function setDetailPage($detailPage) { diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php index 8c24a693..ee307336 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Hotel.php @@ -85,9 +85,9 @@ class Hotel extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements Te protected $showAsTeaser = false; /** - * @var int + * @var string */ - protected $detailPage = 0; + protected $detailPage; /** * @var string @@ -314,7 +314,7 @@ class Hotel extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements Te } /** - * @return int + * @return string */ public function getDetailPage() { @@ -322,7 +322,7 @@ class Hotel extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements Te } /** - * @param int $detailPage + * @param string $detailPage */ public function setDetailPage($detailPage) { diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php index 6b100be9..676bdaff 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/Product.php @@ -46,9 +46,9 @@ class Product extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements protected $daytrip = false; /** - * @var int + * @var string */ - protected $detailPage = 0; + protected $detailPage; /** * @var string @@ -312,14 +312,14 @@ class Product extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements } /** - * @return int + * @return string */ public function getDetailPage() { return $this->detailPage; } /** - * @param int $detailPage + * @param string $detailPage */ public function setDetailPage($detailPage) { $this->detailPage = $detailPage;