diff --git a/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_container.php b/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_container.php index 07a8d2e8..14d1ddbf 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_container.php +++ b/public/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_container.php @@ -1,37 +1,11 @@ configureContainer( - new \B13\Container\Tca\ContainerConfiguration( - 'ep_container_halves', - 'Zweispalter', - '50/50 Aufteilung', - [ - [ - ['name' => 'Elemente', 'colPos' => 300], - ] - ] - ) - ); - - \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer( - new \B13\Container\Tca\ContainerConfiguration( - 'ep_container_thirds', - 'Dreispalter', - '33/33/33 Aufteilung', - [ - [ - ['name' => 'Elemente', 'colPos' => 300], - ] - ] - ) - ); - \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer( new \B13\Container\Tca\ContainerConfiguration( 'ep_container_quarters', 'Vierspalter', - '25/25/25/25 Aufteilung', + '25/25/25/25 Aufteilung mit groß/klein Umschaltung', [ [ ['name' => 'Elemente', 'colPos' => 300], @@ -43,8 +17,8 @@ call_user_func(function () { \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\B13\Container\Tca\Registry::class)->configureContainer( new \B13\Container\Tca\ContainerConfiguration( 'ep_container_teasergroup', - 'Teasergruppe', - 'Für Produktteaser mit groß/klein Umschaltung', + 'Dreispalter', + '33/33/33 Aufteilung mit groß/klein Umschaltung', [ [ ['name' => 'Teaser', 'colPos' => 300], @@ -69,7 +43,7 @@ call_user_func(function () { ' ]; - foreach (['ep_container_halves', 'ep_container_thirds', 'ep_container_quarters', 'ep_container_teasergroup'] as $field) { + foreach (['ep_container_quarters', 'ep_container_teasergroup'] as $field) { $GLOBALS['TCA']['tt_content']['types'][$field] = array_replace_recursive( $GLOBALS['TCA']['tt_content']['types'][$field], $headerConfig diff --git a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig index 66b135eb..999cc9ba 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig +++ b/public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig @@ -91,14 +91,6 @@ TCEFORM { } } ep_container_teasergroup { - disabled = 0 - removeItems := addToList(2,3) - altLabels { - 0 = mit Hintergrund - 1 = ohne Hintergrund - } - } - ep_container_halves { disabled = 0 removeItems := addToList(2,3) altLabels { @@ -106,8 +98,7 @@ TCEFORM { 1 = mit Hintergrund } } - ep_container_thirds < .ep_container_halves - ep_container_quarters < .ep_container_halves + ep_container_quarters < .ep_container_teasergroup } } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html deleted file mode 100644 index 7c082b9d..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Halves.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - -
-
- -
-
- - - - - - -
- - {record.renderedContent -> f:format.raw()} - -
- - - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html index afd9d3b9..d9bd8cd8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Quarters.html @@ -5,29 +5,53 @@ - - - - - - - -
-
+ + + + + + + +
+
+ +
-
- + + - -
- - {record.renderedContent -> f:format.raw()} - +
+ +
+ + +
+
+ + {record.renderedContent -> f:format.raw()} + +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html index 8549c494..848ae1da 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Teasergroup.html @@ -5,19 +5,21 @@ - - -
-
+ + + + + + + +
+
+ +
-
- - - - - - + + @@ -27,31 +29,29 @@ data-teasergrid-disabled-value="false"> - -
- - -
-
- - {record.renderedContent -> f:format.raw()} - -
- +
+ + +
+
+ + {record.renderedContent -> f:format.raw()} + +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html deleted file mode 100644 index 3d51ac99..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Container/Thirds.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - -
-
- -
-
- - - - - - -
- - {record.renderedContent -> f:format.raw()} - -
- - -