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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2020-11-10 10:42:08 +01:00
parent f1bbac2e09 b02bf9a4b7
commit 1ee7199bb0
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
+1 -9
View File
@@ -87,25 +87,17 @@ lib.stdheader.3.headerClass >
@import "EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript" @import "EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript"
config { config {
doctype = html5
removeDefaultCSS = 1 removeDefaultCSS = 1
removePageCss = 1 removePageCss = 1
removeDefaultJS = 0 removeDefaultJS = 0
disablePrefixComment = 1 disablePrefixComment = 1
inlineStyle2TempFile = 1 inlineStyle2TempFile = 1
absRefPrefix = /
compressJs = 1 compressJs = 1
compressCss = 1 compressCss = 1
typolinkEnableLinksAcrossDomains = 1 typolinkEnableLinksAcrossDomains = 1
} }
[globalVar = GP:L = 1] [siteLanguage("languageId") == "1"]
config {
sys_language_uid = 1
language = en
locale_all = en_EN.UTF-8
htmlTag_langKey = en
}
plugin.tx_epevents.settings.configurator.options { plugin.tx_epevents.settings.configurator.options {
budget = 1:undetermined;2:400 - 600 €;3:600 - 800 €;4:800 - 1000 €;5:1000 - 1500 €;6:1500 - 2000 €;7:2500 - 3000 € budget = 1:undetermined;2:400 - 600 €;3:600 - 800 €;4:800 - 1000 €;5:1000 - 1500 €;6:1500 - 2000 €;7:2500 - 3000 €
pax = 1:20 - 40;2:40 - 60;3:60 - 80;4:80 - 100;5:100 - 150;6:150 - 200;7:200 - 250;8:250 - 300;9:350 - 400;10:400 - 450;11:450 - 500;12:500+ pax = 1:20 - 40;2:40 - 60;3:60 - 80;4:80 - 100;5:100 - 150;6:150 - 200;7:200 - 250;8:250 - 300;9:350 - 400;10:400 - 450;11:450 - 500;12:500+
public/typo3conf/ext/ep_products/ext_localconf.php
+1 -1
View File
@@ -34,7 +34,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\T
$GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpProducts']['Service']['GroupsSwissService']['writerConfiguration'] = [ $GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpProducts']['Service']['GroupsSwissService']['writerConfiguration'] = [
\TYPO3\CMS\Core\Log\LogLevel::INFO => [ \TYPO3\CMS\Core\Log\LogLevel::INFO => [
'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [ 'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [
'logFile' => 'typo3temp/var/log/groups.swiss.log', 'logFile' => \TYPO3\CMS\Core\Core\Environment::getVarPath() . '/log/groups.swiss.log',
], ],
], ],
]; ];
public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript
+1 -1
View File
@@ -1,6 +1,6 @@
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript" @import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript"
[{$plugin.tx_eptheme.settings.bookingLinksPid} > 0] ["{$plugin.tx_eptheme.settings.bookingLinksPid}" > "0"]
plugin.tx_seo { plugin.tx_seo {
config { config {
xmlSitemap { xmlSitemap {
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html
+4
View File
@@ -15,6 +15,10 @@
<th>Name</th> <th>Name</th>
<td>{contactForm.name}</td> <td>{contactForm.name}</td>
</tr> </tr>
<tr>
<th>Vorname</th>
<td>{contactForm.firstName}</td>
</tr>
<tr> <tr>
<th>Geschlecht</th> <th>Geschlecht</th>
<td>{contactForm.gender}</td> <td>{contactForm.gender}</td>
public/typo3conf/ext/ep_theme/ext_localconf.php
+3 -3
View File
@@ -7,14 +7,14 @@ $GLOBALS['TYPO3_CONF_VARS']['LOG']['TYPO3']['CMS']['deprecations']['writerConfig
$GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpTheme']['Service']['BookingApiService']['writerConfiguration'] = [ $GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpTheme']['Service']['BookingApiService']['writerConfiguration'] = [
\TYPO3\CMS\Core\Log\LogLevel::INFO => [ \TYPO3\CMS\Core\Log\LogLevel::INFO => [
'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [ 'TYPO3\\CMS\\Core\\Log\\Writer\\FileWriter' => [
'logFile' => 'typo3temp/var/log/bpn-api.log', 'logFile' => \TYPO3\CMS\Core\Core\Environment::getVarPath() . '/log/bpn-api.log',
], ],
], ],
]; ];
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$_EXTKEY] = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['ep_theme'] =
\EP\EpTheme\Hook\Tcemain::class; \EP\EpTheme\Hook\Tcemain::class;
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem'][$_EXTKEY] = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php']['tt_content_drawItem']['ep_theme'] =
\EP\EpTheme\Hook\PageLayoutView::class; \EP\EpTheme\Hook\PageLayoutView::class;
$GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = 'tx_eptheme_slides'; $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = 'tx_eptheme_slides';