Additional fixes and adjustments after upgrading

This commit is contained in:
Björn Fromme
2018-09-20 21:34:01 +02:00
parent 3529f4d31c
commit e668c5389c
22 changed files with 90 additions and 75 deletions
@@ -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)
{
@@ -463,10 +463,8 @@ return [
'label' => 'Detailseite',
'config' => [
'type' => 'input',
'size' => 4,
'eval' => 'int,required',
'eval' => 'required',
'renderType' => 'inputLink',
'softref' => 'typolink'
],
],
'url' => [
@@ -38,7 +38,7 @@
<div class="banner {ep:sectionCssClass(sectionValue: traveltype.configuratorType)}">
<div class="banner__content">
<span class="banner__title">{traveltype.bannertext -> f:format.nl2br()}</span>
<a class="button button--transparent" href="{f:uri.page(pageUid: settings.contactPageUid)}" title="Anfragen">&raquo; Fragen Sie unseren Experten</a>
<a class="button button--transparent" href="{f:uri.typolink(parameter: settings.contactPageUid)}" title="Anfragen">&raquo; Fragen Sie unseren Experten</a>
</div>
<div class="banner__image" style="background-image: url({f:uri.image(src: traveltype.imageBanner.uid, treatIdAsReference: 1, crop: traveltype.imageBanner.crop)})"></div>
</div>
@@ -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:format.raw>{f:uri.page(pageUid: settings.dataProtectionPageUid)}</f:format.raw>"
"href": "<f:format.raw>{f:uri.typolink(parameter: settings.dataProtectionPageUid)}</f:format.raw>"
}
})});
</script>
@@ -38,6 +38,6 @@
<div class="mobilenav__search">
<f:cObject typoscriptObjectPath="lib.searchForm"/>
</div>
<a class="button button--transparent button--full" href="{f:uri.page(pageUid: settings.contactPageUid)}">Anfrage</a>
<a class="button button--transparent button--full" href="{f:uri.typolink(parameter: settings.contactPageUid)}">Anfrage</a>
</div>
</div>
@@ -1,5 +1,5 @@
{namespace ep=EP\EpEvents\ViewHelpers}
<f:link.page pageUid="{offer.detailPage}" class="searchresult-item {ep:sectionCssClass(sectionValue: offer.configuratorType)}"
<f:link.typolink parameter="{offer.detailPage}" class="searchresult-item {ep:sectionCssClass(sectionValue: offer.configuratorType)}"
additionalParams="{search: search.query}" title="Beispielangebot {offer.name} {offer.location.name}">
<div class="card card--no-form searchresult-item__card">
<div class="card__inner">
@@ -29,4 +29,4 @@
{offer.header -> f:format.html()}
<span class="button button--transparent">» Mehr erfahren</span>
</div>
</f:link.page>
</f:link.typolink>
@@ -11,7 +11,7 @@
<div class="carousel__outer">
<div class="carousel__inner teaser-carousel">
<f:for each="{offers}" as="offer">
<a class="carousel__item card" href="{f:uri.page(pageUid: offer.detailPage)}" title="{offer.name} {offer.location.name}">
<a class="carousel__item card" href="{f:uri.typolink(parameter: offer.detailPage)}" title="{offer.name} {offer.location.name}">
<div class="card__inner">
<f:if condition="{offer.imageTeaser}">
<f:then>
@@ -37,10 +37,10 @@
<div class="page-footer__bottom__column page-footer__legal">
<span class="page-footer__copyright">&copy; E&amp;P Reisen und Events GmbH</span>
<span class="page-footer__links">
<f:link.page pageUid="{settings.legalNoticePageUid}" title="Impressum"
class="page-footer__link page-footer__link--legal">Impressum</f:link.page>
<f:link.page pageUid="{settings.termsPageUid}" title="AGB"
class="page-footer__link page-footer__link--legal">AGB</f:link.page>
<f:link.typolink parameter="{settings.legalNoticePageUid}" title="Impressum"
class="page-footer__link page-footer__link--legal">Impressum</f:link.typolink>
<f:link.typolink parameter="{settings.termsPageUid}" title="AGB"
class="page-footer__link page-footer__link--legal">AGB</f:link.typolink>
</span>
</div>
</div>
@@ -32,14 +32,14 @@
<div class="banner {ep:sectionCssClass(sectionValue: activity.configuratorType)}">
<div class="banner__content">
<span class="banner__title">{activity.bannertext -> f:format.nl2br()}</span>
<a class="button button--transparent" href="{f:uri.page(pageUid: settings.contactPageUid)}" title="Anfragen">&raquo; Fragen Sie unseren Experten</a>
<a class="button button--transparent" href="{f:uri.typolink(parameter: settings.contactPageUid)}" title="Anfragen">&raquo; Fragen Sie unseren Experten</a>
</div>
<div class="banner__image" style="background-image: url({f:uri.image(src: settings.activityDefaultHeaderImage)})"></div>
</div>
</f:if>
<f:link.page pageUid="{settings.activityListPageUid}" title="Zurück zur Programm-Übersicht">
<f:link.typolink parameter="{settings.activityListPageUid}" title="Zurück zur Programm-Übersicht">
&laquo; Zurück zur Programm-Übersicht
</f:link.page>
</f:link.typolink>
</div>
</div>
<div class="content__sidebar">
@@ -10,7 +10,7 @@
<div class="banner {ep:sectionCssClass(sectionValue: data.tx_epevents_configurator_travel_type)}">
<div class="banner__content">
<span class="banner__title">{data.bodytext -> f:format.nl2br()}</span>
<a class="button button--transparent" href="{f:uri.page(pageUid: data.header_link)}" title="{data.header}">&raquo; {data.header}</a>
<a class="button button--transparent" href="{f:uri.typolink(parameter: data.header_link)}" title="{data.header}">&raquo; {data.header}</a>
</div>
<div class="banner__image" style="background-image: url({f:uri.image(src: image.0.uid, treatIdAsReference: 1, crop: image.0.crop)})"></div>
</div>
@@ -11,7 +11,7 @@
<div class="statement__inner">
{data.bodytext -> v:iterator.explode(glue: 'constant:LF') -> v:variable.set(name: 'items')}
<p class="statement__text">{items.0}<br><strong>{items.1}</strong></p>
<a class="button button--transparent" href="{f:uri.page(pageUid: data.header_link)}">&raquo; {data.header}</a>
<a class="button button--transparent" href="{f:uri.typolink(parameter: data.header_link)}">&raquo; {data.header}</a>
</div>
</div>
</f:section>
@@ -6,7 +6,7 @@
<f:layout name="Default"/>
<f:section name="Content">
<a class="tile" href="{f:uri.page(pageUid: data.header_link)}" title="{data.header}">
<a class="tile" href="{f:uri.typolink(parameter: data.header_link)}" title="{data.header}">
<div class="tile__inner" style="background-image: url({f:uri.image(src: image.0.uid, treatIdAsReference: 1, crop: image.0.crop)})">
<div class="tile__caption {ep:sectionCssClass(sectionValue: data.tx_epevents_configurator_travel_type)}">
<div class="tile__caption__inner">
@@ -151,9 +151,9 @@
</div>
<div class="form__item form__item--tablet">
<span class="form__text">
Ich habe die <f:link.page pageUid="{settings.dataProtectionPageUid}"
Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
title="Datenschutzbestimmungen"
target="_blank">Datenschutzbestimmungen</f:link.page> gelesen und akzeptiert.
target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.
</span>
</div>
<div class="form__item form__item--button form__item--tablet">
@@ -162,8 +162,8 @@
</div>
<f:if condition="{settings.feedbackPageUid}">
<div class="form__item form__item--link form__item--tablet">
<f:link.page class="form__link"
pageUid="{settings.feedbackPageUid}">Feedback</f:link.page>
<f:link.typolink class="form__link"
parameter="{settings.feedbackPageUid}">Feedback</f:link.typolink>
</div>
</f:if>
</div>
@@ -174,7 +174,7 @@
placeholder="Name/Firma"
additionalAttributes="{v-model: 'formData.name'}"/>
<div class="form__item__error"
v-show="formErrors.inquiryname">{{formErrors.inquiryname}}</div>
v-show="formErrors.inquiryname" v-html="formErrors.inquiryname"></div>
</div>
<div class="form__item" :class="{ 'has-errors': formErrors.inquiryemail }">
<f:form.textfield class="form__field form__field--configurator form__field--text"
@@ -182,7 +182,7 @@
placeholder="E-Mail"
additionalAttributes="{v-model: 'formData.email'}"/>
<div class="form__item__error"
v-show="formErrors.inquiryemail">{{formErrors.inquiryemail}}</div>
v-show="formErrors.inquiryemail" v-html="formErrors.inquiryemail"></div>
</div>
<div class="form__item" :class="{ 'has-errors': formErrors.inquiryphone }">
<f:form.textfield class="form__field form__field--configurator form__field--text"
@@ -190,7 +190,7 @@
placeholder="Telefon"
additionalAttributes="{v-model: 'formData.phone'}"/>
<div class="form__item__error"
v-show="formErrors.inquiryphone">{{formErrors.inquiryphone}}</div>
v-show="formErrors.inquiryphone" v-html="formErrors.inquiryphone"></div>
</div>
<div class="form__item form__item--textarea">
<f:form.textarea class="form__field form__field--configurator form__field--textarea"
@@ -201,9 +201,9 @@
</div>
<div class="form__item form__item--mobile">
<span class="form__text">
Ich habe die <f:link.page pageUid="{settings.dataProtectionPageUid}"
Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
title="Datenschutzbestimmungen"
target="_blank">Datenschutzbestimmungen</f:link.page> gelesen und akzeptiert.
target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.
</span>
</div>
<div class="form__item form__item--button form__item--mobile">
@@ -212,8 +212,8 @@
</div>
<f:if condition="{settings.feedbackPageUid}">
<div class="form__item form__item--link form__item--mobile">
<f:link.page class="form__link"
pageUid="{settings.feedbackPageUid}">Feedback</f:link.page>
<f:link.typolink class="form__link"
parameter="{settings.feedbackPageUid}">Feedback</f:link.typolink>
</div>
</f:if>
</div>
@@ -252,9 +252,9 @@
</div>
<div class="form__item form__item--desktop">
<span class="form__text">
Ich habe die <f:link.page pageUid="{settings.dataProtectionPageUid}"
Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
title="Datenschutzbestimmungen"
target="_blank">Datenschutzbestimmungen</f:link.page> gelesen und akzeptiert.
target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.
</span>
</div>
<div class="form__item form__item--button form__item--desktop">
@@ -263,8 +263,8 @@
</div>
<f:if condition="{settings.feedbackPageUid}">
<div class="form__item form__item--link form__item--desktop">
<f:link.page class="form__link"
pageUid="{settings.feedbackPageUid}">Feedback</f:link.page>
<f:link.typolink class="form__link"
parameter="{settings.feedbackPageUid}">Feedback</f:link.typolink>
</div>
</f:if>
</div>
@@ -90,9 +90,9 @@
additionalAttributes="{v-model: 'formData.message'}"/>
</div>
<div class="form__item">
<span class="form__text">Ich habe die <f:link.page pageUid="{settings.dataProtectionPageUid}"
<span class="form__text">Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
title="Datenschutzbestimmungen"
target="_blank">Datenschutzbestimmungen</f:link.page> gelesen und akzeptiert.</span>
target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.</span>
</div>
<div class="form__item form__item--button">
<button type="submit" class="form__button" v-on:click.prevent="submitForm()">&raquo; Jetzt anfragen</button>
@@ -78,9 +78,9 @@
additionalAttributes="{v-model: 'formData.message'}"/>
</div>
<div class="form__item">
<span class="form__text">Ich habe die <f:link.page pageUid="{settings.dataProtectionPageUid}"
<span class="form__text">Ich habe die <f:link.typolink parameter="{settings.dataProtectionPageUid}"
title="Datenschutzbestimmungen"
target="_blank">Datenschutzbestimmungen</f:link.page> gelesen und akzeptiert.</span>
target="_blank">Datenschutzbestimmungen</f:link.typolink> gelesen und akzeptiert.</span>
</div>
<div class="form__item form__item--button">
<button type="submit" class="form__button" v-on:click.prevent="submitForm()">&raquo; Jetzt anfragen</button>
@@ -41,7 +41,11 @@
class="topline">Informationen über die Region</span>{offer.location.name}</h2>
{offer.location.descriptionShort -> f:format.html()}
<f:if condition="{search}">
<p><f:link.page pageUid="{settings.searchPageUid}" additionalParams="{search: search}">zurück zum Suchergebnis</f:link.page></p>
<p>
<f:link.typolink parameter="{settings.searchPageUid}" additionalParams="{search: search}">
zurück zum Suchergebnis
</f:link.typolink>
</p>
</f:if>
</div>
</f:section>
@@ -14,9 +14,10 @@
<f:widget.paginate as="offers" objects="{result}"
configuration="{itemsPerPage: 10, insertAbove: 0, insertBelow: 1, addQueryStringMethod: 'GET,POST'}">
<f:for each="{offers}" as="offer">
<f:link.page pageUid="{offer.detailPage}" class="searchresult-item {ep:sectionCssClass(sectionValue: offer.configuratorType)}"
additionalParams="{search: search.query}" title="Beispielangebot {offer.name} {offer.location.name}"
rel="nofollow">
<a href="{f:uri.typolink(parameter: offer.detailPage, additionalParams: '{search: search.query}')}"
class="searchresult-item {ep:sectionCssClass(sectionValue: offer.configuratorType)}"
title="Beispielangebot {offer.name} {offer.location.name}"
rel="nofollow">
<div class="card card--no-form searchresult-item__card">
<div class="card__inner">
<f:if condition="{offer.imageTeaser}">
@@ -45,7 +46,7 @@
{offer.header -> f:format.html()}
<span class="button button--transparent">» Mehr erfahren</span>
</div>
</f:link.page>
</a>
</f:for>
</f:widget.paginate>
</f:then>
+13 -1
View File
@@ -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'
#
@@ -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)
{
@@ -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)
{
@@ -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)
{
@@ -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;