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

Merge branch 'feature/typo3-10' into develop

Browse Source
This commit is contained in:
Björn Fromme
2021-09-08 07:47:03 +02:00
parent 68a0d4e8eb 47f85c2c33
commit 2240583bdd
118 changed files with 10717 additions and 7137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_events/Classes/Controller/ActivityController.php
-1
View File
@@ -50,7 +50,6 @@ class ActivityController extends ActionController
*/
public function __construct(ActivityRepository $activityRepository, OfferRepository $offerRepository)
{
parent::__construct();
$this->activityRepository = $activityRepository;
$this->offerRepository = $offerRepository;
}
public/typo3conf/ext/ep_events/Classes/Controller/AjaxFormController.php
-2
View File
@@ -48,8 +48,6 @@ class AjaxFormController extends ActionController
public function __construct(EmailService $emailService, ConfigurationService $configurationService)
{
parent::__construct();
$this->emailService = $emailService;
$this->configurationService = $configurationService;
}
public/typo3conf/ext/ep_events/Classes/Controller/AjaxOfferController.php
-2
View File
@@ -40,8 +40,6 @@ class AjaxOfferController extends ActionController
FileRepository $fileRepository,
ImageService $imageService
) {
parent::__construct();
$this->offerRepository = $offerRepository;
$this->fileRepository = $fileRepository;
$this->imageService = $imageService;
public/typo3conf/ext/ep_events/Classes/Controller/FormController.php
-2
View File
@@ -44,8 +44,6 @@ class FormController extends ActionController
*/
public function __construct(ConfigurationService $configurationService)
{
parent::__construct();
$this->configurationService = $configurationService;
}
public/typo3conf/ext/ep_events/Classes/Controller/OfferController.php
-1
View File
@@ -45,7 +45,6 @@ class OfferController extends ActionController
*/
public function __construct(OfferRepository $offerRepository)
{
parent::__construct();
$this->offerRepository = $offerRepository;
}
public/typo3conf/ext/ep_events/Classes/Controller/SearchController.php
-1
View File
@@ -45,7 +45,6 @@ class SearchController extends ActionController
*/
public function __construct(OfferRepository $offerRepository)
{
parent::__construct();
$this->offerRepository = $offerRepository;
}
public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php
+3 -4
View File
@@ -24,7 +24,7 @@ call_user_func(function() {
],
],
'types' => [
(string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
(string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT],
]
]
);
@@ -48,9 +48,9 @@ call_user_func(function() {
],
],
'types' => [
(string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
(string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT],
],
]
],
);
$temporaryColumns = [
@@ -119,7 +119,6 @@ call_user_func(function() {
$GLOBALS['TCA']['pages']['columns']['media']['config']['behaviour'] = [
'allowLanguageSynchronization' => true,
'localizeChildrenAtParentLocalization' => true,
];
$GLOBALS['TCA']['pages']['columns']['media']['config']['overrideChildTca']['columns']['crop']['config']['cropVariants'] = [
public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages_language_overlay.php
-119
View File
@@ -1,119 +0,0 @@
<?php
defined('TYPO3_MODE') or die ();
call_user_func(function() {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
'pages_language_overlay',
'doktype',
[
'Kategorie-Seite',
\EP\EpEvents\Constants::PAGETYPE_CATEGORY,
'apps-pagetree-category-page',
],
'1',
'after'
);
\TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
$GLOBALS['TCA']['pages_language_overlay'],
[
'ctrl' => [
'typeicon_classes' => [
\EP\EpEvents\Constants::PAGETYPE_CATEGORY => 'apps-pagetree-category-page',
],
],
'types' => [
(string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
]
]
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
'pages_language_overlay',
'doktype',
[
'Beispiel-Seite',
\EP\EpEvents\Constants::PAGETYPE_OFFER,
'apps-pagetree-example-page',
],
'1',
'after'
);
\TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
$GLOBALS['TCA']['pages_language_overlay'],
[
'ctrl' => [
'typeicon_classes' => [
\EP\EpEvents\Constants::PAGETYPE_OFFER => 'apps-pagetree-example-page',
],
],
'types' => [
(string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
],
]
);
$temporaryColumns = [
'tx_epevents_traveltype' => [
'exclude' => 0,
'label' => 'Reiseart',
'config' => [
'type' => 'select',
'renderType' => 'selectSingle',
'items' => [
['Keine Zuordnung', 0],
],
'foreign_table' => 'tx_epevents_domain_model_traveltype',
'foreign_table_where' => 'AND tx_epevents_domain_model_traveltype.sys_language_uid IN (0, -1)',
'minitems' => 0,
'maxitems' => 1,
]
],
'tx_epevents_offer' => [
'exclude' => 0,
'label' => 'Angebot/Beispielangebot',
'config' => [
'type' => 'select',
'renderType' => 'selectSingle',
'items' => [
['Keine Zuordnung', 0],
],
'foreign_table' => 'tx_epevents_domain_model_offer',
'foreign_table_where' => 'AND tx_epevents_domain_model_offer.type = 1 AND tx_epevents_domain_model_offer.sys_language_uid IN (0, -1) ORDER BY tx_epevents_domain_model_offer.name_internal',
'minitems' => 0,
'maxitems' => 1,
]
],
];
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
'pages_language_overlay',
$temporaryColumns
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
'pages_language_overlay',
'--div--;Konfigurator,
tx_epevents_traveltype',
(string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
'pages_language_overlay',
'--div--;Konfigurator,
tx_epevents_offer',
(string) \EP\EpEvents\Constants::PAGETYPE_OFFER
);
$GLOBALS['TCA']['pages_language_overlay']['columns']['media']['config']['overrideChildTca']['columns']['crop']['config']['cropVariants'] = [
'default' => [
'title' => 'Alle Geräte',
'allowedAspectRatios' => [
'header' => [
'title' => 'Header Startseite',
'value' => 1440 / 700,
],
],
],
];
});
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_activity.php
-6
View File
@@ -20,11 +20,6 @@ return [
],
'searchFields' => 'name,name_internal,description,image_teaser,image_header,image_offer,configurator_type',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_activity.gif'
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, name_internal,
keywords, description, bannertext, footertext, image_teaser, image_header, image_offer, configurator_type,
path_segment',
],
'types' => [
'1' => [
@@ -55,7 +50,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php
-4
View File
@@ -21,9 +21,6 @@ return [
],
'searchFields' => 'name,email,phone,image,',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_contact.gif'
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, position, email, phone, image',
],
'types' => [
'1' => [
@@ -50,7 +47,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php
-5
View File
@@ -20,10 +20,6 @@ return [
],
'searchFields' => 'name,name_internal,description,image_teaser,image_offer,configurator_type,',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_hotel.gif'
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, name_internal,
description, image_teaser, image_offer, configurator_type',
],
'types' => [
'1' => [
@@ -52,7 +48,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php
-6
View File
@@ -22,11 +22,6 @@ return [
configurator_type,configurator_distance,footer_text1,footer_text2,footer_text3,',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_location.gif'
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description_short,
description_long, season, image_header, image_teaser, image_offer, configurator_type, configurator_distance,
footer_text1, footer_text2, footer_text3',
],
'types' => [
'1' => [
'showitem' => 'hidden, --palette--;;configurator,
@@ -54,7 +49,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php
-8
View File
@@ -22,13 +22,6 @@ return [
booking_form,configurator_type,contact,hotel,location,activities,',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_offer.gif',
'type' => 'type',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, type, name, name_internal,
groupname, price, headline, header, arrival, schedule, services, guidelines, image_teaser,
image_teaser_mobile, image_header, booking_form, configurator_type, configurator_budget,
configurator_pax, configurator_period, contact, hotel, location, activities, detail_page, url,
url_rendered',
],
'types' => [
'1' => [
@@ -68,7 +61,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php
-5
View File
@@ -20,10 +20,6 @@ return [
],
'searchFields' => 'client_name,client_image,quote,',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_testimonial.gif'
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, client_name, client_image,
quote',
],
'types' => [
'1' => [
@@ -50,7 +46,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php
-5
View File
@@ -20,10 +20,6 @@ return [
],
'searchFields' => 'title,subtitle,headertext,subheadline,description',
'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_traveltype.gif',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, type, title, subtitle,
headertext, subheadline, bannertext, description, buttonlabel, configurator_type, image_header, image_banner',
],
'types' => [
'1' => [
@@ -53,7 +49,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 1,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/ActivityEpEvents.tsconfig
+21
View File
@@ -0,0 +1,21 @@
mod.web_layout.BackendLayouts {
activityEpEvents {
title = EP Events: Programmpunkt
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
}
}
}
}
}
public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/CategoryEpEvents.tsconfig
+29
View File
@@ -0,0 +1,29 @@
mod.web_layout.BackendLayouts {
categoryEpEvents {
title = EP Events: Kategorie
config {
backend_layout {
colCount = 1
rowCount = 2
rows {
1 {
columns {
1 {
name = Content (Slider etc.)
colPos = 0
}
}
}
2 {
columns {
1 {
name = Footer Content
colPos = 2
}
}
}
}
}
}
}
}
public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/FrontpageEpEvents.tsconfig
+64
View File
@@ -0,0 +1,64 @@
mod.web_layout.BackendLayouts {
frontpageEpEvents {
title = EP Events: Startseite
config {
backend_layout {
colCount = 2
rowCount = 5
rows {
1 {
columns {
1 {
name = Content
colPos = 3
colspan = 2
}
}
}
2 {
columns {
1 {
name = Kachel
colPos = 10
}
2 {
name = Kachel
colPos = 11
}
}
}
3 {
columns {
1 {
name = Kachel
colPos = 12
}
2 {
name = Kachel
colPos = 13
}
}
}
4 {
columns {
1 {
name = Content
colPos = 0
colspan = 2
}
}
}
5 {
columns {
1 {
name = Footer Content
colPos = 4
colspan = 2
}
}
}
}
}
}
}
}
public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/OfferEpEvents.tsconfig
+21
View File
@@ -0,0 +1,21 @@
mod.web_layout.BackendLayouts {
offerEpEvents {
title = EP Events: Beispielangebot
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content (Slider etc.)
colPos = 2
}
}
}
}
}
}
}
}
public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/SubpageEpEvents.tsconfig
+45
View File
@@ -0,0 +1,45 @@
mod.web_layout.BackendLayouts {
subpageEpEvents {
title = EP Events: Unterseite
config {
backend_layout {
colCount = 1
rowCount = 4
rows {
1 {
columns {
1 {
name = Header
colPos = 1
}
}
}
2 {
columns {
1 {
name = Content
colPos = 0
}
}
}
3 {
columns {
1 {
name = Content volle Breite
colPos = 4
}
}
}
4 {
columns {
1 {
name = Content
colPos = 2
}
}
}
}
}
}
}
}
public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig → public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/Wizards/NewContentElement.tsconfig
-1
View File
@@ -32,4 +32,3 @@ mod {
}
}
}
public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript
+1 -1
View File
@@ -1,4 +1,4 @@
@import "EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript"
@import 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript'
lib.contentElement {
layoutRootPaths.20 = EXT:ep_events/Resources/Private/Layouts/FluidStyledContent
public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript
+1 -1
View File
@@ -1 +1 @@
@import "EXT:form/Configuration/TypoScript/setup.typoscript"
@import 'EXT:form/Configuration/TypoScript/setup.typoscript'
public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.typoscript
+1 -1
View File
@@ -1,4 +1,4 @@
@import "EXT:news/Configuration/TypoScript/setup.txt"
@import 'EXT:news/Configuration/TypoScript/setup.txt'
plugin.tx_news {
view {
public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Seo.typoscript
+1 -1
View File
@@ -1 +1 @@
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript"
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'
public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript
+3 -3
View File
@@ -59,6 +59,6 @@ plugin.tx_epevents {
}
}
@import "EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript"
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript"
@import "EXT:news/Configuration/TypoScript/constants.txt"
@import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript'
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript'
@import 'EXT:news/Configuration/TypoScript/constants.txt'
public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript
+4 -17
View File
@@ -1,18 +1,6 @@
@import "EXT:ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Seo.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/SearchForm.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/Configurator.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/ContentElements/banner.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/ContentElements/statement.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/ContentElements/tile.typoscript"
@import 'EXT:ep_events/Configuration/TypoScript/Extensions/*'
@import 'EXT:ep_events/Configuration/TypoScript/Library/*'
@import 'EXT:ep_events/Configuration/TypoScript/ContentElements/*'
plugin.tx_epevents {
features {
@@ -83,8 +71,7 @@ lib.parseFunc_RTE {
tt_content.stdWrap.innerWrap >
lib.stdheader.3.headerClass >
@import "EXT:ep_events/Configuration/TypoScript/Page/Main.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript"
@import 'EXT:ep_events/Configuration/TypoScript/Page/*'
config {
removeDefaultCSS = 1