EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag '2019.08.001' into develop

Browse Source 
2019.08.001
This commit is contained in:
Björn Fromme
2019-08-15 15:09:15 +02:00
parent 7c21ed354f efa6d748f4
commit 24c40e4928
11 changed files with 216 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+202 -199
View File
File diff suppressed because it is too large Load Diff
public/cleverpush-manifest.json
+1
View File
@@ -0,0 +1 @@
{"name":"E&P Skireisen","short_name":"E&P Skireisen","start_url":"/","display":"standalone","gcm_sender_id":"890396972010","gcm_user_visible_only":true}
public/cleverpush-worker.js
+1
View File
@@ -0,0 +1 @@
importScripts('https://static.cleverpush.com/channel/worker/MrDvZ9L2bngnLfnq9.js' + self.location.search);
public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml
+1
View File
@@ -5,6 +5,7 @@ imports:
editor: editor:
config: config:
disableNativeSpellChecker: false
contentsCss: contentsCss:
- "EXT:ep_events/Resources/Public/css/rte.min.css" - "EXT:ep_events/Resources/Public/css/rte.min.css"
public/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html
+1 -1
View File
@@ -25,7 +25,7 @@
</div> </div>
<f:render partial="FormBoxBottom"/> <f:render partial="FormBoxBottom"/>
</div> </div>
<v:menu levels="1" entryLevel="2"> <v:menu levels="1" entryLevel="2" titleFields="title">
<div class="box"> <div class="box">
<f:render partial="FormBoxTop"/> <f:render partial="FormBoxTop"/>
<div class="box__content"> <div class="box__content">
public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
+1
View File
@@ -144,6 +144,7 @@ class ProductController extends ActionController
'product' => $product, 'product' => $product,
'isProductWithExcludedConcept' => $isProductWithExcludedConcept, 'isProductWithExcludedConcept' => $isProductWithExcludedConcept,
'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept, 'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
'currentPageUid' => $GLOBALS['TSFE']->id,
]); ]);
} }
public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Hotel.php
+1
View File
@@ -47,6 +47,7 @@ class Hotel
$hotel['category'] = \EP\EpProducts\Domain\Model\Hotel::$categoryLabels[$entity->getCategory()]; $hotel['category'] = \EP\EpProducts\Domain\Model\Hotel::$categoryLabels[$entity->getCategory()];
$hotel['type'] = \EP\EpProducts\Domain\Model\Hotel::$typeLabels[$entity->getType()]; $hotel['type'] = \EP\EpProducts\Domain\Model\Hotel::$typeLabels[$entity->getType()];
$hotel['description'] = SerializationUtility::sanitizeText($entity->getDescription()); $hotel['description'] = SerializationUtility::sanitizeText($entity->getDescription());
$hotel['roomtypes'] = SerializationUtility::sanitizeText($entity->getRoomTypes());
$hotel['features'] = SerializationUtility::sanitizeText($entity->getFeatures()); $hotel['features'] = SerializationUtility::sanitizeText($entity->getFeatures());
$hotel['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages()); $hotel['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages());
public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml
+1
View File
@@ -5,6 +5,7 @@ imports:
editor: editor:
config: config:
disableNativeSpellChecker: false
contentsCss: contentsCss:
- "EXT:ep_theme/Resources/Public/css/rte.css" - "EXT:ep_theme/Resources/Public/css/rte.css"
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
-1
View File
@@ -300,7 +300,6 @@ new Vue({
$window.on('resize', () => { $window.on('resize', () => {
this.setMobileMode(); this.setMobileMode();
this.initCarousels(); this.initCarousels();
this.initFilterpanel();
this.initDropdownMenuBehavior(); this.initDropdownMenuBehavior();
let newBackgroundImageMode = this.getBackgroundImageMode(); let newBackgroundImageMode = this.getBackgroundImageMode();
if (this.backgroundImageMode !== newBackgroundImageMode) { if (this.backgroundImageMode !== newBackgroundImageMode) {
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+3 -1
View File
@@ -175,7 +175,9 @@
<div v-cloak v-show="!loading && priceTableShow"> <div v-cloak v-show="!loading && priceTableShow">
<price-table :price-table-rows="priceTableRows" :services-included="servicesIncluded" <price-table :price-table-rows="priceTableRows" :services-included="servicesIncluded"
:date-label="dateLabel" :single-date="singleDate"></price-table> :date-label="dateLabel" :single-date="singleDate"></price-table>
<f:render partial="Product/Details" arguments="{_all}"/> <f:alias map="{currentPageUid: 1}">
<f:render partial="Product/Details" arguments="{_all}"/>
</f:alias>
</div> </div>
<!-- /Prices --> <!-- /Prices -->
<!-- Hotel --> <!-- Hotel -->
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
+4
View File
@@ -99,6 +99,10 @@
<label class="control-label">Ausstattung</label> <label class="control-label">Ausstattung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{hotel.features}</textarea> <textarea rows="5" class="form-control" onclick="this.select()">{hotel.features}</textarea>
</div> </div>
<div class="form-group">
<label class="control-label">Zimmerarten/Appartmentbeschreibung</label>
<textarea rows="5" class="form-control" onclick="this.select()">{hotel.roomtypes}</textarea>
</div>
<h4>Termine, Zimmer, Leistungen und Zustiege</h4> <h4>Termine, Zimmer, Leistungen und Zustiege</h4>
<f:if condition="{hotel.dates.date}"> <f:if condition="{hotel.dates.date}">
<f:then> <f:then>