Make disturber elements' background color selectable

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content.php

@@ -115,47 +115,20 @@ call_user_func(function () {
                 'renderType' => 'inputDateTime',
             ]
         ],
-        'button' => [
+        'tx_eptheme_background' => [
             'exclude' => 0,
-            'label' => 'Button Label',
+            'label' => 'Hintergrundfarbe',
-            'config' => [
-                'type' => 'input',
-                'default' => 'Details',
-                'size' => 30,
-                'eval' => 'trim,required'
-            ],
-        ],
-        'tx_eptheme_lineup' => [
-            'exclude' => 0,
-            'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.items',
-            'config' => [
-                'type' => 'inline',
-                'foreign_table' => 'tx_eptheme_domain_model_lineup',
-                'foreign_field' => 'tt_content',
-                'foreign_sortby' => 'sorting',
-                'maxitems' => 99,
-                'appearance' => [
-                    'useSortable' => 1,
-                    'collapseAll' => 1,
-                    'levelLinksPosition' => 'top',
-                    'showSynchronizationLink' => 0,
-                    'showPossibleLocalizationRecords' => 0,
-                    'showAllLocalizationLink' => 0
-                ],
-            ],
-
-        ],
-        'tx_eptheme_contact' => [
-            'exclude' => 0,
-            'label' => 'Mitarbeiter',
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'foreign_table' => 'tx_epproducts_domain_model_teammember',
+                'default' => 0,
-                'foreign_table_where' => 'ORDER BY name',
+                'items' => [
-                'minitems' => 1,
+                    [ 'ohne', 0 ],
-                'maxitems' => 1,
+                    [ 'oben', 1 ],
-            ]
+                    [ 'unten', 2 ],
+                    [ 'oben und unten', 3 ],
+                ],
+            ],
         ],
     ];
 

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_contact.php

@@ -17,6 +17,19 @@ call_user_func(function() {
         'after'
     );
 
+    $GLOBALS['TCA']['tt_content']['columns']['tx_eptheme_contact'] = [
+        'exclude' => 0,
+        'label' => 'Mitarbeiter',
+        'config' => [
+            'type' => 'select',
+            'renderType' => 'selectSingle',
+            'foreign_table' => 'tx_epproducts_domain_model_teammember',
+            'foreign_table_where' => 'ORDER BY name',
+            'minitems' => 1,
+            'maxitems' => 1,
+        ]
+    ];
+
     $GLOBALS['TCA']['tt_content']['types']['contact'] = [
         'showitem' => '
             --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_deal_of_the_week.php

@@ -0,0 +1,39 @@
+<?php
+
+defined('TYPO3_MODE') or die();
+
+call_user_func(function() {
+    $frontendLanguageFilePrefix = 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:';
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
+        'tt_content',
+        'CType',
+        [
+            'Deal der Woche',
+            'deal_of_the_week',
+            'content-image'
+        ],
+        'disturber',
+        'after'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['deal_of_the_week'] = [
+        'showitem' => '
+            --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general, header, header_link, bodytext,
+        --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
+            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel, tx_eptheme_background,
+        --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
+            hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
+        --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
+        ',
+        'columnsOverrides' => [
+            'bodytext' => [
+                'label' => 'Text',
+                'config' => [
+                    'rows' => 2,
+                ]
+            ],
+        ]
+    ];
+
+});

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disrupter.php

@@ -22,6 +22,7 @@ call_user_func(function() {
         'label' => 'Störer',
         'config' => [
             'type' => 'select',
+            'renderType' => 'selectSingle',
             'foreign_table' => 'tx_eptheme_domain_model_disrupter',
             'foreign_field' => 'tt_content',
             'maxitems' => 1,
@@ -35,7 +36,7 @@ call_user_func(function() {
         'showitem' => '
             --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general, tx_eptheme_disrupter,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel,
+            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel, tx_eptheme_background,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
             hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.extended

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php

@@ -17,18 +17,6 @@ call_user_func(function() {
         'after'
     );
 
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'tt_content',
-        'CType',
-        [
-            'Deal der Woche',
-            'deal_of_the_week',
-            'content-image'
-        ],
-        'disturber',
-        'after'
-    );
-
     $GLOBALS['TCA']['tt_content']['types']['disturber'] = [
         'showitem' => '
             --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,
@@ -36,7 +24,7 @@ call_user_func(function() {
         --div--;Bild,
             assets,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel,
+            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel, tx_eptheme_background,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
             hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
         --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
@@ -62,25 +50,6 @@ call_user_func(function() {
         ]
     ];
 
-    $GLOBALS['TCA']['tt_content']['types']['deal_of_the_week'] = [
-        'showitem' => ' 
-            --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general, header, header_link, bodytext,
-        --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance,
-            layout;' . $frontendLanguageFilePrefix . 'layout_formlabel,
-        --div--;' . $frontendLanguageFilePrefix . 'tabs.access,
-            hidden;' . $frontendLanguageFilePrefix . 'field.default.hidden,
-        --div--;' . $frontendLanguageFilePrefix . 'tabs.extended
-        ',
-        'columnsOverrides' => [
-            'bodytext' => [
-                'label' => 'Text',
-                'config' => [
-                    'rows' => 2,
-                ]
-            ],
-        ]
-    ];
-
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
         '*',
         'FILE:EXT:ep_theme/Configuration/FlexForms/flexform_disturber.xml',

public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_lineup.php

@@ -17,6 +17,26 @@ call_user_func(function() {
         'after'
     );
 
+    $GLOBALS['TCA']['tt_content']['columns']['tx_eptheme_lineup'] = [
+        'exclude' => 0,
+        'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.items',
+        'config' => [
+            'type' => 'inline',
+            'foreign_table' => 'tx_eptheme_domain_model_lineup',
+            'foreign_field' => 'tt_content',
+            'foreign_sortby' => 'sorting',
+            'maxitems' => 99,
+            'appearance' => [
+                'useSortable' => 1,
+                'collapseAll' => 1,
+                'levelLinksPosition' => 'top',
+                'showSynchronizationLink' => 0,
+                'showPossibleLocalizationRecords' => 0,
+                'showAllLocalizationLink' => 0
+            ],
+        ],
+    ];
+
     $GLOBALS['TCA']['tt_content']['types']['lineup'] = [
         'showitem' => '
             --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general,

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig

@@ -118,17 +118,6 @@ TCEFORM {
 
 		space_after_class < .space_before_class
 
-#		frame_class {
-#			label = Hintergrund
-#			removeItems := addToList(ruler-before, ruler-after, indent, indent-left, indent-right, none)
-#			altLabels {
-#				default = ohne
-#			}
-#			addItems {
-#				bg-ep-primary-10 = mit
-#			}
-#		}
-#
 		frame_class.disabled = 1
 		table_bgColor.disabled = 1
 		table_border.disabled = 1
@@ -139,7 +128,6 @@ TCEFORM {
 		uploads_type.disabled = 1
 		rowDescription.disabled = 1
 		categories.disabled = 1
-		header_link = 1
 		date.disabled = 1
 		select_key.disabled = 1
 		linkToTop.disabled = 1
@@ -149,6 +137,7 @@ TCEFORM {
 		fe_group.disabled = 1
 		editlock.disabled = 1
 		sys_language_uid.disabled = 1
+		tx_epevents_configurator_travel_type.disabled = 1
 		tx_yoastseo_linking_suggestions.disabled = 1
 	}
 

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html

@@ -6,7 +6,9 @@
     <div class="bg-winter my-2">
         <div class="bg-ep-primary-80">
             <f:if condition="{settings.themeKey} == 'ep'">
-                <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Top1"
+                          arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             </f:if>
             <div class="relative container grid grid-cols-2 gap-8" data-rte-content>
                 <div class="col-span-2 md:col-span-1">
@@ -61,7 +63,9 @@
                 </div>
             </div>
             <f:if condition="{settings.themeKey} == 'ep'">
-                <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block transform translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Bottom1"
+                          arguments="{classes: 'hidden md:block transform translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 2 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             </f:if>
         </div>
     </div>

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html

@@ -4,7 +4,9 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
 <div class="bg-winter my-2">
-    <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+    <f:render partial="Disrupter/Outlines"
+              section="Top1"
+              arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
     <div class="max-w-screen-lg mx-auto" data-rte-content>
         <div>{data.headline}</div>
         <div>{data.text -> f:format.html()}</div>
@@ -13,7 +15,9 @@
             <a href="{f:uri.typolink(parameter: button.container.link)}" class="btn btn-info" title="{button.container.label -> f:format.raw()}">{button.container.label -> f:format.raw()}</a>
         </div>
     </div>
-    <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block transform translate-y-2 text-white'}"/>
+    <f:render partial="Disrupter/Outlines"
+              section="Bottom1"
+              arguments="{classes: 'hidden md:block transform translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 2 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
 </div>
 
 </html>

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html

@@ -4,7 +4,9 @@
 
     <div class="bg-winter my-2">
         <div class="bg-ep-primary-80 sbw:bg-sbw-primary-80 uch:bg-uch-primary-80">
-            <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+            <f:render partial="Disrupter/Outlines"
+                      section="Top1"
+                      arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{background} == 1 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             <div class="max-w-screen-lg mx-auto" data-rte-content>
                 <div class="md:flex md:items-start py-4">
                     <div class="px-16 pb-4 md:px-4 md:pb-0 md:w-1/6">
@@ -36,7 +38,9 @@
                     </div>
                 </div>
             </div>
-            <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block transform translate-y-2 text-white'}"/>
+            <f:render partial="Disrupter/Outlines"
+                      section="Bottom1"
+                      arguments="{classes: 'hidden md:block transform translate-y-2 {f:if(condition: \'{background} == 2 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
         </div>
     </div>
 

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html

@@ -7,7 +7,9 @@
     <div class="bg-winter my-2">
         <div class="bg-ep-primary-80">
             <f:if condition="{settings.themeKey} == 'ep'">
-                <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Top1"
+                          arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{background} == 1 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             </f:if>
             <div class="relative container grid grid-cols-2 gap-8 py-8" data-rte-content>
                 <div class="col-span-2 md:col-span-1">
@@ -62,7 +64,9 @@
                 </div>
             </div>
             <f:if condition="{settings.themeKey} == 'ep'">
-                <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block sbw:md:hidden transform translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Bottom1"
+                          arguments="{classes: 'hidden md:block sbw:md:hidden transform translate-y-2 {f:if(condition: \'{background} == 2 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             </f:if>
         </div>
     </div>

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html

@@ -4,7 +4,9 @@
 
 <div class="bg-winter my-2">
     <div class="bg-ep-primary-80 sbw:bg-sbw-primary-80 uch:bg-uch-primary-80">
-        <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+        <f:render partial="Disrupter/Outlines"
+                  section="Top1"
+                  arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
         <div class="max-w-screen-lg mx-auto" data-rte-content>
             <div class="md:flex md:items-start py-4">
                 <div class="px-16 pb-4 md:px-4 md:pb-0 md:w-1/6">
@@ -36,7 +38,9 @@
                 </div>
             </div>
         </div>
-        <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block transform translate-y-2 text-white'}"/>
+        <f:render partial="Disrupter/Outlines"
+                  section="Bottom1"
+                  arguments="{classes: 'hidden md:block transform translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 2 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
     </div>
 </div>
 

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html

@@ -9,7 +9,7 @@
     <f:section name="Main">
         <f:render partial="SubpageHeader" arguments="{images: concept.headerImages, topline: concept.headerSubtitle, headline: concept.headerTitle, settings: settings}"/>
         <f:cObject typoscriptObjectPath="lib.breadcrumb"/>
-        <div class="bg-ep-primary-10 my-8 py-8">
+        <div class="bg-ep-primary-bg py-8">
             <div class="container">
                 <f:if condition="{teasers}">
                     <div class="mb-8 lg:hidden">

public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html

@@ -7,7 +7,9 @@
     <f:section name="Main">
         <div class="bg-winter my-2">
             <div class="bg-ep-primary-80">
-                <f:render partial="Disrupter/Outlines" section="Top1" arguments="{classes: 'hidden md:block transform -translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Top1"
+                          arguments="{classes: 'hidden md:block transform -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
                 <div class="container grid grid-cols-3 gap-8 py-8">
                     <div class="col-span-3 md:col-span-1 left-content">
                         <span class="headline--primary text-white">
@@ -35,7 +37,9 @@
                         </div>
                     </div>
                 </div>
-                <f:render partial="Disrupter/Outlines" section="Bottom1" arguments="{classes: 'hidden md:block transform translate-y-2 text-white'}"/>
+                <f:render partial="Disrupter/Outlines"
+                          section="Bottom1"
+                          arguments="{classes: 'hidden md:block transform translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 2 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
             </div>
         </div>
     </f:section>

public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Disrupter.html

@@ -1,12 +1,11 @@
 <html data-namespace-typo3-fluid="true" lang="en"
       xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:alias map="{data: disrupter.0.data, image: disrupter.0.image.0}">
+        <f:alias map="{data: disrupter.0.data, image: disrupter.0.image.0, background: data.tx_eptheme_background}">
             <f:switch expression="{data.layout}">
                 <f:case value="0">
                     <f:render partial="Disrupter/Small" arguments="{_all}"/>

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/HotelList.html

@@ -6,7 +6,7 @@
 
     <f:section name="Main">
         <f:render partial="Product/HeaderDetail" arguments="{_all}"/>
-        <div class="py-8 bg-ep-primary-10">
+        <div class="py-8 bg-ep-primary-bg">
             <div class="container">
                 <f:render partial="Header/Header" arguments="{layout: 8, subheader: product.name, header: product.headline}"/>
             </div>

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html

@@ -5,7 +5,7 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <div class="py-8 bg-ep-primary-10">
+        <div class="py-8 bg-ep-primary-bg">
             <f:if condition="{data.header}">
                 <div class="container mb-8">
                     <f:render partial="Header/Header" arguments="{header: data.header, subheader: data.subheader, layout: data.header_layout, link: data.header_link, default: settings.defaultHeaderType}" />

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchresult.html

@@ -3,7 +3,7 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <div class="py-8 bg-ep-primary-10">
+        <div class="py-8 bg-ep-primary-bg">
             <div class="container"
                  data-controller="search"
                  data-search-uri-value="{ep:uri.ajax(controller: 'AjaxSearch', action: 'searchresult', pageUid: settings.defaultAjaxUid, format: 'html')}"

public/typo3conf/ext/ep_theme/ext_tables.sql

@@ -155,19 +155,6 @@ CREATE TABLE pages
     tx_eptheme_badge                int(11) unsigned    DEFAULT '0'
 );
 
-CREATE TABLE pages_language_overlay
-(
-    tx_eptheme_context_country_code char(2)             DEFAULT '',
-    tx_eptheme_context_country      int(11) unsigned    DEFAULT '0',
-    tx_eptheme_context_region       int(11) unsigned    DEFAULT '0',
-    tx_eptheme_context_concept      int(11) unsigned    DEFAULT '0',
-    tx_eptheme_context_product      int(11) unsigned    DEFAULT '0',
-    tx_eptheme_hide_searchbar       tinyint(4) unsigned DEFAULT '0' NOT NULL,
-    tx_eptheme_bodyclass            varchar(255)        DEFAULT ''  NOT NULL,
-    tx_eptheme_slides               int(11) unsigned    DEFAULT '0',
-    tx_eptheme_badge                int(11) unsigned    DEFAULT '0'
-);
-
 CREATE TABLE tt_content
 (
     tx_eptheme_context_country   int(11) unsigned DEFAULT '0',
@@ -181,7 +168,7 @@ CREATE TABLE tt_content
     tx_eptheme_lineup            int(11) unsigned DEFAULT '0',
     tx_eptheme_contact           int(11) unsigned DEFAULT '0',
     tx_eptheme_disrupter         int(11) unsigned DEFAULT '0',
-    button                       varchar(255)     DEFAULT ''  NOT NULL
+    tx_eptheme_background        tinyint(4) unsigned DEFAULT '0' NOT NULL
 );
 
 CREATE TABLE tx_eptheme_ttcontent_tx_eptheme_disrupter_mm

tailwind.config.js

@@ -67,6 +67,7 @@ module.exports = {
                 ep: {
                     primary: '#3d8ccb',
                     secondary: '#f9c700',
+                    'primary-bg': '#ebf3fa',
                     'primary-light': '#009fff',
                     'primary-medium': '#165883',
                     'primary-dark': '#18527B',