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

Merge branch 'release/2020.08-04'

Browse Source
This commit is contained in:
Björn Fromme
2020-08-27 17:21:55 +02:00
parent 43c35282cc c30642e6b6
commit ce1ae2625c
5 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+1
View File
@@ -6794,6 +6794,7 @@
"phar", "phar",
"update" "update"
], ],
"abandoned": true,
"time": "2019-12-12T13:45:57+00:00" "time": "2019-12-12T13:45:57+00:00"
}, },
{ {
public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -37,6 +37,7 @@ plugin.tx_epproducts {
searchLogIgnoreIps = {$plugin.tx_epproducts.settings.searchLogIgnoreIps} searchLogIgnoreIps = {$plugin.tx_epproducts.settings.searchLogIgnoreIps}
groupsPageUid = {$plugin.tx_eptheme.settings.groupsPageUid} groupsPageUid = {$plugin.tx_eptheme.settings.groupsPageUid}
groupsContactFormPageUid = {$plugin.tx_eptheme.settings.groupsContactFormPageUid} groupsContactFormPageUid = {$plugin.tx_eptheme.settings.groupsContactFormPageUid}
coronaUpdatesPageUid = {$plugin.tx_eptheme.settings.coronaUpdatesPageUid}
googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey} googleMapsApiKey = {$plugin.tx_eptheme.settings.googleMapsApiKey}
resellerExportPageUid = {$plugin.tx_epproducts.settings.resellerExportPageUid} resellerExportPageUid = {$plugin.tx_epproducts.settings.resellerExportPageUid}
ratingPageUid = {$plugin.tx_eptheme.settings.ratingPageUid} ratingPageUid = {$plugin.tx_eptheme.settings.ratingPageUid}
public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
+2
View File
@@ -64,6 +64,8 @@ plugin.tx_eptheme {
groupsPricePopupPageUid = groupsPricePopupPageUid =
# cat=eptheme/200/340; type=string; label='Reisen Alert' page UID # cat=eptheme/200/340; type=string; label='Reisen Alert' page UID
travelAlertPageUid = travelAlertPageUid =
# cat=eptheme/200/350; type=string; label='Corona Updates' page UID
coronaUpdatesPageUid =
# cat=eptheme/400/100; type=string; label=Phone number general # cat=eptheme/400/100; type=string; label=Phone number general
phoneNumber = 0221 - 272 276 0 phoneNumber = 0221 - 272 276 0
public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -55,6 +55,7 @@ plugin.tx_eptheme {
defaultContactFormPageUid = {$plugin.tx_eptheme.settings.defaultContactFormPageUid} defaultContactFormPageUid = {$plugin.tx_eptheme.settings.defaultContactFormPageUid}
defaultSearchPageUid = {$plugin.tx_epproducts.settings.defaultSearchPageUid} defaultSearchPageUid = {$plugin.tx_epproducts.settings.defaultSearchPageUid}
defaultDetailPageUid = {$plugin.tx_epproducts.settings.defaultDetailPageUid} defaultDetailPageUid = {$plugin.tx_epproducts.settings.defaultDetailPageUid}
coronaUpdatesPageUid = {$plugin.tx_eptheme.settings.coronaUpdatesPageUid}
logoImage = {$plugin.tx_eptheme.settings.logoImage} logoImage = {$plugin.tx_eptheme.settings.logoImage}
defaultTitle < sitetitle defaultTitle < sitetitle
forceActiveTopnavUid = {$plugin.tx_eptheme.settings.forceActiveTopnavUid} forceActiveTopnavUid = {$plugin.tx_eptheme.settings.forceActiveTopnavUid}
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+6
View File
@@ -86,6 +86,12 @@
<p> <p>
<watchlist-toggle uid="{hotel.uid}:{product.uid}" layout="link"></watchlist-toggle> <watchlist-toggle uid="{hotel.uid}:{product.uid}" layout="link"></watchlist-toggle>
</p> </p>
<p>
<a href="{f:uri.typolink(parameter: settings.coronaUpdatesPageUid)}"
class="button button--sidebar" title="Corona Updates">
Corona Updates
</a>
</p>
</div> </div>
</div> </div>
<div class="hidden-xs"> <div class="hidden-xs">