Merge branch 'lts'

composer.json

@@ -9,52 +9,46 @@
   "require": {
     "php": "^7.1",
     "ext-json": "*",
-    "typo3/cms": "^7.6",
+    "typo3/cms": "^8.7",
-    "georgringer/news": "^6.1",
+    "typo3/cms-backend": "^8.7",
-    "dmitryd/typo3-realurl": "^2.3",
+    "typo3/cms-belog": "^8.7",
-    "helhum/typo3-console": "^4.9",
+    "typo3/cms-beuser": "^8.7",
-    "typo3/cms-backend": "^7.6",
+    "typo3/cms-context-help": "^8.7",
-    "typo3/cms-belog": "^7.6",
+    "typo3/cms-core": "^8.7",
-    "typo3/cms-beuser": "^7.6",
+    "typo3/cms-rte-ckeditor": "^8.7",
-    "typo3/cms-context-help": "^7.6",
+    "typo3/cms-extbase": "^8.7",
-    "typo3/cms-core": "^7.6",
+    "typo3/cms-extensionmanager": "^8.7",
-    "typo3/cms-extbase": "^7.6",
+    "typo3/cms-felogin": "^8.7",
-    "typo3/cms-extensionmanager": "^7.6",
+    "typo3/cms-filelist": "^8.7",
-    "typo3/cms-filelist": "^7.6",
+    "typo3/cms-filemetadata": "^8.7",
-    "typo3/cms-filemetadata": "^7.6",
+    "typo3/cms-fluid": "^8.7",
-    "typo3/cms-fluid": "^7.6",
+    "typo3/cms-fluid-styled-content": "^8.7",
-    "typo3/cms-fluid-styled-content": "^7.6",
+    "typo3/cms-form": "^8.7",
-    "typo3/cms-form": "^7.6",
+    "typo3/cms-frontend": "^8.7",
-    "typo3/cms-frontend": "^7.6",
+    "typo3/cms-func": "^8.7",
-    "typo3/cms-func": "^7.6",
+    "typo3/cms-func-wizards": "^8.7",
-    "typo3/cms-func-wizards": "^7.6",
+    "typo3/cms-info": "^8.7",
-    "typo3/cms-info": "^7.6",
+    "typo3/cms-info-pagetsconfig": "^8.7",
-    "typo3/cms-info-pagetsconfig": "^7.6",
+    "typo3/cms-install": "^8.7",
-    "typo3/cms-install": "^7.6",
+    "typo3/cms-lang": "^8.7",
-    "typo3/cms-lang": "^7.6",
+    "typo3/cms-lowlevel": "^8.7",
-    "typo3/cms-lowlevel": "^7.6",
+    "typo3/cms-opendocs": "^8.7",
-    "typo3/cms-opendocs": "^7.6",
+    "typo3/cms-recordlist": "^8.7",
-    "typo3/cms-recordlist": "^7.6",
+    "typo3/cms-recycler": "^8.7",
-    "typo3/cms-recycler": "^7.6",
+    "typo3/cms-reports": "^8.7",
-    "typo3/cms-reports": "^7.6",
+    "typo3/cms-rsaauth": "^8.7",
-    "typo3/cms-rsaauth": "^7.6",
+    "typo3/cms-saltedpasswords": "^8.7",
-    "typo3/cms-rtehtmlarea": "^7.6",
+    "typo3/cms-scheduler": "^8.7",
-    "typo3/cms-saltedpasswords": "^7.6",
+    "typo3/cms-setup": "^8.7",
-    "typo3/cms-scheduler": "^7.6",
+    "typo3/cms-sv": "^8.7",
-    "typo3/cms-setup": "^7.6",
+    "typo3/cms-sys-action": "^8.7",
-    "typo3/cms-sv": "^7.6",
+    "typo3/cms-t3editor": "^8.7",
-    "typo3/cms-sys-action": "^7.6",
+    "typo3/cms-taskcenter": "^8.7",
-    "typo3/cms-t3editor": "^7.6",
+    "typo3/cms-tstemplate": "^8.7",
-    "typo3/cms-t3skin": "^7.6",
+    "typo3/cms-viewpage": "^8.7",
-    "typo3/cms-taskcenter": "^7.6",
+    "typo3/cms-wizard-crpages": "^8.7",
-    "typo3/cms-tstemplate": "^7.6",
+    "typo3/cms-wizard-sortpages": "^8.7",
-    "typo3/cms-viewpage": "^7.6",
-    "typo3/cms-wizard-crpages": "^7.6",
-    "typo3/cms-wizard-sortpages": "^7.6",
-    "fluidtypo3/vhs": "^3.1",
-    "typo3-ter/gridelements": "7.2",
     "typo3-ter/media": "^4.5",
-    "typo3-ter/metaseo": "2.1",
     "typo3-ter/ods-redirects": "^1.3",
     "typo3-ter/pb-social": "^1.3",
     "typo3-ter/sourceopt": "^1.0",
@@ -67,7 +61,14 @@
     "symfony/serializer": "^3.3",
     "league/csv": "^8.2",
     "christophlehmann/imageoptimizer": "^1.1",
-    "smichaelsen/pagepath": "^1.1"
+    "smichaelsen/pagepath": "^1.1",
+    "georgringer/news": "^7.0",
+    "dmitryd/typo3-realurl": "^2.3",
+    "fluidtypo3/vhs": "^4.3",
+    "webdevops/metaseo": "3.0.0",
+    "helhum/typo3-console": "^4.9",
+    "gridelementsteam/gridelements": "^8.2",
+    "friendsoftypo3/form-legacy": "^8.7"
   },
   "scripts": {
     "typo3-cms-scripts": [

web/typo3conf/ext/ep_events/Classes/ViewHelpers/ConfiguratorTypeLabelsViewHelper.php

@@ -28,43 +28,45 @@ namespace EP\EpEvents\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ConfiguratorTypeLabelsViewHelper extends AbstractViewHelper
 {
-    /**
+    use CompileWithRenderStatic;
-     * @var array
-     */
-    protected $settings;
 
-    /**
+    public function initializeArguments()
-     * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
-     */
-    public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
     {
-        $this->settings = $configurationManager->getConfiguration(
+        parent::initializeArguments();
-            ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS,
+
-            'epevents'
+        $this->registerArgument('type', 'string', 'The type', true);
-        );
+        $this->registerArgument('values', 'string', 'The labels', true);
     }
 
     /**
-     * @param string $type
+     * @param array $arguments
-     * @param string $values
+     * @param \Closure $renderChildrenClosure
-     *
+     * @param RenderingContextInterface $renderingContext
-     * @return string
+     * @return mixed
      */
-    public function render($type, $values)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
-        if (empty($values)) {
+        if (empty($arguments['values'])) {
             return 'Keine Angabe';
         }
         $types = [];
-        $indexes = GeneralUtility::trimExplode(',', $values);
+        $indexes = GeneralUtility::trimExplode(',', $arguments['values']);
+        $templateVariableContainer = $renderingContext->getViewHelperVariableContainer();
+        $settings = $templateVariableContainer['settings'];
+        $type = $arguments['type'];
         foreach ($indexes as $index)
         {
-            $types[] = $this->settings['configurator']['options'][$type][$index];
+            $types[] = $settings['configurator']['options'][$type][$index];
         }
         return implode(', ', $types);
     }

web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionCssClassViewHelper.php

@@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2017 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *           Cedric Ziel <[email protected]>, dreipunktnull
  *
  *  All rights reserved
@@ -28,30 +28,51 @@ namespace EP\EpEvents\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class SectionCssClassViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var array
      */
-    protected $cssClasses = [
+    protected static $cssClasses = [
         1 => 'incentives',
         2 => 'teambuilding',
         3 => 'meetings',
         4 => 'events',
     ];
 
-    /**
+    public function initializeArguments()
-     * @param string $sectionValue
-     *
-     * @return string
-     */
-    public function render($sectionValue)
     {
-        if (array_key_exists($sectionValue, $this->cssClasses)) {
+        parent::initializeArguments();
-            return 'section-' . $this->cssClasses[$sectionValue];
+
+        $this->registerArgument('sectionValue', 'string', 'The section value');
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $sectionValue = $renderChildrenClosure();
+        if ($sectionValue === null) {
+            $sectionValue = $arguments['sectionValue'];
+        }
+        if (array_key_exists($sectionValue, static::$cssClasses)) {
+            return 'section-' . static::$cssClasses[$sectionValue];
         }
 
         return 'section-default';
     }
+
 }

web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionIconViewHelper.php

@@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2017 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *           Cedric Ziel <[email protected]>, dreipunktnull
  *
  *  All rights reserved
@@ -28,31 +28,52 @@ namespace EP\EpEvents\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class SectionIconViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var array
      */
-    protected $icons = [
+    protected static $icons = [
         1 => 'icon_incentives',
         2 => 'icon_teambuilding',
         3 => 'icon_meetings',
         4 => 'icon_events',
     ];
 
-    /**
+    public function initializeArguments()
-     * @param string $sectionValue
-     * @param bool $opaque
-     *
-     * @return string
-     */
-    public function render($sectionValue, $opaque = false)
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('sectionValue', 'string', 'The section value');
+        $this->registerArgument('opaque', 'bool', 'Whether to use opaque icon', false, false);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $sectionValue = $renderChildrenClosure();
+        if ($sectionValue === null) {
+            $sectionValue = $arguments['sectionValue'];
+        }
+
         $icon = '';
-        if (array_key_exists($sectionValue, $this->icons)) {
+        if (array_key_exists($sectionValue, static::$icons)) {
-            $icon = $this->icons[$sectionValue];
+            $icon = static::$icons[$sectionValue];
-            if ($opaque) {
+            if ($arguments['opaque']) {
                 $icon .= '_opaque';
             }
             $icon .= '.svg';
@@ -60,4 +81,5 @@ class SectionIconViewHelper extends AbstractViewHelper
 
         return $icon;
     }
+
 }

web/typo3conf/ext/ep_events/Classes/ViewHelpers/SoftHyphenViewHelper.php

@@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2017 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *           Cedric Ziel <[email protected]>, dreipunktnull
  *
  *  All rights reserved
@@ -28,20 +28,43 @@ namespace EP\EpEvents\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class SoftHyphenViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
-     * @param string $string
+     * @var bool
-     *
-     * @return string
      */
-    public function render($string = null)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('string', 'string', 'The string to process');
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $string = $renderChildrenClosure();
         if ($string === null) {
-            $string = $this->renderChildren();
+            $string = $arguments['string'];
         }
 
         return str_replace('--', '&shy;', $string);
     }
+
 }

web/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig

@@ -1,4 +1,4 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/Wizards/NewContentElement.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/RTE.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/RTE.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/TCEFORM.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/PageTS/TCEFORM.tsconfig">

web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.ts

@@ -1,38 +0,0 @@
-RTE {
-    default {
-        contentCSS = EXT:ep_events/Resources/Public/css/rte.min.css
-        showButtons (
-            blockstylelabel, blockstyle, textstylelabel, textstyle, linebreak,
-            formatblock, bar, bold, italic, bar, orderedlist, unorderedlist,
-            indent, bar, link, unlink, removeformat, linebreak,
-            table, toggleborders, tableproperties, rowproperties, rowinsertabove,
-            rowinsertunder, rowdelete, rowsplit, columninsertbefore, columninsertafter,
-            columndelete, columnsplit, cellproperties, cellinsertbefore, cellinsertafter,
-            celldelete, cellsplit, cellmerge, image, insertcharacter, chMode, pastetoggle
-        )
-        keepButtonGroupTogether = 1
-
-        proc {
-            allowedClasses = coloured-list, footnote-list
-            entryHTMLparser_db {
-                tags {
-                    span.fixAttrib.style.unset = 1
-                    span.rmTagIfNoAttrib = 1
-                }
-            }
-        }
-
-        buttons {
-            formatblock.removeItems = h1,h5,h6,section,div,footer,header,nav,aside,blockquote,pre,address,article
-            pastetoggle.setActiveOnRteOpen = 1
-            blockstyle.tags.ul.allowedClasses = coloured-list, footnote-list
-        }
-    }
-
-    classes {
-        button.name = Button
-        buttonfull.name = Button (volle Breite)
-        coloured-list.name = Farbige Bullets
-        footnote-list.name = Fußnote
-    }
-}

web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig

@@ -0,0 +1,16 @@
+RTE {
+    config {
+        tt_content {
+            bodytext {
+                types {
+                    text {
+                        preset = dpn
+                    }
+                    textmedia {
+                        preset = dpn
+                    }
+                }
+            }
+        }
+    }
+}

web/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml

@@ -0,0 +1,37 @@
+imports:
+- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" }
+- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" }
+- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" }
+
+editor:
+  config:
+    contentsCss:
+    - "EXT:ep_events/Resources/Public/css/rte.min.css"
+
+    stylesSet:
+    - { name: "Button", element: "a", attributes: { 'class': 'button' } }
+    - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'buttonfull' } }
+    - { name: "Farbige Bullets", element: "ul", attributes: { 'class': 'coloured-list' } }
+    - { name: "Fußnote", element: "ul", attributes: { 'class': 'footnote-list' } }
+
+    toolbarGroups:
+    - { name: styles, groups: [ format, styles ] }
+    - { name: basicstyles, groups: [ basicstyles ] }
+    - { name: paragraph, groups: [ list] }
+    - "/"
+    - { name: links, groups: [ links ] }
+    - { name: clipboard, groups: [ clipboard, cleanup, undo ] }
+    - { name: editing, groups: [ spellchecker ] }
+    - { name: insert, groups: [ insert ] }
+    - { name: tools, groups: [ table, specialchar ] }
+    - { name: document, groups: [ mode ] }
+
+    format_tags: "p;h1;h2;h3;h4"
+
+    removePlugins:
+    - image
+
+    removeButtons:
+    - Anchor
+    - Underline
+    - Strike

web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php

@@ -104,10 +104,16 @@ call_user_func(function() {
         (string) \EP\EpEvents\Constants::PAGETYPE_OFFER
     );
 
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile(
+    // Add category page type
-        'ep_events',
+    $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_CATEGORY] = [
-        'Configuration/TypoScript/pageTSconfig.ts',
+        'type' => 'web',
-        'EP Events'
+        'allowedTables' => '*',
-    );
+    ];
+
+    // Add offer page type
+    $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_OFFER] = [
+        'type' => 'web',
+        'allowedTables' => '*',
+    ];
 
 });

web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/sys_template.php

@@ -0,0 +1,13 @@
+<?php
+
+defined('TYPO3_MODE') or die();
+
+call_user_func(function () {
+
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
+        'ep_events',
+        'Configuration/TypoScript',
+        'EP Events'
+    );
+
+});

web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/tt_content.php

@@ -53,6 +53,54 @@ call_user_func(function() {
         ],
     ];
 
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'OfferTeasers',
+        'EP Events: Reisebeispiele Slider'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'Testimonials',
+        'EP Events: Testimonials Slider'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'Contacts',
+        'EP Events: Team'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'ActivityTeasers',
+        'EP Events: Programmpunkte Slider'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'ActivityDetail',
+        'EP Events: Programmpunkt Detail'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'ContactForm',
+        'EP Events: Kontaktformular'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'Configurator',
+        'EP Events: Anfragurator'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpEvents',
+        'SearchResult',
+        'EP Events: Suchergebnis'
+    );
+
     $pluginSignature = 'epevents_offerteasers';
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_activity.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -32,14 +31,6 @@ return [
 		        --palette--;;naming, keywords, bannertext,
 		        --div--;Texte,  description, footertext,
 		        --div--;Bilder, image_teaser, image_header, image_offer',
-            'columnsOverrides' => [
-                'description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'footertext' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -97,34 +88,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'name' => [
@@ -163,6 +158,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'footertext' => [
@@ -173,6 +169,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'bannertext' => [
@@ -194,16 +191,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -220,16 +214,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -246,16 +237,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php

@@ -8,9 +8,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -85,34 +84,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'sorting' => [
@@ -165,16 +168,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -30,11 +29,6 @@ return [
 		'1' => [
 		    'showitem' => '--palette--;;general, --palette--;;naming, description, 
 		        --div--;Bilder, image_teaser, image_offer',
-            'columnsOverrides' => [
-                'description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -92,34 +86,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'name' => [
@@ -148,6 +146,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'image_teaser' => [
@@ -159,16 +158,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -185,16 +181,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -33,23 +32,6 @@ return [
 		    'showitem' => 'hidden, --palette--;;configurator, 
 		        name, description_short, description_long, season, footer_text1, footer_text2, footer_text3, 
 		        --div--;Bilder, image_header, image_teaser, image_offer',
-            'columnsOverrides' => [
-                'description_short' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'description_long' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'footer_text1' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'footer_text2' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'footer_text3' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -106,34 +88,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'name' => [
@@ -153,6 +139,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'description_long' => [
@@ -163,6 +150,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'season' => [
@@ -173,6 +161,7 @@ return [
                 'cols' => 40,
                 'rows' => 5,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'image_header' => [
@@ -184,16 +173,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -210,16 +196,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -236,16 +219,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -261,6 +241,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'footer_text2' => [
@@ -271,6 +252,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'footer_text3' => [
@@ -281,6 +263,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'configurator_type' => [

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -37,14 +36,6 @@ return [
 		        --palette--;;general, --palette--;;naming, headline, header, services,
 		        --div--;Bilder, image_teaser, image_teaser_mobile, image_header,
 		        --div--;Verknüpfungen, contact, hotel, location, activities',
-            'columnsOverrides' => [
-                'header' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'services' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
 		'2' => [
 		    'showitem' => 'hidden, 
@@ -52,23 +43,6 @@ return [
 		            services, arrival, schedule, guidelines,
 		        --div--;Bilder/Dateien, image_header, booking_form, 
 		        --div--;Verknüpfungen, contact, hotel, location, activities',
-            'columnsOverrides' => [
-                'header' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'arrival' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'schedule' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'services' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'guidelines' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -128,34 +102,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'type' => [
@@ -225,6 +203,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'arrival' => [
@@ -235,6 +214,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'schedule' => [
@@ -245,6 +225,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'services' => [
@@ -255,6 +236,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'guidelines' => [
@@ -265,6 +247,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'image_teaser' => [
@@ -276,16 +259,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1
@@ -302,16 +282,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1
@@ -328,16 +305,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -354,16 +328,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:media.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
+                            \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
                             ],
-						\TYPO3\CMS\Core\Resource\File::FILETYPE_UNKNOWN => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
                         ],
                     ],
 					'maxitems' => 1
@@ -494,21 +465,7 @@ return [
                 'type' => 'input',
                 'size' => 4,
                 'eval' => 'int,required',
-                'wizards' => [
+                'renderType' => 'inputLink',
-                    '_PADDING' => 2,
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'actions-wizard-link',
-                        'module' => [
-                            'name' => 'wizard_link',
-                        ],
-                        'params' => [
-                            'blindLinkOptions' => 'file,folder,mail,spec,url',
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ],
-                ],
                 'softref' => 'typolink'
             ],
         ],

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -29,11 +28,6 @@ return [
 	'types' => [
 		'1' => [
 		    'showitem' => 'hidden, client_name, client_image, quote',
-            'columnsOverrides' => [
-                'quote' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -90,34 +84,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'client_name' => [
@@ -138,16 +136,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -163,6 +158,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
     ],

web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -31,11 +30,6 @@ return [
 		    'showitem' => '--palette--;;general, --palette--;;herounit, subheadline, bannertext, 
 		        buttonlabel, description,
 		        --div--;Bilder,image_header, image_banner',
-            'columnsOverrides' => [
-                'description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
 	'palettes' => [
@@ -93,34 +87,38 @@ return [
         ],
 		'starttime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'endtime' => [
 			'exclude' => 1,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 		'title' => [
@@ -170,6 +168,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
 		'bannertext' => [
@@ -202,16 +201,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1
@@ -228,16 +224,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference'
                     ],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 1

web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.typoscript

@@ -1,4 +1,4 @@
-tt_content.banner =< lib.fluidContent
+tt_content.banner =< lib.contentElement
 tt_content.banner {
     templateName = Banner
     dataProcessing {

web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript

@@ -1,4 +1,4 @@
-tt_content.herounit =< lib.fluidContent
+tt_content.herounit =< lib.contentElement
 tt_content.herounit {
     templateName = Herounit
     dataProcessing {

web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.typoscript

@@ -1,4 +1,4 @@
-tt_content.statement =< lib.fluidContent
+tt_content.statement =< lib.contentElement
 tt_content.statement {
     templateName = Statement
 }

web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.typoscript

@@ -1,4 +1,4 @@
-tt_content.tile =< lib.fluidContent
+tt_content.tile =< lib.contentElement
 tt_content.tile {
     templateName = Tile
     dataProcessing {

web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript

@@ -1,6 +1,6 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Static/setup.txt">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/setup.txt">
 
-lib.fluidContent {
+lib.contentElement {
     layoutRootPaths.20 = EXT:ep_events/Resources/Private/Layouts/FluidStyledContent
     templateRootPaths.20 = EXT:ep_events/Resources/Private/Templates/FluidStyledContent
     partialRootPaths.20 = EXT:ep_events/Resources/Private/Partials

web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.ts

@@ -1 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/setup.txt">

web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript

@@ -0,0 +1 @@
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form_legacy/Configuration/TypoScript/setup.txt">

web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt

@@ -58,5 +58,5 @@ plugin.tx_epevents {
 }
 
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Static/constants.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/constants.txt">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form_legacy/Configuration/TypoScript/constants.txt">
 <INCLUDE_TYPOSCRIPT: source="FILE:EXT:news/Configuration/TypoScript/constants.txt">

web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt

@@ -1,19 +1,22 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/Form.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/Form.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/News.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Extensions/News.typoscript">
 
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/SearchForm.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/SearchForm.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/Configurator.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Library/Configurator.typoscript">
 
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/banner.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/banner.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/herounit.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/statement.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/statement.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/tile.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/ContentElements/tile.typoscript">
 
 plugin.tx_epevents {
-    features.skipDefaultArguments = 1
+    features {
+        requireCHashArgumentForActionArguments = 0
+        skipDefaultArguments = 1
+    }
     view {
         layoutRootPaths.10 = EXT:ep_events/Resources/Private/Layouts/
         templateRootPaths.10 = EXT:ep_events/Resources/Private/Templates/
@@ -68,9 +71,9 @@ lib.parseFunc_RTE {
 tt_content.stdWrap.innerWrap >
 lib.stdheader.3.headerClass >
 
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/Main.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/Main.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/Ajax.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/XMLSitemap.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_events/Configuration/TypoScript/Page/XMLSitemap.typoscript">
 
 config {
     doctype = html5

web/typo3conf/ext/ep_events/Resources/Private/Partials/PageHeader.html

@@ -90,9 +90,8 @@
                         extensionName: 'epevents'
                         pluginName: 'Configurator',
                         arguments: '{travelType: \'{traveltype.configuratorType -> v:or(alternative: 0)}\', locationType: \'{locationtype -> v:or(alternative: 0)}\'}',
-                        additionalParams: '{ref: data.uid}',
+                        additionalParams: '{ref: data.uid}'
-                        noCacheHash: 1
+                    )}" rel="nofollow">&raquo; Anfragen &laquo;</a>
-                    )}">&raquo; Anfragen &laquo;</a>
                 </div>
             </div>
         </div>

web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html

@@ -56,9 +56,8 @@
             :options-budget='{configuratorConfig.budgetOptions -> v:format.json.encode()}'
             :options-period='{configuratorConfig.periodOptions -> v:format.json.encode()}'
             inline-template>
-            <f:form id="configuratorform" object="{inquiry}" name="inquiry" noCacheHash="1"
+            <f:form id="configuratorform" object="{inquiry}" name="inquiry" action="processConfiguratorForm"
-                    action="processConfiguratorForm" controller="AjaxForm" pluginName="Ajax" pageType="1703"
+                    controller="AjaxForm" pluginName="Ajax" pageType="1703" pageUid="{settings.ajaxPageUid}">
-                    pageUid="{settings.ajaxPageUid}">
                     <f:form.hidden property="travelType" additionalAttributes="{v-model: 'formData.type'}"/>
                     <f:form.hidden property="hotelType" additionalAttributes="{v-model: 'formData.accommodation'}"/>
                     <f:form.hidden property="locationType" additionalAttributes="{v-model: 'formData.destination'}"/>

web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html

@@ -10,8 +10,8 @@
             <div class="content__main">
                 <inquiry-form inline-template>
                     <div class="form">
-                        <f:form id="inquiryform" object="{inquiry}" name="inquiry" noCacheHash="1"
+                        <f:form id="inquiryform" object="{inquiry}" name="inquiry" action="processInquiryForm"
-                                action="processInquiryForm" controller="AjaxForm" pluginName="Ajax" pageType="1703"
+                                controller="AjaxForm" pluginName="Ajax" pageType="1703"
                                 pageUid="{settings.ajaxPageUid}">
                             <div class="form__item form__item--radios">
                                 <div class="form__field form__field--radio">

web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html

@@ -11,8 +11,8 @@
                 <div class="box__content">
                     <h3 class="headline headline--primary headline--box"><span>Ihre</span><br>Anfrage zu<br><span>{inquiry.inquiryName -> ep:softHyphen()}</span></h3>
                     <div class="form form--box">
-                        <f:form id="inquiryform" object="{inquiry}" name="inquiry" noCacheHash="1"
+                        <f:form id="inquiryform" object="{inquiry}" name="inquiry" action="processInquiryForm"
-                                action="processInquiryForm" controller="AjaxForm" pluginName="Ajax" pageType="1703"
+                                controller="AjaxForm" pluginName="Ajax" pageType="1703"
                                 pageUid="{settings.ajaxPageUid}">
                             <f:form.hidden property="travelType"/>
                             <f:form.hidden property="inquiryName"/>

web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Form.html

@@ -4,8 +4,8 @@
     <f:layout name="Default"/>
 
     <f:section name="Main">
-        <f:form name="search" method="post" action="result" pluginName="SearchResult" object="{search}"
+        <f:form name="search" method="post" controller="Search" action="result" pluginName="SearchResult"
-                pageUid="{settings.searchPageUid}" noCacheHash="1" class="searchform">
+                object="{search}" pageUid="{settings.searchPageUid}" class="searchform">
             <f:form.hidden property="pageUid"/>
             <f:form.textfield property="query" class="searchform__input"/>
             <f:form.submit value="» Suchen" class="searchform__button"/>

web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html

@@ -15,7 +15,8 @@
                                        configuration="{itemsPerPage: 10, insertAbove: 0, insertBelow: 1, addQueryStringMethod: 'GET,POST'}">
                         <f:for each="{offers}" as="offer">
                             <f:link.page pageUid="{offer.detailPage}" class="searchresult-item {ep:sectionCssClass(sectionValue: offer.configuratorType)}"
-                                         additionalParams="{search: search.query}" title="Beispielangebot {offer.name} {offer.location.name}">
+                                         additionalParams="{search: search.query}" title="Beispielangebot {offer.name} {offer.location.name}"
+                                         rel="nofollow">
                                 <div class="card card--no-form searchresult-item__card">
                                     <div class="card__inner">
                                         <f:if condition="{offer.imageTeaser}">

web/typo3conf/ext/ep_events/Resources/Private/Templates/Testimonial/List.html

@@ -5,9 +5,11 @@
 
     <f:section name="Main">
         <div class="content carousel testimonials">
+            <f:if condition="{content.header}">
                 <div class="content__title">
                     <h2 class="headline--primary">{content.header}<span class="subline">{content.subheader}</span></h2>
                 </div>
+            </f:if>
             <div class="carousel__outer">
                 <div class="carousel__inner testimonial-carousel">
                     <f:for each="{testimonials}" as="testimonial">

web/typo3conf/ext/ep_events/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html

@@ -18,17 +18,17 @@
 			<li class="paginator__previous">
 				<f:if condition="{pagination.previousPage} > 1">
 					<f:then>
-						<f:widget.link class="paginator__item paginator__item--previous" arguments="{currentPage: pagination.previousPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.previous" /></f:widget.link>
+						<f:widget.link class="paginator__item paginator__item--previous" arguments="{currentPage: pagination.previousPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow"><f:translate key="widget.pagination.previous" /></f:widget.link>
 					</f:then>
 					<f:else>
-						<f:widget.link class="paginator__item paginator__item--previous" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.previous" /></f:widget.link>
+						<f:widget.link class="paginator__item paginator__item--previous" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow"><f:translate key="widget.pagination.previous" /></f:widget.link>
 					</f:else>
 				</f:if>
 			</li>
 		</f:if>
 		<f:if condition="{pagination.displayRangeStart} > 1">
 			<li class="first">
-				<f:widget.link class="paginator__item paginator__item" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">1</f:widget.link>
+				<f:widget.link class="paginator__item paginator__item" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow">1</f:widget.link>
 			</li>
 		</f:if>
 		<f:if condition="{pagination.hasLessPages}">
@@ -45,10 +45,10 @@
 					<li>
 						<f:if condition="{page.number} > 1">
 							<f:then>
-								<f:widget.link class="paginator__item" arguments="{currentPage: page.number}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
+								<f:widget.link class="paginator__item" arguments="{currentPage: page.number}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow">{page.number}</f:widget.link>
 							</f:then>
 							<f:else>
-								<f:widget.link class="paginator__item" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{page.number}</f:widget.link>
+								<f:widget.link class="paginator__item" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow">{page.number}</f:widget.link>
 							</f:else>
 						</f:if>
 					</li>
@@ -60,12 +60,12 @@
 		</f:if>
 		<f:if condition="{pagination.displayRangeEnd} < {pagination.numberOfPages}">
 			<li class="paginator__last">
-				<f:widget.link class="paginator__item paginator__item--last" arguments="{currentPage: pagination.numberOfPages}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}">{pagination.numberOfPages}</f:widget.link>
+				<f:widget.link class="paginator__item paginator__item--last" arguments="{currentPage: pagination.numberOfPages}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow">{pagination.numberOfPages}</f:widget.link>
 			</li>
 		</f:if>
 		<f:if condition="{pagination.nextPage}">
 			<li class="paginator__next">
-				<f:widget.link class="paginator__item paginator__item--next" arguments="{currentPage: pagination.nextPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}"><f:translate key="widget.pagination.next" /></f:widget.link>
+				<f:widget.link class="paginator__item paginator__item--next" arguments="{currentPage: pagination.nextPage}" addQueryStringMethod="{configuration.addQueryStringMethod}" section="{configuration.section}" rel="nofollow"><f:translate key="widget.pagination.next" /></f:widget.link>
 			</li>
 		</f:if>
 	</ul>

web/typo3conf/ext/ep_events/ext_localconf.php

@@ -118,6 +118,9 @@ call_user_func(function() {
         ]
     );
 
+    $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_events/Configuration/RTE/Default.yaml';
+    $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['dpn'] = 'EXT:ep_events/Configuration/RTE/Default.yaml';
+
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['EP.EpEvents'] =
         \EP\EpEvents\Hooks\Tcemain::class;
 

web/typo3conf/ext/ep_events/ext_tables.php

@@ -2,25 +2,7 @@
 
 defined('TYPO3_MODE') or die();
 
-call_user_func(function() {
+call_user_func(function () {
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
-        'ep_events',
-        'Configuration/TypoScript',
-        'EP Events'
-    );
-
-    // Add category page type
-    $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_CATEGORY] = [
-        'type' => 'web',
-        'allowedTables' => '*',
-    ];
-
-    // Add offer page type
-    $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_OFFER] = [
-        'type' => 'web',
-        'allowedTables' => '*',
-    ];
 
     // Register icons
     $icons = [
@@ -36,52 +18,4 @@ call_user_func(function() {
         );
     }
 
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'OfferTeasers',
-        'EP Events: Reisebeispiele Slider'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'Testimonials',
-        'EP Events: Testimonials Slider'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'Contacts',
-        'EP Events: Team'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'ActivityTeasers',
-        'EP Events: Programmpunkte Slider'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'ActivityDetail',
-        'EP Events: Programmpunkt Detail'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'ContactForm',
-        'EP Events: Kontaktformular'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'Configurator',
-        'EP Events: Anfragurator'
-    );
-
-    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-        'EP.EpEvents',
-        'SearchResult',
-        'EP Events: Suchergebnis'
-    );
-
 });

web/typo3conf/ext/ep_products/Classes/Utility/DbUtility.php

@@ -43,16 +43,16 @@ class DbUtility
      *
      * @return Connection
      */
-    public static function getDbConnection($configIndex = 'DB')
+    public static function getDbConnection()
     {
         if (static::$connection === null) {
             $config = new Configuration();
             $connectionParams = [
-                'dbname' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['database'],
+                'dbname' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'],
-                'user' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['username'],
+                'user' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['user'],
-                'password' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['password'],
+                'password' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password'],
-                'host' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['host'],
+                'host' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host'],
-                'unix_socket' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['socket'],
+                'unix_socket' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['socket'],
                 'charset' => 'utf8',
                 'driver' => 'mysqli',
             ];

web/typo3conf/ext/ep_products/Configuration/TCA/Overrides/sys_template.php

@@ -0,0 +1,5 @@
+<?php
+
+defined('TYPO3_MODE')|| die('Access denied.');
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript', 'EP Products');

web/typo3conf/ext/ep_products/Configuration/TCA/Overrides/tt_content.php

@@ -0,0 +1,259 @@
+<?php
+
+defined('TYPO3_MODE') or die();
+
+
+call_user_func(function () {
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'searchbar',
+        'Suchschlitz'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'searchresult',
+        'Suchergebnis'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'product_detail',
+        'Produktdetails'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'product_teasergroup',
+        'Produktteaser'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'product_pricetable',
+        'Buchungstabelle'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'country_detail',
+        'Land'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'region_teasergroup',
+        'Gebietsteaser'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'region_detail',
+        'Gebietsdetails'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'city_teasergroup',
+        'Ortsteaser'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'city_detail',
+        'Ortsdetails'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'hotel_teasergroup',
+        'Hotelteaser'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'hotel_teasergroup_nodate',
+        'Hotelteaser (terminunabhängig)'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'hotel_detail',
+        'Hoteldetails'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'hotel_detail_event',
+        'Hoteldetails (Event)'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'concept_teasergroup',
+        'Konzeptteaser'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'concept_detail',
+        'Konzeptdetails'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'snowreport_list',
+        'Schneehöhen'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'teammembers',
+        'Team'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'faq',
+        'FAQ'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'newsletter',
+        'Newsletter'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'maps',
+        'Übersichtskarte Hotels/Produkte'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'pricetable',
+        'Preistabelle'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'reseller',
+        'Vertriebspartner Export'
+    );
+
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+        'EP.EpProducts',
+        'watchlist',
+        'Merkliste'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_product_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_product_detail', 'FILE:EXT:ep_products/Configuration/FlexForms/flexform_product_detail.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_product_teasergroup'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_product_teasergroup',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_product_teaser.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_product_pricetable'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_product_pricetable',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_product_pricetable.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_country_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_country_detail',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_country.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_region_teasergroup'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_region_teasergroup',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_region_teaser.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_region_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_region_detail',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_region_detail.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_city_teasergroup'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_city_teasergroup',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_city_teaser.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_city_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_city_detail',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_city_detail.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_hotel_teasergroup'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_hotel_teasergroup',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_hotel_teaser.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_hotel_teasergroup_nodate'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_hotel_teasergroup_nodate',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_hotel_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_hotel_detail',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_hotel_detail.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_hotel_detail_event'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_hotel_detail_event',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_concept_detail'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_concept_detail',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_concept_detail.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_faq'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_faq',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_faq.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_maps'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_maps',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_maps.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_pricetable'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_pricetable',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_pricetable.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_snowreport_list'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_snowreport_list',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_snowreport.xml'
+    );
+
+    $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['epproducts_teammembers'] = 'pi_flexform';
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue(
+        'epproducts_teammembers',
+        'FILE:EXT:ep_products/Configuration/FlexForms/flexform_teammembers.xml'
+    );
+
+});

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_badge.php

@@ -7,9 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -20,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'headline,subline',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_badge.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, subtitle, link',
@@ -86,34 +85,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -140,22 +143,8 @@ return [
             'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_badge.link',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
 	],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,headline,teaser,description,party,leisure,teaser_images,header_images, images,latitude,longitude,country,region,facts,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_city.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, exclude_from_teasergroups, name, name_internal, headline, teaser, keywords, description, party, leisure, teaser_images, images, latitude, longitude, season, country, region, facts, officetip,header_title,header_subtitle',
@@ -29,20 +27,6 @@ return [
 	'types' => [
 		'1' => [
 			'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, teaser, keywords, description, party, leisure, facts, officetip, --div--;Bilder/Dateien, teaser_images, header_images, images',
-			'columnsOverrides' => [
-				'teaser' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'party' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'leisure' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -104,34 +88,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -140,22 +128,8 @@ return [
             'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_city.detail_page',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
         'exclude_from_teasergroups' => [
@@ -222,6 +196,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'header_title' => [
@@ -250,6 +225,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'party' => [
@@ -260,6 +236,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'leisure' => [
@@ -270,6 +247,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'teaser_images' => [
@@ -281,16 +259,38 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
 					'maxitems' => 10
@@ -307,16 +307,38 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'headerLarge' => [
+                                                    'title' => 'Header groß',
+                                                    'value' => 2.3333333333333334,
+                                                ],
+                                                'headerSmall' => [
+                                                    'title' => 'Header klein',
+                                                    'value' => 3.3333333333333334,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
 					'maxitems' => 10
@@ -333,16 +355,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 10
@@ -416,20 +435,14 @@ return [
 				'autoSizeMax' => 30,
 				'maxitems' => 9999,
 				'multiple' => 0,
-				'wizards' => [
+                'fieldControl' => [
-					'_VERTICAL' => 1,
+                    'addRecord' => [
-					'add' => [
+                        'disabled' => false,
-						'type' => 'script',
+                        'options' => [
-						'title' => 'hinzufügen',
-						'icon' => 'actions-add',
-						'params' => [
                             'table' => 'tx_epproducts_domain_model_fact',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-							'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-						'module' => [
-							'name' => 'wizard_add'
-						]
                     ],
                 ],
 			],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php

@@ -8,10 +8,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -22,7 +20,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,description,detail_page,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_concept.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, bus_pro_id, name, headline, code, 
@@ -33,17 +31,6 @@ return [
 		'1' => [
 			'showitem' => '--palette--;;top, --palette--;;naming, --palette--;;header, teaser, description, description_extended, 
 			    --div--;Bilder/Dateien, teaser_images, header_images',
-			'columnsOverrides' => [
-				'teaser' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description_extended' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -105,34 +92,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
         'sorting' => [
@@ -175,6 +166,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'description_extended' => [
@@ -185,6 +177,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'teaser' => [
@@ -195,6 +188,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'headline' => [
@@ -229,22 +223,8 @@ return [
 			'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_concept.detail_page',
 			'config' => [
 				'type' => 'input',
-				'size' => 4,
+				'size' => 30,
-				'eval' => 'int',
+                'renderType' => 'inputLink',
-				'wizards' => [
-					'link' => [
-						'type' => 'popup',
-						'title' => 'EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-						'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-						'module' => [
-							'name' => 'wizard_link',
-							'urlParameters' => [
-								'mode' => 'wizard'
-							]
-						],
-						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-					]
-				],
 			]
 		],
         'teaser_images' => [
@@ -256,16 +236,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -282,16 +284,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                            'columns' => [
+                                'crop' => [
+                                    'config' => [
+                                        'cropVariants' => [
+                                            'default' => [
+                                                'title' => 'Alle Geräte',
+                                                'allowedAspectRatios' => [
+                                                    'headerLarge' => [
+                                                        'title' => 'Header groß',
+                                                        'value' => 2.3333333333333334,
+                                                    ],
+                                                    'headerSmall' => [
+                                                        'title' => 'Header klein',
+                                                        'value' => 3.3333333333333334,
+                                                    ],
+                                                    'free' => [
+                                                        'title' => 'Frei',
+                                                        'value' => 'NaN',
+                                                    ],
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php

@@ -9,10 +9,8 @@ return [
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
 		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => false,
-		'versioning_followPages' => true,
         'hideTable' => true,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -23,7 +21,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'code',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_contingent.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'date,pax,available,status,hotel,groupsch_id',
@@ -86,34 +84,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -144,7 +146,8 @@ return [
                 'size' => 7,
                 'eval' => 'date,required',
                 'checkbox' => 0,
-                'default' => '0000-00-00'
+                'default' => '0000-00-00',
+                'renderType' => 'inputDateTime',
             ],
         ],
         'hotel' => [

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'code,name,headline,teaser,description,teaser_images,images,latitude,longitude,facts,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_country.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, code, name, 
@@ -35,17 +33,6 @@ return [
 			    --div--;Texte, teaser, description, description_extended,
 			    --div--;Verknüpfungen, facts, snowreport, officetip, 
 			    --div--;Bilder/Dateien, teaser_images, header_images, images',
-			'columnsOverrides' => [
-				'teaser' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description_extended' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -107,34 +94,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -143,22 +134,8 @@ return [
             'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_country.detail_page',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
 		'code' => [
@@ -227,6 +204,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'description' => [
@@ -237,6 +215,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'description_extended' => [
@@ -247,6 +226,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'header_title' => [
@@ -276,16 +256,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -302,16 +304,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'headerLarge' => [
+                                                    'title' => 'Header groß',
+                                                    'value' => 2.3333333333333334,
+                                                ],
+                                                'headerSmall' => [
+                                                    'title' => 'Header klein',
+                                                    'value' => 3.3333333333333334,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -328,16 +352,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 10
@@ -404,20 +425,14 @@ return [
 				'autoSizeMax' => 30,
 				'maxitems' => 9999,
 				'multiple' => 0,
-				'wizards' => [
+                'fieldControl' => [
-					'_VERTICAL' => 1,
+                    'addRecord' => [
-					'add' => [
+                        'disabled' => false,
-						'type' => 'script',
+                        'options' => [
-						'title' => 'hinzufügen',
-						'icon' => 'actions-add',
-						'params' => [
                             'table' => 'tx_epproducts_domain_model_fact',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-							'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-						'module' => [
-							'name' => 'wizard_add'
-						]
                     ],
                 ],
 			],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php

@@ -7,11 +7,9 @@ return [
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => TRUE,
+        'dividers2tabs' => true,
-        'versioningWS' => 2,
+        'versioningWS' => false,
-        'versioning_followPages' => TRUE,
+        'hideTable' => true,
-        'hideTable' => TRUE,
-
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -22,7 +20,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'bus_pro_id,code,date_start,date_end,',
-        'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_date.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
     'interface' => [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, bus_pro_id, hotel_bus_pro_id, 
@@ -92,34 +90,38 @@ return [
         ],
         'starttime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'endtime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 
@@ -157,7 +159,8 @@ return [
                 'size' => 7,
                 'eval' => 'date',
                 'checkbox' => 0,
-                'default' => '0000-00-00'
+                'default' => '0000-00-00',
+                'renderType' => 'inputDateTime',
             ],
         ],
         'date_end' => [
@@ -169,7 +172,8 @@ return [
                 'size' => 7,
                 'eval' => 'date',
                 'checkbox' => 0,
-                'default' => '0000-00-00'
+                'default' => '0000-00-00',
+                'renderType' => 'inputDateTime',
             ],
         ],
         'nights' => [

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,tags,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_fact.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, name, keywords',
@@ -86,34 +84,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php

@@ -6,10 +6,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -20,7 +18,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'question,answer,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_faq.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, question, answer',
@@ -28,11 +26,6 @@ return [
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, label, question, answer',
-			'columnsOverrides' => [
-				'answer' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -92,34 +85,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -148,7 +145,8 @@ return [
 				'type' => 'text',
 				'cols' => 40,
 				'rows' => 15,
-				'eval' => 'trim,required'
+				'eval' => 'trim,required',
+                'enableRichtext' => true,
 			]
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php

@@ -8,10 +8,8 @@ return [
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => TRUE,
+        'dividers2tabs' => true,
-        'versioningWS' => 2,
+        'versioningWS' => true,
-        'versioning_followPages' => TRUE,
-
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -23,7 +21,7 @@ return [
         ],
         'searchFields' => 'name,headline,teaser,description,features,room_types,additional_information,teaser_images,
             header_images,images,reseller_images,code,type,category,country,region,city,teamer,products,external_link',
-        'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_hotel.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
     'interface' => [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, detail_page, keywords, 
@@ -38,23 +36,6 @@ return [
                 --div--;Texte, teaser, description, features, room_types, additional_information, 
                 --div--;Verknüpfungen, facts, teamer, additional_codes, 
                 --div--;Bilder/Dateien, teaser_images, header_images, images, reseller_images',
-            'columnsOverrides' => [
-                'teaser' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'features' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'room_types' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'additional_information' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
     'palettes' => [
@@ -118,34 +99,38 @@ return [
         ],
         'starttime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'endtime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 
@@ -175,22 +160,8 @@ return [
             'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_hotel.detail_page',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
         'name' => [
@@ -230,6 +201,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'description' => [
@@ -240,6 +212,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'header_title' => [
@@ -268,6 +241,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'room_types' => [
@@ -278,6 +252,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'additional_information' => [
@@ -288,6 +263,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'teaser_images' => [
@@ -299,16 +275,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -325,16 +323,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'headerLarge' => [
+                                                    'title' => 'Header groß',
+                                                    'value' => 2.3333333333333334,
+                                                ],
+                                                'headerSmall' => [
+                                                    'title' => 'Header klein',
+                                                    'value' => 3.3333333333333334,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -351,16 +371,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -377,16 +394,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -419,20 +433,7 @@ return [
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
-                'wizards' => [
+                'renderType' => 'inputLink',
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ],
         ],
         'type' => [
@@ -518,20 +519,14 @@ return [
                 'autoSizeMax' => 30,
                 'maxitems' => 9999,
                 'multiple' => 0,
-                'wizards' => [
+                'fieldControl' => [
-                    '_VERTICAL' => 1,
+                    'addRecord' => [
-                    'add' => [
+                        'disabled' => false,
-                        'type' => 'script',
+                        'options' => [
-                        'title' => 'hinzufügen',
-                        'icon' => 'actions-add',
-                        'params' => [
                             'table' => 'tx_epproducts_domain_model_fact',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-                            'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-                        'module' => [
-                            'name' => 'wizard_add'
-                        ]
                     ],
                 ],
             ],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,by_car,by_bus,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_journey.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, by_car, by_bus, image',
@@ -29,14 +27,6 @@ return [
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, name, by_car, by_bus, image',
-			'columnsOverrides' => [
-				'by_car' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'by_bus' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'columns' => [
@@ -93,34 +83,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -141,6 +135,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'by_bus' => [
@@ -151,6 +146,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'image' => [
@@ -162,16 +158,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1,

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php

@@ -6,11 +6,9 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => false,
-		'versioning_followPages' => TRUE,
+        'hideTable' => true,
-        'hideTable' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'code',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_matchcode.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'code,entity_type',
@@ -86,34 +84,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'text,author,product,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_officetip.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, text, author',
@@ -86,34 +84,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php

@@ -8,10 +8,8 @@ return [
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => TRUE,
+        'dividers2tabs' => true,
-        'versioningWS' => 2,
+        'versioningWS' => true,
-        'versioning_followPages' => TRUE,
-
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -22,7 +20,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'name,headline',
-        'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_product.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
     'interface' => [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, searchable, bookable, 
@@ -42,32 +40,6 @@ return [
                     additional_regions, badge,
                 --div--;Bilder/Dateien, teaser_images, header_images, images, reseller_images, banner, video,
                 --div--;Bewertung, --palette--;;rating, testimonials',
-            'columnsOverrides' => [
-                'teaser' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'teaser_long' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'concept_description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'board_description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'additional_services' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'programme_description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'ski_pass_description' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-                'testimonials' => [
-                    'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-                ],
-            ],
         ],
     ],
     'palettes' => [
@@ -133,34 +105,38 @@ return [
         ],
         'starttime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'endtime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 
@@ -190,22 +166,8 @@ return [
             'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_product.detail_page',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
         'bus_pro_id' => [
@@ -289,6 +251,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'teaser_long' => [
@@ -299,6 +262,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'header_title' => [
@@ -327,6 +291,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'board_description' => [
@@ -337,6 +302,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'additional_services' => [
@@ -347,6 +313,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'programme_description' => [
@@ -357,6 +324,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'ski_pass_description' => [
@@ -367,6 +335,7 @@ return [
                 'cols' => 40,
                 'rows' => 15,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'rating_average' => [
@@ -395,6 +364,7 @@ return [
                 'cols' => 40,
                 'rows' => 5,
                 'eval' => 'trim',
+                'enableRichtext' => true,
             ],
         ],
         'teaser_images' => [
@@ -406,16 +376,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -432,16 +424,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'headerLarge' => [
+                                                    'title' => 'Header groß',
+                                                    'value' => 2.3333333333333334,
+                                                ],
+                                                'headerSmall' => [
+                                                    'title' => 'Header klein',
+                                                    'value' => 3.3333333333333334,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -458,16 +472,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -484,16 +495,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -577,20 +585,14 @@ return [
                 'autoSizeMax' => 30,
                 'maxitems' => 9999,
                 'multiple' => 0,
-                'wizards' => [
+                'fieldControl' => [
-                    '_VERTICAL' => 1,
+                    'addRecord' => [
-                    'add' => [
+                        'disabled' => false,
-                        'type' => 'script',
+                        'options' => [
-                        'title' => 'hinzufügen',
-                        'icon' => 'actions-add',
-                        'params' => [
                             'table' => 'tx_epproducts_domain_model_fact',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-                            'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-                        'module' => [
-                            'name' => 'wizard_add'
-                        ]
                     ],
                 ],
             ],
@@ -652,20 +654,14 @@ return [
                 'autoSizeMax' => 30,
                 'maxitems' => 9999,
                 'multiple' => 0,
-                'wizards' => [
+                'fieldControl' => [
-                    '_VERTICAL' => 1,
+                    'addRecord' => [
-                    'add' => [
+                        'disabled' => false,
-                        'type' => 'script',
+                        'options' => [
-                        'title' => 'hinzufügen',
-                        'icon' => 'actions-add',
-                        'params' => [
                             'table' => 'tx_epproducts_domain_model_faq',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-                            'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-                        'module' => [
-                            'name' => 'wizard_add'
-                        ]
                     ],
                 ],
             ],
@@ -712,16 +708,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,headline,teaser,ski_area,ski_pass,description,news',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_region.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, 
@@ -37,26 +35,6 @@ return [
 			--div--;Texte, ski_area, ski_area_extended, ski_pass, description, news, 
 			--div--;Daten, --palette--;;dimensions, 
 			--div--;Bilder/Dateien, teaser_images, header_images, images, region_maps',
-			'columnsOverrides' => [
-				'teaser' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'ski_area' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'ski_area_extended' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'ski_pass' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'description' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-				'news' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -121,34 +99,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -157,22 +139,8 @@ return [
             'label' => 'Detailseite',
             'config' => [
                 'type' => 'input',
-                'size' => 4,
+                'size' => 30,
-                'eval' => 'int',
+                'renderType' => 'inputLink',
-                'wizards' => [
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
         'exclude_from_teasergroups' => [
@@ -239,6 +207,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'header_title' => [
@@ -267,6 +236,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'ski_area_extended' => [
@@ -277,6 +247,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'ski_pass' => [
@@ -287,6 +258,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'description' => [
@@ -297,6 +269,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
 		'news' => [
@@ -307,6 +280,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'length' => [
@@ -354,16 +328,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'teaserEven' => [
+                                                    'title' => 'Teaser gerade',
+                                                    'value' => 1.3333333333333334,
+                                                ],
+                                                'teaserOdd' => [
+                                                    'title' => 'Teaser ungerade',
+                                                    'value' => 2.0555555555555556,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -380,16 +376,38 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
+                        ],
+                        'columns' => [
+                            'crop' => [
+                                'config' => [
+                                    'cropVariants' => [
+                                        'default' => [
+                                            'title' => 'Alle Geräte',
+                                            'allowedAspectRatios' => [
+                                                'headerLarge' => [
+                                                    'title' => 'Header groß',
+                                                    'value' => 2.3333333333333334,
+                                                ],
+                                                'headerSmall' => [
+                                                    'title' => 'Header klein',
+                                                    'value' => 3.3333333333333334,
+                                                ],
+                                                'free' => [
+                                                    'title' => 'Frei',
+                                                    'value' => 'NaN',
+                                                ],
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
                         ],
                     ],
                     'maxitems' => 10
@@ -406,16 +424,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 10
@@ -432,16 +447,13 @@ return [
 					'appearance' => [
 						'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
 					],
-					'foreign_types' => [
+                    'overrideChildTca' => [
-						'0' => [
+                        'types' => [
-							'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-						],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
 					'maxitems' => 5
@@ -490,20 +502,14 @@ return [
 				'autoSizeMax' => 30,
 				'maxitems' => 9999,
 				'multiple' => 0,
-				'wizards' => [
+                'fieldControl' => [
-					'_VERTICAL' => 1,
+                    'addRecord' => [
-					'add' => [
+                        'disabled' => false,
-						'type' => 'script',
+                        'options' => [
-						'title' => 'hinzufügen',
-						'icon' => 'actions-add',
-						'params' => [
                             'table' => 'tx_epproducts_domain_model_fact',
                             'pid' => '###PAGE_TSCONFIG_ID###',
-							'setValue' => 'prepend'
+                            'setValue' => 'prepend',
                         ],
-						'module' => [
-							'name' => 'wizard_add'
-						]
                     ],
                 ],
 			],
@@ -561,16 +567,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1
@@ -585,20 +588,7 @@ return [
                 'type' => 'input',
                 'size' => 32,
                 'eval' => 'trim',
-                'wizards' => [
+                'renderType' => 'inputLink',
-                    'link' => [
-                        'type' => 'popup',
-                        'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-                        'module' => [
-                            'name' => 'wizard_link',
-                            'urlParameters' => [
-                                'mode' => 'wizard'
-                            ]
-                        ],
-                        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                    ]
-                ],
             ]
         ],
         'award_label' => [

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php

@@ -8,8 +8,7 @@ return [
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
 		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => true,
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -20,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_reseller.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'name,code,pa_code,products',
@@ -83,34 +82,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => false,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,tags,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_roommapping.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, code, type',
@@ -86,34 +84,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'regionName,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_snowreport.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, vendor_uid, region_name, glacier, height_max, height_min, opened, snow_level_mountain, snow_level_valley, snow_quality, last_snowfall, lifts_total, lifts_opened, last_update, season_start, season_end, webcams',
@@ -85,34 +83,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'date',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 
@@ -204,13 +206,13 @@ return [
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'date',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'lifts_total' => [
@@ -237,13 +239,13 @@ return [
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'date',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'webcams' => [
@@ -261,13 +263,13 @@ return [
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'date',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'season_end' => [
@@ -276,13 +278,13 @@ return [
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'date',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 	],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php

@@ -7,10 +7,8 @@ return [
         'tstamp' => 'tstamp',
         'crdate' => 'crdate',
         'cruser_id' => 'cruser_id',
-        'dividers2tabs' => TRUE,
+        'dividers2tabs' => true,
-        'versioningWS' => 2,
+        'versioningWS' => true,
-        'versioning_followPages' => TRUE,
-
         'languageField' => 'sys_language_uid',
         'transOrigPointerField' => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
             'endtime' => 'endtime',
         ],
         'searchFields' => 'name,path_segment',
-        'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_product.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
     'interface' => [
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, path_segment,
@@ -88,34 +86,38 @@ return [
         ],
         'starttime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
         'endtime' => [
             'exclude' => 0,
-            'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
             'config' => [
                 'type' => 'input',
                 'size' => 13,
-                'max' => 20,
                 'eval' => 'datetime',
                 'checkbox' => 0,
                 'default' => 0,
                 'range' => [
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
                 ],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
             ],
         ],
 
@@ -231,7 +233,8 @@ return [
                 'size' => 7,
                 'eval' => 'date',
                 'checkbox' => 0,
-                'default' => '0000-00-00'
+                'default' => '0000-00-00',
+                'renderType' => 'inputDateTime',
             ]
         ],
         'date_to' => [
@@ -243,7 +246,8 @@ return [
                 'size' => 7,
                 'eval' => 'date',
                 'checkbox' => 0,
-                'default' => '0000-00-00'
+                'default' => '0000-00-00',
+                'renderType' => 'inputDateTime',
             ]
         ],
     ],

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php

@@ -1,4 +1,10 @@
 <?php
+
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable(
+    'epproducts',
+    'tx_epproducts_domain_model_teammember'
+);
+
 return [
 	'ctrl' => [
 		'title'	=> 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_teammember',
@@ -8,10 +14,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -22,7 +26,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name,email,',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_teammember.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, email, phone, tasks, description, image',
@@ -30,11 +34,6 @@ return [
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, --palette--;;top, --palette--;;contact, description, image',
-			'columnsOverrides' => [
-				'description' => [
-					'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]',
-				],
-			],
 		],
 	],
 	'palettes' => [
@@ -95,34 +94,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
         'sorting' => [
@@ -175,6 +178,7 @@ return [
 				'cols' => 40,
 				'rows' => 15,
 				'eval' => 'trim',
+                'enableRichtext' => true,
 			],
 		],
         'image' => [
@@ -186,16 +190,13 @@ return [
                     'appearance' => [
                         'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference'
                     ],
-                    'foreign_types' => [
+                    'overrideChildTca' => [
-                        '0' => [
+                        'types' => [
-                            'showitem' => '
-							--palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
-                        ],
                             \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
                                 'showitem' => '
                                 --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette,
-							--palette--;;filePalette'
+                                --palette--;;filePalette',
+                            ],
                         ],
                     ],
                     'maxitems' => 1,

web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php

@@ -7,10 +7,8 @@ return [
 		'tstamp' => 'tstamp',
 		'crdate' => 'crdate',
 		'cruser_id' => 'cruser_id',
-		'dividers2tabs' => TRUE,
+		'dividers2tabs' => true,
-		'versioningWS' => 2,
+		'versioningWS' => true,
-		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
@@ -21,7 +19,7 @@ return [
 			'endtime' => 'endtime',
 		],
 		'searchFields' => 'name',
-		'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_webcam.gif'
+        'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, url, vendor_uid, available, snowreport',
@@ -85,34 +83,38 @@ return [
 		],
 		'starttime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'datetime',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 		'endtime' => [
 			'exclude' => 0,
-			'l10n_mode' => 'mergeIfNotBlank',
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
 			'config' => [
 				'type' => 'input',
 				'size' => 13,
-				'max' => 20,
 				'eval' => 'date',
 				'checkbox' => 0,
 				'default' => 0,
 				'range' => [
 					'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y'))
 				],
+                'behaviour' => [
+                    'allowLanguageSynchronization' => true,
+                ],
+                'renderType' => 'inputDateTime',
 			],
 		],
 

web/typo3conf/ext/ep_products/Resources/Private/Templates/Backend/index.html

@@ -6,7 +6,7 @@
 
     <f:section name="Main">
         <h1>E&amp;P Funktionen</h1>
-        <f:flashMessages renderMode="div" />
+        <f:flashMessages />
         <p>
             <f:link.action action="importProducts" class="btn btn-default">
                 <core:icon identifier="actions-refresh"/>

web/typo3conf/ext/ep_products/ext_tables.php

@@ -1,230 +1,11 @@
 <?php
-if (!defined('TYPO3_MODE')) {
-    die('Access denied.');
-}
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile($_EXTKEY, 'Configuration/TypoScript', 'EP Products');
+defined('TYPO3_MODE')|| die('Access denied.');
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+call_user_func(function () {
-    'EP.' . $_EXTKEY,
-    'searchbar',
-    'Suchschlitz'
-);
 
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
+    \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-    'EP.' . $_EXTKEY,
+        'EP.EpProducts',
-    'searchresult',
-    'Suchergebnis'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'product_detail',
-    'Produktdetails'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'product_teasergroup',
-    'Produktteaser'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'product_pricetable',
-    'Buchungstabelle'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'country_detail',
-    'Land'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'region_teasergroup',
-    'Gebietsteaser'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'region_detail',
-    'Gebietsdetails'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'city_teasergroup',
-    'Ortsteaser'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'city_detail',
-    'Ortsdetails'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'hotel_teasergroup',
-    'Hotelteaser'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'hotel_teasergroup_nodate',
-    'Hotelteaser (terminunabhängig)'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'hotel_detail',
-    'Hoteldetails'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'hotel_detail_event',
-    'Hoteldetails (Event)'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'concept_teasergroup',
-    'Konzeptteaser'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'concept_detail',
-    'Konzeptdetails'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'snowreport_list',
-    'Schneehöhen'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'teammembers',
-    'Team'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'faq',
-    'FAQ'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'newsletter',
-    'Newsletter'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'maps',
-    'Übersichtskarte Hotels/Produkte'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'pricetable',
-    'Preistabelle'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'reseller',
-    'Vertriebspartner Export'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'EP.' . $_EXTKEY,
-    'watchlist',
-    'Merkliste'
-);
-
-$extensionName = strtolower(\TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToUpperCamelCase($_EXTKEY));
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_detail.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_teasergroup';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_teaser.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_pricetable';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_pricetable.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_country_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_country.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_region_teasergroup';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_region_teaser.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_region_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_region_detail.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_city_teasergroup';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_city_teaser.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_city_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_city_detail.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_teasergroup';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_teaser.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_teasergroup_nodate';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_detail.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_detail_event';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_detail_event.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_concept_detail';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_concept_detail.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_faq';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_faq.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_maps';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_maps.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_pricetable';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_pricetable.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_snowreport_list';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_snowreport.xml');
-
-$pluginSignature = str_replace('_', '', $_EXTKEY) . '_teammembers';
-$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform';
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_teammembers.xml');
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-    'EP.' . $_EXTKEY,
         'web',
         'management',
         'after:list',
@@ -236,9 +17,6 @@ $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignat
             'labels' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang_mod.xlf',
             'icon' => 'EXT:ep_products/Resources/Public/Icons/logo.svg'
         ]
-);
+    );
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable(
+});
-    'epproducts',
-    'tx_epproducts_domain_model_teammember'
-);

web/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php

@@ -79,7 +79,11 @@ class SliderProcessor implements DataProcessorInterface
             foreach ($slides as $slide)
             {
                 $processedData['slides'][$slide['uid']] = $slide;
-                $processedData['slides'][$slide['uid']]['image'] = $fileRepository->findByRelation('tx_eptheme_domain_model_slide', 'images', $slide['uid']);
+                $processedData['slides'][$slide['uid']]['image'] = $fileRepository->findByRelation(
+                    'tx_eptheme_domain_model_slide',
+                    'images',
+                    $slide['uid']
+                );
             }
         }
 

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ArgumentPrefixViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,22 +28,39 @@ namespace EP\EpTheme\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ArgumentPrefixViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('pluginName', 'string', 'Plugin name');
+        $this->registerArgument('extensionName', 'string', 'Extension name');
+    }
 
     /**
-     * @param string $pluginName
+     * @param array $arguments
-     * @param string $extensionName
+     * @param \Closure $renderChildrenClosure
-     *
+     * @param RenderingContextInterface $renderingContext
-     * @return string
+     * @return mixed
      */
-    public function render($pluginName = null, $extensionName = null)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
-        $request = $this->controllerContext->getRequest();
+        $request = $renderingContext->getControllerContext()->getRequest();
+        $pluginName = $arguments['pluginName'];
         if ($pluginName === null) {
             $pluginName = $request->getPluginName();
         }
+        $extensionName = $arguments['extensionName'];
         if ($extensionName === null) {
             $extensionName = $request->getControllerExtensionName();
         }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/ContingentViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Calendar;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -32,22 +32,54 @@ use CalendR\Period\Day;
 use CalendR\Period\Month;
 use EP\EpProducts\Domain\Model\Contingent;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ContingentViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    /**
+     * @var bool
+     */
+    protected $escapeOutput = false;
+
     const LEVEL_GREEN = 1;
     const LEVEL_YELLOW = 2;
     const LEVEL_RED = 3;
 
-    public function render(Month $month, Day $day, Basic $events)
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('month', Month::class, 'The month', true);
+        $this->registerArgument('day', Day::class, 'The day', true);
+        $this->registerArgument('events', Basic::class, 'The calendar events', true);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $month = $arguments['month'];
+        $day = $arguments['day'];
+        $events = $arguments['events'];
+
         if (!$month->includes($day)) {
             return '';
         }
         $now = new \DateTime('now');
         if ($now > $day->getBegin()) {
             $class = [ 'text-muted' ];
-            return $this->getHtml($class, $day->format('d'));
+            return static::getHtml($class, $day->format('d'));
         }
         $contingents = $events->find($day);
         if (count($contingents) === 0) {
@@ -57,7 +89,7 @@ class ContingentViewHelper extends AbstractViewHelper
             $contingent = reset($contingents);
             $percentage = $contingent->getPercentageAvailable();
             $status = $contingent->getStatus();
-            $level = $this->getOccupancyLevel($percentage, $status);
+            $level = static::getOccupancyLevel($percentage, $status);
         }
         $previousDay = $day->getPrevious();
         $previousContingents = $events->find($previousDay);
@@ -67,16 +99,16 @@ class ContingentViewHelper extends AbstractViewHelper
             $previousContingent = reset($previousContingents);
             $previousPercentage = $previousContingent->getPercentageAvailable();
             $previousStatus = $previousContingent->getStatus();
-            $previousLevel = $this->getOccupancyLevel($previousPercentage, $previousStatus);
+            $previousLevel = static::getOccupancyLevel($previousPercentage, $previousStatus);
         }
 
         if ($previousLevel !== $level) {
-            $class = $this->getTransientLabelClasses($previousLevel, $level);
+            $class = static::getTransientLabelClasses($previousLevel, $level);
         } else {
-            $class = $this->getLabelClasses($percentage, $level);
+            $class = static::getLabelClasses($percentage, $level);
         }
 
-        return $this->getHtml($class, $day->format('d'));
+        return static::getHtml($class, $day->format('d'));
     }
 
     /**
@@ -85,9 +117,9 @@ class ContingentViewHelper extends AbstractViewHelper
      *
      * @return array
      */
-    protected function getLabelClasses($percentage, $level)
+    protected static function getLabelClasses($percentage, $level)
     {
-        $classes = $this->getTransientLabelClasses($level);
+        $classes = static::getTransientLabelClasses($level);
         $classes[] = 'available-' . $percentage;
         return $classes;
     }
@@ -98,7 +130,7 @@ class ContingentViewHelper extends AbstractViewHelper
      *
      * @return array
      */
-    protected function getTransientLabelClasses($levelFrom, $levelTo = null)
+    protected static function getTransientLabelClasses($levelFrom, $levelTo = null)
     {
         $classes = [ 'label' ];
         if ($levelFrom === static::LEVEL_RED) {
@@ -125,7 +157,7 @@ class ContingentViewHelper extends AbstractViewHelper
      *
      * @return int
      */
-    protected function getOccupancyLevel($percentage, $status)
+    protected static function getOccupancyLevel($percentage, $status)
     {
         if ($percentage <= 20 || $status === Contingent::STATUS_BLOCKED) {
             return static::LEVEL_RED;
@@ -141,7 +173,7 @@ class ContingentViewHelper extends AbstractViewHelper
      * @param string $label
      * @return string
      */
-    protected function getHtml(array $class, $label)
+    protected static function getHtml(array $class, $label)
     {
         $cssClass = ' class="' . implode(' ', $class) . '"';
         return sprintf('<span%s>%s</span>', $cssClass, $label);

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/IncludesViewHelper.php

@@ -34,6 +34,7 @@ class IncludesViewHelper extends AbstractConditionViewHelper
     public function initializeArguments()
     {
         parent::initializeArguments();
+
         $this->registerArgument('range', 'object', 'Range to check against', true);
         $this->registerArgument('period', 'object', 'Period to check if it is included in range', true);
     }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ComfortCategoryViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,17 +29,35 @@ namespace EP\EpTheme\ViewHelpers;
 
 use EP\EpProducts\Domain\Model\Hotel;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ComfortCategoryViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('hotel', Hotel::class, 'The hotel');
+    }
 
     /**
-     * @param Hotel $hotel
+     * @param array $arguments
-     *
+     * @param \Closure $renderChildrenClosure
-     * @return string
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
      */
-    public function render(Hotel $hotel)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        /** @var Hotel $hotel */
+        $hotel = $arguments['hotel'];
+
         $flag = '<span class="category-flag" data-toggle="tooltip" title="%s">%s</span>';
 
         switch ($hotel->getCategory())

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,38 +28,63 @@ namespace EP\EpTheme\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ContainerViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    /**
+     * @var bool
+     */
+    protected $escapeOutput = false;
+
     /**
      * @var array
      */
-    protected $columnsWithoutContainers = [ 0, 1, 3 ];
+    protected static $columnsWithoutContainers = [ 0, 1, 3 ];
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('content', 'string', 'The content');
+        $this->registerArgument('cssClasses', 'string', 'Additional css classes');
+        $this->registerArgument('data', 'Array', 'The data', true);
+    }
 
     /**
-     * @param array $data
+     * @param array $arguments
-     * @param string $content
+     * @param \Closure $renderChildrenClosure
-     * @param string $cssClasses
+     * @param RenderingContextInterface $renderingContext
-     *
+     * @return mixed
-     * @return string
      */
-    public function render(array $data, $content = null, $cssClasses = null)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        $content = $renderChildrenClosure();
+
         if ($content === null) {
-            $content = $this->renderChildren();
+            $content = $arguments['content'];
         }
+
         $classes = [];
-        if (in_array($data['colPos'], $this->columnsWithoutContainers, false)) {
+        if (in_array($arguments['data']['colPos'], static::$columnsWithoutContainers, false)) {
             $classes[] = 'container';
         } else {
             $classes[] = 'in-column';
         }
-        if ($cssClasses !== null) {
+        if ($arguments['cssClasses'] !== null) {
-            $classes[] = $cssClasses;
+            $classes[] = $arguments['cssClasses'];
         }
         if (count($classes) > 0) {
             return '<div class="' . implode(' ', $classes) . '">' . $content . '</div>';
         }
+
         return $content;
     }
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContextClassesViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,23 +28,38 @@ namespace EP\EpTheme\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ContextClassesViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('context', 'Array', 'The context', true);
+    }
 
     /**
-     * @param array $context
+     * @param array $arguments
-     *
+     * @param \Closure $renderChildrenClosure
-     * @return string
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
      */
-    public function render(array $context)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
         $classes = [];
-        if (isset($context['country'])) {
+        if (isset($arguments['context']['country'])) {
-            $classes[] = mb_strtolower($context['country']['name']);
+            $classes[] = mb_strtolower($arguments['context']['country']['name']);
         }
-        if (isset($context['region'])) {
+        if (isset($arguments['context']['region'])) {
-            $classes[] = mb_strtolower($context['region']['name']);
+            $classes[] = mb_strtolower($arguments['context']['region']['name']);
         }
 
         $classesString = implode(' ', $classes);
@@ -53,5 +68,4 @@ class ContextClassesViewHelper extends AbstractViewHelper
 
         return $classesString;
     }
-
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/DateRangeViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,21 +29,40 @@ namespace EP\EpTheme\ViewHelpers;
 
 use EP\EpProducts\Utility\DateUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class DateRangeViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
 
-    /**
+    public function initializeArguments()
-     * @param \DateTime $dateFrom
-     * @param \DateTime $dateTo
-     * @param bool $includeLabel
-     * @param string $format
-     *
-     * @return string
-     */
-    public function render(\DateTime $dateFrom = null, \DateTime $dateTo = null, $includeLabel = true, $format = 'd.m.Y')
     {
-        return DateUtility::formatDateRange($dateFrom, $dateTo, $includeLabel, $format);
+        parent::initializeArguments();
+
+        $this->registerArgument('dateFrom', \DateTime::class, 'Date range start');
+        $this->registerArgument('dateTo', \DateTime::class, 'Date range end');
+        $this->registerArgument('includeLabel', 'Bool', 'Whether to include a label', false, true);
+        $this->registerArgument('format', 'String', 'The date format', false, 'd.m.Y');
     }
 
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        return DateUtility::formatDateRange(
+            $arguments['dateFrom'],
+            $arguments['dateTo'],
+            $arguments['includeLabel'],
+            $arguments['format']
+        );
+    }
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FilterSettingsEncoderViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -30,24 +30,47 @@ namespace EP\EpTheme\ViewHelpers;
 use EP\EpProducts\Service\FilterSettingsEncoder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class FilterSettingsEncoderViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
-     * @param string $argument
+     * @var bool
-     *
-     * @return string
      */
-    public function render($argument = null)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('argument', 'string', 'The argument string to encode');
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $argument = $renderChildrenClosure();
         if ($argument === null) {
-            $argument = $this->renderChildren();
+            $argument = $arguments['argument'];
         }
         if ($argument === null) {
             return '';
         }
+
         /** @var \EP\EpProducts\Service\FilterSettingsEncoder $encoder */
         $encoder = GeneralUtility::makeInstance(FilterSettingsEncoder::class);
-        return $encoder->encode($argument);
+        return $encoder::encode($argument);
     }
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FlagiconSourceViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,26 +29,41 @@ namespace EP\EpTheme\ViewHelpers;
 
 use EP\EpProducts\Domain\Model\Country;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class FlagiconSourceViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
 
     public function initializeArguments()
     {
+        parent::initializeArguments();
+
         $this->registerArgument('countryCode', 'string', 'Country code to return a flag icon source for.');
-        $this->registerArgument('country', 'object', 'Country entity to return a flag icon source for.');
+        $this->registerArgument('country', 'mixed', 'Country entity to return a flag icon source for.');
     }
 
-    public function render()
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
         $code = null;
 
-        if (is_object($this->arguments['country']) && $this->arguments['country'] instanceof Country) {
+        if (\is_object($arguments['country']) && $arguments['country'] instanceof Country) {
             /** @var \EP\EpProducts\Domain\Model\Country $country */
-            $country = $this->arguments['country'];
+            $country = $arguments['country'];
             $code = strtolower($country->getCode());
-        } elseif (!empty($this->arguments['countryCode'])) {
+        } elseif (!empty($arguments['countryCode'])) {
-            $code = strtolower($this->arguments['countryCode']);
+            $code = strtolower($arguments['countryCode']);
         }
 
         if ($code !== null) {
@@ -57,5 +72,4 @@ class FlagiconSourceViewHelper extends AbstractViewHelper
 
         return '';
     }
-
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsStaticMapViewHelper.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace EP\EpTheme\ViewHelpers;
-
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-use EP\EpProducts\Domain\Model\Hotel;
-use EP\EpProducts\Domain\Model\Region;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
-
-class GmapsStaticMapViewHelper extends AbstractViewHelper
-{
-    const URLBASE = '%s&center=%s,%s&zoom=%d&size=%dx%d';
-
-    /**
-     * @var ConfigurationManagerInterface
-     */
-    protected $configurationManager;
-
-    /**
-     * @var array
-     */
-    protected $settings = [];
-
-    /**
-     * @param ConfigurationManagerInterface $manager
-     * @return void
-     */
-    public function injectConfigurationManager(ConfigurationManagerInterface $manager)
-    {
-        $this->configurationManager = $manager;
-        $settings = GeneralUtility::removeDotsFromTS(
-            $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)
-        );
-        $this->settings = $settings['plugin']['tx_eptheme']['settings'];
-    }
-
-    /**
-     * @param Hotel $hotel
-     * @param Region $region
-     * @param int $zoom
-     * @param int $width
-     * @param int $height
-     *
-     * @return string
-     */
-    public function render(Hotel $hotel = null, Region $region = null, $zoom = 10, $width = 0, $height = 0)
-    {
-        if ($hotel !== null && $hotel->getLatitude() && $hotel->getLongitude()) {
-            $source = $hotel;
-        } elseif ($hotel !== null && $hotel->getRegion()->getLatitude() && $hotel->getRegion()->getLongitude()) {
-            $source = $hotel->getRegion();
-        } elseif ($region !== null) {
-            $source = $region;
-        } else {
-            return '';
-        }
-        $staticMapsBaseUrl = $this->settings['googleStaticMapsBaseUrl'];
-        $url = sprintf(static::URLBASE, $staticMapsBaseUrl, $source->getLatitude(), $source->getLongitude(), $zoom, $width, $height);
-        $tag = sprintf('<img class="scale" src="%s" alt="%s" title="%s"/>', $url, $source->getName(), $source->getName());
-
-        return $tag;
-    }
-}

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsUrlViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -30,21 +30,44 @@ namespace EP\EpTheme\ViewHelpers;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Region;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class GmapsUrlViewHelper extends AbstractViewHelper
 {
-    const URLBASE = 'http://maps.google.com/maps?q=%s,%s&t=%s&z=%d';
+    use CompileWithRenderStatic;
 
     /**
-     * @param Hotel $hotel
+     * @var bool
-     * @param Region $region
-     * @param string $type
-     * @param int $zoom
-     *
-     * @return string
      */
-    public function render(Hotel $hotel = null, Region $region = null, $type = 'p', $zoom = 10)
+    protected $escapeOutput = false;
+
+    const URLBASE = 'http://maps.google.com/maps?q=%s,%s&t=%s&z=%d';
+
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('hotel', Hotel::class, 'The hotel');
+        $this->registerArgument('region', Region::class, 'The region');
+        $this->registerArgument('type', 'string', 'The map type', false, 'p');
+        $this->registerArgument('zoom', 'int', 'The zoom level', false, 10);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $hotel = $arguments['hotel'];
+        $region = $arguments['region'];
         if ($hotel !== null && $hotel->getLatitude() && $hotel->getLongitude()) {
             $source = $hotel;
         } elseif ($hotel !== null && $hotel->getRegion()->getLatitude() && $hotel->getRegion()->getLongitude()) {
@@ -54,6 +77,7 @@ class GmapsUrlViewHelper extends AbstractViewHelper
         } else {
             return 'http://www.google.de/maps';
         }
-        return sprintf(static::URLBASE, $source->getLatitude(), $source->getLongitude(), $type, $zoom);
+        return sprintf(static::URLBASE, $source->getLatitude(), $source->getLongitude(), $arguments['type'], $arguments['zoom']);
     }
+
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoriesViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -27,19 +27,35 @@ namespace EP\EpTheme\ViewHelpers;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use EP\EpProducts\Domain\Model\Hotel;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class HotelCategoriesViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('categories', 'array', 'The categories', true);
+    }
 
     /**
-     * @param array $categories
+     * @param array $arguments
-     *
+     * @param \Closure $renderChildrenClosure
-     * @return string
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
      */
-    public function render($categories)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        $categories = $arguments['categories'];
+
         switch (count($categories)) {
             case 1:
                 $label = reset($categories);
@@ -52,4 +68,5 @@ class HotelCategoriesViewHelper extends AbstractViewHelper
 
         return $label;
     }
+
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoryViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,9 +29,13 @@ namespace EP\EpTheme\ViewHelpers;
 
 use EP\EpProducts\Domain\Model\Hotel;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class HotelCategoryViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
      * @var array
      */
@@ -42,13 +46,28 @@ class HotelCategoryViewHelper extends AbstractViewHelper
         Hotel::CATEGORY_SUPER_DELUXE => 'Super Deluxe',
     ];
 
-    /**
+    public function initializeArguments()
-     * @param int $category
-     *
-     * @return string
-     */
-    public function render($category)
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('category', 'int', 'The category id', true);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $category = $arguments['category'];
+
         return static::$categoryLabels[$category];
     }
+
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/NightsOptionsViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,17 +28,33 @@ namespace EP\EpTheme\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class NightsOptionsViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('options', 'array', 'The options');
+    }
 
     /**
-     * @param array $options
+     * @param array $arguments
-     *
+     * @param \Closure $renderChildrenClosure
-     * @return string
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
      */
-    public function render(array $options = null)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        $options = $arguments['options'];
         if ($options === null) {
             return '';
         }
@@ -54,6 +70,7 @@ class NightsOptionsViewHelper extends AbstractViewHelper
             $output = $lastOption;
         }
         $output .= (int) $lastOption > 1 ? ' Nächte' : ' Nacht';
+
         return $output;
     }
 

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/RatingViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,17 +29,41 @@ namespace EP\EpTheme\ViewHelpers;
 
 use EP\EpProducts\Domain\Model\Product;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class RatingViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
 
     /**
-     * @param Product $product
+     * @var bool
-     *
-     * @return string
      */
-    public function render(Product $product)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('product', Product::class, 'The product', true);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $product = $renderChildrenClosure();
+        if ($product === null) {
+            $product = $arguments['product'];
+        }
         $ratingAverage = $product->getRatingAverage();
         $ratingVotesCount = $product->getRatingVotesCount();
         $fullStars = floor($ratingAverage);
@@ -55,6 +79,7 @@ class RatingViewHelper extends AbstractViewHelper
             $content .= '<i class="fa fa-star-half-o" aria-hidden="true"></i>';
         }
         $content .= sprintf('%s Sterne (%d)', $ratingAverageLabel, $ratingVotesCount);
+
         return $content;
     }
 

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,27 +28,48 @@ namespace EP\EpTheme\ViewHelpers;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class TopnavItemViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
 
     /**
-     * @param string $item
+     * @var bool
-     *
-     * @return string
      */
-    public function render($item = null)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
     {
-        if ($item === null) {
+        parent::initializeArguments();
-            $item = $this->renderChildren();
+
+        $this->registerArgument('item', 'string', 'The navigation item');
     }
 
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $item = $renderChildrenClosure();
+        if ($item === null) {
+            $item = $arguments['item'];
+        }
         $parts = explode(' ', $item);
         if (count($parts) === 1) {
             return $item;
         }
         $hiddenMobileText = array_shift($parts);
         $linkText = implode(' ', $parts);
+
         return '<span class="hidden-md">' . $hiddenMobileText . '</span> ' . $linkText;
     }
 

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/AjaxViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -27,9 +27,8 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\ViewHelpers\Uri\ActionViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 
 class AjaxViewHelper extends ActionViewHelper
 {
@@ -37,58 +36,40 @@ class AjaxViewHelper extends ActionViewHelper
     const PAGE_TYPE_JSON = 1701;
     const PAGE_TYPE_HTML = 1702;
 
-    /**
+    public function initializeArguments()
-     * @var array
-     */
-    protected $settings;
-
-    /**
-     * @param ConfigurationManagerInterface $manager
-     */
-    public function injectConfigurationManager(ConfigurationManagerInterface $manager)
     {
-        $configurationManager = $manager;
+        parent::initializeArguments();
-        $settings = GeneralUtility::removeDotsFromTS($configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT));
+
-        $this->settings = $settings['plugin']['tx_eptheme']['settings'];
+        $this->overrideArgument('extensionName', 'string', 'Target extension name', false, 'epproducts');
+        $this->overrideArgument('pluginName', 'string', 'Target plugin name', false, 'Ajax');
+        $this->overrideArgument('format', 'string', 'The requested format', false, 'json');
     }
 
     /**
-     * @param string $action Target action
+     * @param array $arguments
-     * @param array $arguments Arguments
+     * @param \Closure $renderChildrenClosure
-     * @param string $controller Target controller. If NULL current controllerName is used
+     * @param RenderingContextInterface $renderingContext
-     * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used
+     * @return string
-     * @param string $pluginName Target plugin. If empty, the current plugin name is used
-     * @param int $pageUid target page. See TypoLink destination
-     * @param int $pageType type of the target page. See typolink.parameter
-     * @param bool $noCache set this to disable caching for the target page. You should not need this.
-     * @param bool $noCacheHash set this to suppress the cHash query parameter created by TypoLink. You should not need this.
-     * @param string $section the anchor to be added to the URI
-     * @param string $format The requested format, e.g. ".html
-     * @param bool $linkAccessRestrictedPages If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed.
-     * @param array $additionalParams additional query parameters that won't be prefixed like $arguments (overrule $arguments)
-     * @param bool $absolute If set, an absolute URI is rendered
-     * @param bool $addQueryString If set, the current query parameters will be kept in the URI
-     * @param array $argumentsToBeExcludedFromQueryString arguments to be removed from the URI. Only active if $addQueryString = TRUE
-     * @param string $addQueryStringMethod Set which parameters will be kept. Only active if $addQueryString = TRUE
-     *
-     * @return string Rendered link
      */
-    public function render($action = null, array $arguments = array(), $controller = null, $extensionName = 'epproducts', $pluginName = 'Ajax', $pageUid = null, $pageType = 0, $noCache = false, $noCacheHash = true, $section = '', $format = 'json', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null)
+    public static function renderStatic
+    (
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
-        if (array_key_exists('defaultAjaxUid', $this->settings)) {
+        if (strtolower(trim($arguments['format'])) === 'json') {
-            $pageUid = $this->settings['defaultAjaxUid'];
+            $arguments['pageType'] = self::PAGE_TYPE_JSON;
-        }
-        if (strtolower(trim($format)) === 'json') {
-            $pageType = self::PAGE_TYPE_JSON;
         } else {
-            $pageType = self::PAGE_TYPE_HTML;
+            $arguments['pageType'] = self::PAGE_TYPE_HTML;
         }
-        if ($pageUid === null) {
+        if ($arguments['pageUid'] === null) {
             $rootLine = $GLOBALS['TSFE']->sys_page->getRootLine($GLOBALS['TSFE']->id);
             $rootPage = array_pop($rootLine);
-            $pageUid = $rootPage['uid'];
+            $arguments['pageUid'] = $rootPage['uid'];
         }
-        return parent::render($action, $arguments, $controller, $extensionName, $pluginName, $pageUid, $pageType, $noCache, $noCacheHash, $section, '', $linkAccessRestrictedPages, $additionalParams, $absolute, $addQueryString, $argumentsToBeExcludedFromQueryString, $addQueryStringMethod);
+
+        return parent::renderStatic($arguments, $renderChildrenClosure, $renderingContext);
     }
 
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/BookingViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -31,47 +31,62 @@ use EP\EpProducts\Utility\BookingUrlUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class BookingViewHelper extends AbstractViewHelper
 {
-    /**
+    use CompileWithRenderStatic;
-     * @var ConfigurationManagerInterface
-     */
-    protected $configurationManager;
 
     /**
      * @var array
      */
-    protected $settings = [];
+    protected static $settings = [];
 
     /**
-     * @param ConfigurationManagerInterface $manager
+     * @param ConfigurationManagerInterface $configurationManager
-     * @return void
      */
-    public function injectConfigurationManager(ConfigurationManagerInterface $manager)
+    public function __construct(ConfigurationManagerInterface $configurationManager)
     {
-        $this->configurationManager = $manager;
+        $settings = GeneralUtility::removeDotsFromTS(
-        $settings = GeneralUtility::removeDotsFromTS($this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT));
+            $configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)
-        $this->settings = $settings['plugin']['tx_theme'];
+        );
+        static::$settings = $settings['plugin']['tx_theme'];
+    }
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('bookingId', 'string', 'The booking id', true);
+        $this->registerArgument('hotelId', 'string', 'The hotel id', true);
+        $this->registerArgument('template', 'string', 'The booking template');
     }
 
     /**
-     * @param int $bookingId
+     * @param array $arguments
-     * @param int $hotelId
+     * @param \Closure $renderChildrenClosure
-     * @param string $template
+     * @param RenderingContextInterface $renderingContext
-     *
+     * @return mixed
-     * @return string
      */
-    public function render($bookingId, $hotelId, $template = null)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        $template = $arguments['template'];
+
         if ($template === null) {
-            $template = $this->settings['bpnBookingUrlTemplateCode'];
+            $template = static::$settings['bpnBookungUrlTemplateCode'];
         }
+
         $options = [
-            'bookingId' => $bookingId,
+            'bookingId' => $arguments['bookingId'],
-            'hotelId' => $hotelId,
+            'hotelId' => $arguments['hotelId'],
             'template' => $template,
         ];
         return BookingUrlUtility::generateUrl($options);
     }
+
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ExternalImageViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -28,18 +28,44 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ExternalImageViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
-     * @param string $url
+     * @var bool
-     *
-     * @return string
      */
-    public function render($url)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
     {
+        parent::initializeArguments();
+
+        $this->registerArgument('url', 'string', 'The url');
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
+    {
+        $url = $renderChildrenClosure();
+        if ($url === null) {
+            $url = $arguments['url'];
+        }
         $encryptionKey = $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
         $token = sha1($url . $encryptionKey);
         return 'https://www.ep-reisen.de/typo3conf/ext/ep_theme/extimg.php?url=' . urlencode($url) . '&token=' . $token;
     }
+
 }

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php

@@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  *
  *  Copyright notice
  *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
+ *  (c) 2018 Björn Fromme <[email protected]>, dreipunktnull
  *
  *  All rights reserved
  *
@@ -29,71 +29,66 @@ namespace EP\EpTheme\ViewHelpers\Uri;
 
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Product;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class ProductViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
 
-    /**
+    public function initializeArgument()
-     * @var ConfigurationManagerInterface
-     */
-    protected $configurationManager;
-
-    /**
-     * @var array
-     */
-    protected $settings = [];
-
-    /**
-     * @param ConfigurationManagerInterface $manager
-     * @return void
-     */
-    public function injectConfigurationManager(ConfigurationManagerInterface $manager)
     {
-        $this->configurationManager = $manager;
+        parent::initializeArguments();
-        $settings = GeneralUtility::removeDotsFromTS($this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT));
+
-        $this->settings = $settings['plugin']['tx_epproducts'];
+        $this->registerArgument('product', Product::class, 'The product', true);
+        $this->registerArgument('hotel', Hotel::class, 'The hotel');
+        $this->registerArgument('linkHotel', 'bool', 'Whether to link the hotel', false, false);
+        $this->registerArgument('referringPageUid', 'int', 'Uid of the referring page');
+        $this->registerArgument('defaultDetailPageUid', 'int', 'Uid of default page for product details');
+        $this->registerArgument('origin', 'string', 'Origin of the link');
     }
 
     /**
-     * @param Product $product
+     * @param array $arguments
-     * @param Hotel|null $hotel
+     * @param \Closure $renderChildrenClosure
-     * @param bool $linkHotel
+     * @param RenderingContextInterface $renderingContext
-     * @param int $referringPageUid
+     * @return mixed
-     * @param string $origin
-     *
-     * @return string
      */
-    public function render(Product $product, Hotel $hotel = null, $linkHotel = false, $referringPageUid = null, $origin = null)
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
+        $product = $arguments['product'];
         if ($product->getDetailPage()) {
-            return $this
+            return $renderingContext
-                ->controllerContext
+                ->getControllerContext()
                 ->getUriBuilder()
                 ->reset()
                 ->setTargetPageUid($product->getDetailPage())
                 ->build()
                 ;
         }
-        $pageUid = $this->settings['defaultDetailPageUid'];
+
-        $arguments = [ 'product' => $product ];
+        $pageUid = $arguments['defaultDetailPageUid'];
-        if ((int) $referringPageUid > 0) {
+        $uriArguments = [ 'product' => $product ];
-            $arguments['referringPageUid'] = $referringPageUid;
+        if ((int) $arguments['referringPageUid'] > 0) {
+            $uriArguments['referringPageUid'] = $arguments['referringPageUid'];
         }
-        if ($origin !== null) {
+        if ($arguments['origin'] !== null) {
-            $arguments['origin'] = $origin;
+            $uriArguments['origin'] = $arguments['origin'];
         }
-        if ((bool) $linkHotel && $hotel !== null) {
+        if ((bool) $arguments['linkHotel'] && $arguments['hotel'] !== null) {
-            $arguments['hotel'] = $hotel;
+            $uriArguments['hotel'] = $arguments['hotel'];
         }
-        return $this
+        return $renderingContext
-            ->controllerContext
+            ->getControllerContext()
             ->getUriBuilder()
             ->reset()
             ->setTargetPageUid($pageUid)
-            ->uriFor('detail', $arguments, 'Product', 'epproducts', 'product_detail')
+            ->uriFor('detail', $uriArguments, 'Product', 'epproducts', 'product_detail')
         ;
     }
 

web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/VideoViewHelper.php

@@ -28,24 +28,48 @@ namespace EP\EpTheme\ViewHelpers\Uri;
  ***************************************************************/
 
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 class VideoViewHelper extends AbstractViewHelper
 {
+    use CompileWithRenderStatic;
+
     /**
-     * @param string $value
+     * @var bool
-     * @param int $layout
-     * @return string
      */
-    public function render($value, $layout = 1)
+    protected $escapeOutput = false;
+
+    public function initializeArguments()
+    {
+        parent::initializeArguments();
+
+        $this->registerArgument('value', 'string', 'The video url', true);
+        $this->registerArgument('layout', 'int', 'The layout', false, 1);
+    }
+
+    /**
+     * @param array $arguments
+     * @param \Closure $renderChildrenClosure
+     * @param RenderingContextInterface $renderingContext
+     * @return mixed
+     */
+    public static function renderStatic(
+        array $arguments,
+        \Closure $renderChildrenClosure,
+        RenderingContextInterface $renderingContext
+    )
     {
         // YouTube
-        if ((int) $layout === 0) {
+        if ((int) $arguments['layout'] === 0) {
-            return $value . '?rel=0&controls=0&showinfo=0';
+            return $arguments['value'] . '?rel=0&controls=0&showinfo=0';
         }
         // Vimeo
-        if ((int) $layout === 1) {
+        if ((int) $arguments['layout'] === 1) {
-            return sprintf('https://player.vimeo.com/video/%d?html5=1', $value);
+            return sprintf('https://player.vimeo.com/video/%d?html5=1', $arguments['value']);
         }
+
         return '';
     }
+
 }

web/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig

@@ -1,5 +1,5 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Extensions/GridElements.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/RTE.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/RTE.tsconfig">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/TCEFORM.ts">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:ep_theme/Configuration/PageTS/TCEFORM.tsconfig">