Merge branch 'feature/typo3-10' into develop

This commit is contained in:
Björn Fromme
2021-09-08 07:47:03 +02:00
118 changed files with 10717 additions and 7137 deletions
@@ -51,8 +51,6 @@ class AjaxFormController extends ActionController
*/
public function __construct(EmailService $emailService, BookingApiService $bookingApiService)
{
parent::__construct();
$this->emailService = $emailService;
$this->bookingApiService = $bookingApiService;
}
@@ -64,8 +64,6 @@ class BackendController extends ActionController
*/
public function __construct(PageRepository $pageRepository)
{
parent::__construct();
$this->pageRepository = $pageRepository;
}
@@ -36,38 +36,6 @@ class Page extends AbstractEntity
*/
protected $description;
/**
* @return int
*/
public function getUid()
{
return $this->uid;
}
/**
* @param int $uid
*/
public function setUid($uid)
{
$this->uid = $uid;
}
/**
* @return int
*/
public function getPid()
{
return $this->pid;
}
/**
* @param int $pid
*/
public function setPid($pid)
{
$this->pid = $pid;
}
/**
* @return bool
*/
@@ -131,4 +99,4 @@ class Page extends AbstractEntity
{
$this->description = $description;
}
}
}
@@ -29,9 +29,9 @@ class PageRepository extends Repository
;
$query->matching($query->logicalAnd([
$query->equals('pid', $pid),
$query->equals('doktype', \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT)
$query->equals('doktype', \TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT)
]));
return $query->execute();
}
}
}
@@ -0,0 +1,9 @@
<?php
declare(strict_types = 1);
return [
\EP\EpTheme\Domain\Model\Page::class => [
'tableName' => 'pages',
],
];
@@ -20,9 +20,6 @@ return [
'searchFields' => 'name, first_name, last_name, email',
'dividers2tabs' => 1,
],
'interface' => [
'showRecordFieldList' => 'first_name,last_name,address,city,zip,country,email,title'
],
'columns' => [
'pid' => [
'label' => 'pid',
@@ -21,10 +21,6 @@ return [
'searchFields' => 'headline,text',
'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, layout, headline, text,
image, pi_flexform',
],
'types' => [
'1' => [
'showitem' => 'sys_language_uid, hidden, layout, headline, text, image, pi_flexform',
@@ -50,7 +46,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 0,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
@@ -22,10 +22,6 @@ return [
'searchFields' => 'headline,subline',
'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description, image,
facebook_url, twitter_url, youtube_url, instagram_url, soundcloud_url',
],
'types' => [
'1' => [
'showitem' => 'hidden, name, description, image, --palette--;;social',
@@ -52,7 +48,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 0,
'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
@@ -22,10 +22,6 @@ return [
'searchFields' => 'headline,subline',
'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
],
'interface' => [
'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, headline, subline, skipass,
button, page_uid, image',
],
'types' => [
'1' => [
'showitem' => '--palette--;;top, --palette--;;headlines, --palette--;;linkbutton, image',
@@ -54,7 +50,6 @@ return [
],
'l10n_parent' => [
'displayCond' => 'FIELD:sys_language_uid:>:0',
'exclude' => 0,
'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
'config' => [
'type' => 'select',
@@ -1,152 +1 @@
mod {
web_layout.BackendLayouts {
frontpage {
title = Startseite
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
}
}
}
}
frontpageEvent < .frontpage
frontpageEvent.title = Startseite Events
popup < .frontpage
popup.title = Popup
detail {
title = Detailseite
config {
backend_layout {
colCount = 1
rowCount = 2
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
2 {
columns {
1 {
name = Teaserbereich
colPos = 1
}
}
}
}
}
}
}
subpage < .detail
subpage.title = Unterseite
search < .detail
search.title = Suchergebnis
subpageSidebarLeft {
title = Unterseite mit Sidebar (links)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Sidebar
colPos = 2
colspan = 1
}
}
columns {
2 {
name = Content
colPos = 4
colspan = 3
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
subpageSidebarRight {
title = Unterseite mit Sidebar (rechts)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Content
colPos = 4
colspan = 3
}
}
columns {
2 {
name = Sidebar
colPos = 2
colspan = 1
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
subpageSidebarRightEvent < .subpageSidebarRight
subpageSidebarRightEvent.title = Unterseite Events mit Sidebar (rechts)
subpageSidebarLeftEvent < .subpageSidebarLeft
subpageSidebarLeftEvent.title = Unterseite Events mit Sidebar (links)
}
}
@@ -0,0 +1,29 @@
mod.web_layout.BackendLayouts {
detail {
title = Detailseite
config {
backend_layout {
colCount = 1
rowCount = 2
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
2 {
columns {
1 {
name = Teaserbereich
colPos = 1
}
}
}
}
}
}
}
}
@@ -0,0 +1,21 @@
mod.web_layout.BackendLayouts {
frontpage {
title = Startseite
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
}
}
}
}
}
@@ -0,0 +1,22 @@
mod.web_layout.BackendLayouts {
frontpageEvent {
title = Startseite Events
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
}
}
}
}
}
@@ -0,0 +1,21 @@
mod.web_layout.BackendLayouts {
popup {
title = Popup
config {
backend_layout {
colCount = 1
rowCount = 1
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
}
}
}
}
}
@@ -0,0 +1,29 @@
mod.web_layout.BackendLayouts {
search {
title = Suchergebnis
config {
backend_layout {
colCount = 1
rowCount = 2
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
2 {
columns {
1 {
name = Teaserbereich
colPos = 1
}
}
}
}
}
}
}
}
@@ -0,0 +1,29 @@
mod.web_layout.BackendLayouts {
subpage {
title = Unterseite
config {
backend_layout {
colCount = 1
rowCount = 2
rows {
1 {
columns {
1 {
name = Content
colPos = 0
}
}
}
2 {
columns {
1 {
name = Teaserbereich
colPos = 1
}
}
}
}
}
}
}
}
@@ -0,0 +1,47 @@
mod.web_layout.BackendLayouts {
subpageSidebarLeft {
title = Unterseite mit Sidebar (links)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Sidebar
colPos = 2
colspan = 1
}
}
columns {
2 {
name = Content
colPos = 4
colspan = 3
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
}
@@ -0,0 +1,47 @@
mod.web_layout.BackendLayouts {
subpageSidebarLeftEvent {
title = Unterseite Events mit Sidebar (links)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Sidebar
colPos = 2
colspan = 1
}
}
columns {
2 {
name = Content
colPos = 4
colspan = 3
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
}
@@ -0,0 +1,47 @@
mod.web_layout.BackendLayouts {
subpageSidebarRight {
title = Unterseite mit Sidebar (rechts)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Content
colPos = 4
colspan = 3
}
}
columns {
2 {
name = Sidebar
colPos = 2
colspan = 1
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
}
@@ -0,0 +1,47 @@
mod.web_layout.BackendLayouts {
subpageSidebarRightEvent {
title = Unterseite Events mit Sidebar (rechts)
config {
backend_layout {
colCount = 4
rowCount = 3
rows {
1 {
columns {
1 {
name = Headline
colPos = 3
colspan = 4
}
}
}
2 {
columns {
1 {
name = Content
colPos = 4
colspan = 3
}
}
columns {
2 {
name = Sidebar
colPos = 2
colspan = 1
}
}
}
3 {
columns {
1 {
name = Teaserbereich
colPos = 1
colspan = 4
}
}
}
}
}
}
}
}
@@ -1,4 +1,4 @@
@import "EXT:ep_products/Configuration/TypoScript/setup.typoscript"
@import 'EXT:ep_products/Configuration/TypoScript/setup.typoscript'
plugin.tx_epproducts {
view {
@@ -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_theme/Resources/Private/Layouts/FluidStyledContent
@@ -1,4 +1,4 @@
@import "EXT:gridelements/Configuration/TypoScript/setup.typoscript"
@import 'EXT:gridelements/Configuration/TypoScript/setup.typoscript'
tt_content.gridelements_pi1.20.10.setup {
quarters < lib.gridelements.defaultGridSetup
@@ -1,4 +1,4 @@
@import "EXT:news/Configuration/TypoScript/setup.txt"
@import 'EXT:news/Configuration/TypoScript/setup.txt'
plugin.tx_news {
view {
@@ -1,29 +0,0 @@
@import "EXT:pxa_social_feed/Configuration/TypoScript/setup.txt"
plugin.tx_pxasocialfeed {
view {
layoutRootPaths.100 = EXT:ep_theme/Resources/Private/Layouts/SocialMedia/
templateRootPaths.100 = EXT:ep_theme/Resources/Private/Templates/SocialMedia/
partialRootPaths.100 = EXT:ep_theme/Resources/Private/Partials/SocialMedia/
}
settings.defaultAjaxUid = {$plugin.tx_eptheme.settings.defaultAjaxUid}
}
page.includeCSS {
pxa_social_feed_1 >
}
page.includeJSFooter {
pxa_social_feed_1 >
pxa_social_feed_2 >
pxa_social_feed_3 >
pxa_social_feed_4 >
pxa_social_feed_5 >
}
page.includeJSFooterlibs {
pxa_social_feed_1 >
pxa_social_feed_2 >
pxa_social_feed_3 >
pxa_social_feed_4 >
}
@@ -1,4 +1,4 @@
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript"
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'
["{$plugin.tx_eptheme.settings.bookingLinksPid}" > "0"]
plugin.tx_seo {
@@ -179,9 +179,8 @@ plugin.tx_eptheme {
}
}
@import "EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript"
@import "EXT:ep_products/Configuration/TypoScript/constants.typoscript"
@import "EXT:gridelements/Configuration/TypoScript/constants.typoscript"
@import "EXT:pxa_social_feed/Configuration/TypoScript/constants.txt"
@import "EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript"
@import "EXT:typo3_encore/Configuration/TypoScript/constants.typoscript"
@import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript'
@import 'EXT:ep_products/Configuration/TypoScript/constants.typoscript'
@import 'EXT:gridelements/Configuration/TypoScript/constants.typoscript'
@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript'
@import 'EXT:typo3_encore/Configuration/TypoScript/constants.typoscript'
@@ -1,30 +1,6 @@
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/GridElements.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Seo.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Library/SearchBar.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Library/SearchBox.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Library/Sitemap.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Library/DynamicContent.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Library/ParseFunc.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/calendar.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/contact.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/disrupter.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/gmap.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/lineup.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/list.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/nlform.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/teaser.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/ytvideo.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/ContentElements/button.typoscript"
@import 'EXT:ep_theme/Configuration/TypoScript/Extensions/*'
@import 'EXT:ep_theme/Configuration/TypoScript/Library/*'
@import 'EXT:ep_theme/Configuration/TypoScript/ContentElements/*'
plugin.tx_eptheme {
settings < lib.contentElement.settings
@@ -114,9 +90,7 @@ plugin.tx_eptheme {
tt_content.stdWrap.innerWrap >
lib.stdheader.3.headerClass >
@import "EXT:ep_theme/Configuration/TypoScript/Page/Main.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Page/Ajax.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Page/Export.typoscript"
@import 'EXT:ep_theme/Configuration/TypoScript/Page/*'
config {
compressJs = 1
@@ -0,0 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
<f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
<f:form.textfield
type="email"
property="{element.identifier}"
id="{element.uniqueIdentifier}"
class="form-input mt-1 block w-full"
errorClass="form-input-error"
additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
/>
</f:render>
</formvh:renderRenderable>
</html>
@@ -0,0 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
<f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
<f:form.textfield
type="number"
property="{element.identifier}"
id="{element.uniqueIdentifier}"
class="form-input mt-1 block w-full"
errorClass="form-input-error"
additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
/>
</f:render>
</formvh:renderRenderable>
</html>
@@ -0,0 +1,14 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
<formvh:renderRenderable renderable="{element}">
<f:render partial="Field/Field" arguments="{element: element}" contentAs="elementContent">
<f:form.textfield
type="tel"
property="{element.identifier}"
id="{element.uniqueIdentifier}"
class="form-input mt-1 block w-full"
errorClass="form-input-error"
additionalAttributes="{formvh:translateElementProperty(element: element, property: 'fluidAdditionalAttributes')}"
/>
</f:render>
</formvh:renderRenderable>
</html>
@@ -29,7 +29,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'SimpleForm',
[
'Form' => 'simpleForm',
@@ -40,7 +40,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'FullForm',
[
'Form' => 'fullForm',
@@ -51,7 +51,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'FullForm',
[
'Form' => 'fullForm',
@@ -62,7 +62,7 @@ $metaTagManagerRegistry->registerManager(
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'EP.EpTheme',
'EP.ep_theme',
'Ajax',
[
'AjaxForm' => 'processForm',
@@ -1,7 +0,0 @@
config.tx_extbase.persistence.classes {
EP\EpTheme\Domain\Model\Page {
mapping {
tableName = pages
}
}
}