Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-07-30 09:30:13 +02:00
@@ -1,7 +1,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpEvents/ViewHelpers">
<html data-namespace-typo3-fluid="true" lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:layout name="Default"/>
@@ -20,8 +20,8 @@
context-pax='{inquiry.pax}'
context-budget='{inquiry.budget}'
context-period='{inquiry.period}'
:default-values='{settings.configurator.defaults -> v:format.json.encode()}'
:options-type='{configuratorConfig.travelTypeOptions -> v:format.json.encode()}'
:default-values='{settings.configurator.defaults -> v:format.json.encode() -> f:format.raw()}'
:options-type='{configuratorConfig.travelTypeOptions -> v:format.json.encode() -> f:format.raw()}'
:images-type='{<f:format.raw>
1: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_type_incentive.jpg', width: '450')}",
2: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_type_team-building.jpg', width: '450')}",
@@ -29,7 +29,7 @@
4: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_type_corporate-event.jpg', width: '450')}"
</f:format.raw>}'
context-destination='{inquiry.locationType}'
:options-destination='{configuratorConfig.locationTypeOptions -> v:format.json.encode()}'
:options-destination='{configuratorConfig.locationTypeOptions -> v:format.json.encode() -> f:format.raw()}'
:images-destination='{<f:format.raw>
1: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_destination_sea.jpg', width: '450')}",
2: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_destination_mountains_skiing.jpg', width: '450')}",
@@ -37,7 +37,7 @@
4: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_destination_special.jpg', width: '450')}"
</f:format.raw>}'
context-accommodation='{inquiry.hotelType}'
:options-accommodation='{configuratorConfig.accommodationTypeOptions -> v:format.json.encode()}'
:options-accommodation='{configuratorConfig.accommodationTypeOptions -> v:format.json.encode() -> f:format.raw()}'
:images-accommodation='{<f:format.raw>
1: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_hotel_3-stars.jpg', width: '450')}",
2: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_hotel_4-stars.jpg', width: '450')}",
@@ -45,7 +45,7 @@
4: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_hotel_special.jpg', width: '450')}"
</f:format.raw>}'
context-programme='{inquiry.activityType}'
:options-programme='{configuratorConfig.programmeTypeOptions -> v:format.json.encode()}'
:options-programme='{configuratorConfig.programmeTypeOptions -> v:format.json.encode() -> f:format.raw()}'
:images-programme='{<f:format.raw>
1: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_programme_outdoor-action.jpg', width: '450')}",
2: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_programme_event-gastro.jpg', width: '450')}",
@@ -53,10 +53,10 @@
4: "{f:uri.image(src: 'fileadmin/user_upload/ep_Events/Konfigurator/configurator_programme_special.jpg', width: '450')}"
</f:format.raw>}'
context-distance="{inquiry.distance}"
:options-distance='{configuratorConfig.distanceOptions -> v:format.json.encode()}'
:options-pax='{configuratorConfig.paxOptions -> v:format.json.encode()}'
:options-budget='{configuratorConfig.budgetOptions -> v:format.json.encode()}'
:options-period='{configuratorConfig.periodOptions -> v:format.json.encode()}'
:options-distance='{configuratorConfig.distanceOptions -> v:format.json.encode() -> f:format.raw()}'
:options-pax='{configuratorConfig.paxOptions -> v:format.json.encode() -> f:format.raw()}'
:options-budget='{configuratorConfig.budgetOptions -> v:format.json.encode() -> f:format.raw()}'
:options-period='{configuratorConfig.periodOptions -> v:format.json.encode() -> f:format.raw()}'
:language="{
'travel_type': '<f:translate key="tx_epevents.label.configurator_travel_type" extensionName="ep_events"/>',
'destination': '<f:translate key="tx_epevents.label.configurator_destination" extensionName="ep_events"/>',
@@ -70,7 +70,7 @@
inline-template>
<f:form id="configuratorform" object="{inquiry}" name="inquiry" action="processConfiguratorForm"
controller="AjaxForm" pluginName="Ajax" pageType="1703" pageUid="{settings.ajaxPageUid}"
noCacheHash="1" additionalAttributes="{'@submit.prevent': 'submitForm()'}">
additionalAttributes="{'@submit.prevent': 'submitForm()'}">
<f:form.hidden property="travelType" additionalAttributes="{v-model: 'formData.type'}"/>
<f:form.hidden property="hotelType" additionalAttributes="{v-model: 'formData.accommodation'}"/>
<f:form.hidden property="locationType" additionalAttributes="{v-model: 'formData.destination'}"/>
@@ -96,22 +96,12 @@
<div class="config-selectbox__badges">
<span v-for="badge in selectedOptions(selectBoxType)" class="config-selectbox__badge">{{ badge }}</span>
</div>
<span class="config-selectbox__toggle" :class="{
closed: !selectBoxData.active && !isIncludedBox(selectBoxType),
open: selectBoxData.active,
included: isIncludedBox(selectBoxType)
}"></span>
<span class="config-selectbox__toggle" :class="{closed: !selectBoxData.active && !isIncludedBox(selectBoxType),open: selectBoxData.active,included: isIncludedBox(selectBoxType)}"></span>
</a>
<div class="config-selectbox__main">
<a href="#"
v-for="(label, value) in selectBoxData.options"
:class="[
'config-selectbox__item ' + selectBoxType + '--' + value,
{
selected: isSelected(selectBoxType, value),
'has--icon': selectBoxData.hasIcon
}
]"
:class="['config-selectbox__item ' + selectBoxType + '--' + value,{selected: isSelected(selectBoxType, value),'has--icon': selectBoxData.hasIcon}]"
@click.prevent="toggleSelection(selectBoxType, value)"
@touchend.prevent="toggleSelection(selectBoxType, value)">
<div class="config-selectbox__item__inner"