From 7e2f77ed75fce7f9d2c2098cf38316b54b0fc9d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Thu, 16 Sep 2021 09:59:24 +0200 Subject: [PATCH] WIP Continue migration --- .../Classes/Controller/ConceptController.php | 5 +- .../Private/Partials/Disturber/Small.html | 59 +++++---- .../Private/Templates/Concept/Detail.html | 119 ++++++++++-------- 3 files changed, 99 insertions(+), 84 deletions(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php index 7cac6b83..92fbda8b 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php @@ -65,12 +65,13 @@ class ConceptController extends ActionController $conceptUid = $this->settings['conceptUid']; $concept = $this->conceptRepository->findByIdentifier($conceptUid); } + $teaserConceptUids = GeneralUtility::trimExplode(',', $this->settings['additionalConceptUids']); if (null !== $concept) { array_unshift($teaserConceptUids, $concept->getUid()); } - $filterSettings = new FilterSettings(); - $filterSettings->setConceptUids($teaserConceptUids); + + $filterSettings = ['conceptUids' => $teaserConceptUids]; $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true); $limit = $this->settings['showMoreLink'] ? 4 : 0; $teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html index fa0899a9..06d1f57a 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html @@ -1,38 +1,43 @@ -
-
-
-
-
- - - {teaserImage.alternative} - - - - - -
-
- {data.header} - {data.bodytext -> f:format.html()} -
-
- - -
{button.container.label}
- - -
+
+
+ +
+
+
+ + + {teaserImage.alternative} + + + + + +
+
+ + {data.header} + + {data.bodytext -> f:format.html()} +
+ + + + {button.container.label} + + +
+
+
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html index b9612d07..ba55192d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html @@ -9,71 +9,80 @@ -
- -
- -
- - -
-
- {concept.description -> f:format.html()} - -
-
-
    - -
  • - -
    • -     -
+
+
+ +
+ +
+ + +
+
+ {concept.description -> f:format.html()} + +
+ + +
-
- -

- + Alle anzeigen + + + {concept.descriptionExtended -> f:format.html()} +

+
+ + - - {concept.descriptionExtended -> f:format.html()} -
-
- - - -
    - -
  • - - {page.title} - -
    • -     + + +
  • + + {page.title} + +
    • +     +
- +