From 2cb8e95933295c2ad0edeb0d1889e0cf94e35976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 4 Oct 2018 17:17:24 +0200 Subject: [PATCH] Remove unused and defunct code --- .../ep_theme/Classes/Hook/PageLayoutView.php | 7 ----- .../ViewHelpers/Uri/ProductViewHelper.php | 4 +-- .../tt_content_element_disturber.php | 3 +- .../ContentElements/disturber.typoscript | 3 -- .../FluidStyledContent/DealOfTheWeek.html | 30 ++----------------- 5 files changed, 6 insertions(+), 41 deletions(-) diff --git a/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php b/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php index 62435f72..91327c7f 100644 --- a/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php +++ b/web/typo3conf/ext/ep_theme/Classes/Hook/PageLayoutView.php @@ -121,13 +121,6 @@ class PageLayoutView implements PageLayoutViewDrawItemHookInterface } $itemContent = 'Störer ' . $size . ''; break; - case 'deal_of_the_week': - if ((int) $row['tx_eptheme_context_product'] > 0) { - $drawItem = false; - $product = BackendUtility::getRecord('tx_epproducts_domain_model_product', $row['tx_eptheme_context_product']); - $itemContent = 'Deal der Woche
' . $product['name']; - } - break; case 'lineup': $drawItem = false; $itemContent = 'Lineup
' . $row['tx_eptheme_lineup'] . ' Einträge'; diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php index e49c02a2..0f28843f 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php @@ -39,12 +39,12 @@ class ProductViewHelper extends AbstractViewHelper { use CompileWithRenderStatic; - public function initializeArgument() + public function initializeArguments() { parent::initializeArguments(); $this->registerArgument('product', Product::class, 'The product', true); - $this->registerArgument('hotel', Hotel::class, 'The hotel'); + $this->registerArgument('hotel', 'mixed', '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'); diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php index e7b3c316..0bcfd5c6 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php @@ -64,8 +64,7 @@ call_user_func(function() { $GLOBALS['TCA']['tt_content']['types']['deal_of_the_week'] = [ 'showitem' => ' - --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general, header, - --palette--;Kontext, tx_eptheme_context_product, tx_eptheme_context_hotel, header_link, bodytext, + --palette--;' . $frontendLanguageFilePrefix . 'palette.general;general, header, header_link, bodytext, --div--;' . $frontendLanguageFilePrefix . 'tabs.appearance, layout;' . $frontendLanguageFilePrefix . 'layout_formlabel, --div--;' . $frontendLanguageFilePrefix . 'tabs.access, diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript index 144d0777..d32d0a30 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript @@ -1,9 +1,6 @@ tt_content.deal_of_the_week =< lib.contentElement tt_content.deal_of_the_week { templateName = DealOfTheWeek - dataProcessing { - 10 = EP\EpTheme\DataProcessing\TeaserProcessor - } } tt_content.disturber =< lib.contentElement diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html index c2f60b21..e8e297e7 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/DealOfTheWeek.html @@ -22,37 +22,13 @@
Angebot
- - - {product.name} - {product.region.name} - - - {data.header} - - + {data.header}
- - - {data.bodytext -> f:format.nl2br()} - - -

{date.nights} Nächte{f:if(condition: product.skipassIncluded, then: ' inkl. Skipass')}
z. B. am {date.dateStart -> f:format.date(format: 'd.m.Y')}

-
-
- -
-

ab {date.minPrice}€{f:if(condition: date.pseudoPrice, then: ' {date.pseudoPrice} €')}

-
+ {data.bodytext -> f:format.nl2br()}
- - Details - - - Details - + Details