Skip to content

Commit

Permalink
[!!!][TASK] New Content Block folder structure (#248)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nhovratov
nhovratov authored Oct 8, 2024
1 parent 4b2a8f3 commit d96cbc5
Show file tree
Hide file tree
Showing 185 changed files with 629 additions and 462 deletions.
0 ...ments/accordion/Assets/accordion_item.svg → ...ments/accordion/assets/accordion_item.svg
View file
File renamed without changes
0 ...entElements/accordion/Assets/Frontend.css → ...entElements/accordion/assets/frontend.css
View file
File renamed without changes.
0 ...tentElements/accordion/Assets/Frontend.js → ...tentElements/accordion/assets/frontend.js
View file
File renamed without changes.
0 ...ContentElements/accordion/Assets/Icon.svg → ...ContentElements/accordion/assets/icon.svg
View file
File renamed without changes
0 ...ements/accordion/Assets/EditorPreview.css → ...tentElements/accordion/assets/preview.css
View file
File renamed without changes.
0 ...ntElements/accordion/EditorInterface.yaml → ...cks/ContentElements/accordion/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ents/accordion/Source/Language/Labels.xlf → ...entElements/accordion/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="example/accordion">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/accordion">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
4 changes: 2 additions & 2 deletions ...ments/accordion/Source/EditorPreview.html → .../accordion/templates/backend-preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbAccordionCssBackend" href="{cb:assetPath()}/EditorPreview.css"/>
<f:asset.css identifier="cbAccordionCssBackend" href="{cb:assetPath()}/preview.css"/>

<div class="cb-accordion">
<f:for each="{data.accordion_item}" as="item">
<be:link.editRecord uid="{item.uid}" table="{item.tableName}">
<be:link.editRecord uid="{item.uid}" table="{item.mainType}">
<div class="accordion-item">
{item.text}
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...ntElements/accordion/Source/Frontend.html → ...lements/accordion/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbAccordionCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.script identifier="cbAccordionJsFrontend" src="{cb:assetPath()}/Frontend.js"/>
<f:asset.css identifier="cbAccordionCssFrontend" href="{cb:assetPath()}/frontend.css"/>
<f:asset.script identifier="cbAccordionJsFrontend" src="{cb:assetPath()}/frontend.js"/>

<div class="cb-accordion">
<f:for each="{data.accordion_item}" as="item">
Expand Down
0 ...nts/card_group/Assets/card_group_item.svg → ...nts/card_group/assets/card_group_item.svg
View file
File renamed without changes
0 ...ntElements/card_group/Assets/Frontend.css → ...ntElements/card_group/assets/frontend.css
View file
File renamed without changes.
0 ...ontentElements/card_group/Assets/Icon.svg → ...ontentElements/card_group/assets/icon.svg
View file
File renamed without changes
0 ...ments/card_group/Assets/EditorPreview.css → ...entElements/card_group/assets/preview.css
View file
File renamed without changes.
0 ...tElements/card_group/EditorInterface.yaml → ...ks/ContentElements/card_group/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nts/card_group/Source/Language/Labels.xlf → ...ntElements/card_group/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="example/card-group">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/card-group">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
4 changes: 2 additions & 2 deletions ...ents/card_group/Source/EditorPreview.html → ...card_group/templates/backend-preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbCardGroupCssBackend" href="{cb:assetPath()}/EditorPreview.css"/>
<f:asset.css identifier="cbCardGroupCssBackend" href="{cb:assetPath()}/preview.css"/>

<div class="cb-card-group">
<f:if condition="{data.card_group_item}">
<div class="card-group-element card-group-element-align-{data.settings.alignment} card-group-element-columns-{data.settings.row_items}">
<f:for each="{data.card_group_item}" as="item" iteration="iteration">

<div class="card-group-element-item">
<be:link.editRecord uid="{item.uid}" table="{item.tableName}">
<be:link.editRecord uid="{item.uid}" table="{item.mainType}">
<div class="card">
<f:if condition="{item.image.0}">
<div class="card-img-top">
Expand Down
4 changes: 2 additions & 2 deletions ...tElements/card_group/Source/Frontend.html → ...ements/card_group/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbCardGroupCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.css identifier="cbCardGroupCssFrontend" href="{cb:assetPath()}/frontend.css"/>

<div class="cb-card-group">
<f:if condition="{data.card_group_item}">
Expand All @@ -16,7 +16,7 @@
<f:if condition="{item.image.0}">
<div class="card-img-top">
<f:render partial="LinkWrap" arguments="{link: item.link, link_title: item.title}" contentAs="content">
<f:image src="{item.image.0.uid}" treatIdAsReference="1"/>
<f:image image="{item.image.0}"/>
</f:render>
</div>
</f:if>
Expand Down
0 .../card_group/Source/Partials/LinkWrap.html → ...rd_group/templates/partials/LinkWrap.html
View file
File renamed without changes.
0 ...s/ContentElements/cta/Assets/Frontend.css → ...s/ContentElements/cta/assets/frontend.css
View file
File renamed without changes.
0 ...locks/ContentElements/cta/Assets/Icon.svg → ...locks/ContentElements/cta/assets/icon.svg
View file
File renamed without changes
0 ...tentElements/cta/Assets/EditorPreview.css → ...ks/ContentElements/cta/assets/preview.css
View file
File renamed without changes.
0 .../ContentElements/cta/EditorInterface.yaml → ...entBlocks/ContentElements/cta/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ntElements/cta/Source/Language/Labels.xlf → ...s/ContentElements/cta/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T15:36:43+00:00" product-name="example/cta">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/cta">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
2 changes: 1 addition & 1 deletion ...entElements/cta/Source/EditorPreview.html → ...ements/cta/templates/backend-preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbCtaCssBackend" href="{cb:assetPath()}/EditorPreview.css"/>
<f:asset.css identifier="cbCtaCssBackend" href="{cb:assetPath()}/preview.css"/>

<div class="cb-cta">
<h2>{data.header}</h2>
Expand Down
4 changes: 2 additions & 2 deletions .../ContentElements/cta/Source/Frontend.html → ...ntentElements/cta/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbCtaCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.css identifier="cbCtaCssFrontend" href="{cb:assetPath()}/frontend.css"/>

<div class="cb-cta">
<f:if condition="{data.background_image}">
<f:variable name="backgroundUrl">{f:uri.image(src:'{data.background_image.0.uid}', treatIdAsReference:1)}</f:variable>
<f:variable name="backgroundUrl">{f:uri.image(image: data.background_image.0)}</f:variable>
<f:variable name="elementBgId">cb-cta-bg-{data.uid}</f:variable>
<f:variable name="backgroundImageStyles">{elementBgId} { background-image: url({backgroundUrl});}</f:variable>
<f:asset.css identifier="cb-cta-bg-{data.uid}">
Expand Down
0 ...ntElements/icon_group/Assets/Frontend.css → ...ntElements/icon_group/assets/frontend.css
View file
File renamed without changes.
0 ...ontentElements/icon_group/Assets/Icon.svg → ...ontentElements/icon_group/assets/icon.svg
View file
File renamed without changes
0 ...nts/icon_group/Assets/icon_group_item.svg → ...nts/icon_group/assets/icon_group_item.svg
View file
File renamed without changes
0 ...ments/icon_group/Assets/EditorPreview.css → ...entElements/icon_group/assets/preview.css
View file
File renamed without changes.
0 ...tElements/icon_group/EditorInterface.yaml → ...ks/ContentElements/icon_group/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nts/icon_group/Source/Language/Labels.xlf → ...ntElements/icon_group/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-05-01T19:02:23+00:00" product-name="example/icon-group">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/icon-group">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
2 changes: 1 addition & 1 deletion ...ents/icon_group/Source/EditorPreview.html → ...icon_group/templates/backend-preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbIconGroupCssBackend" href="{cb:assetPath()}/EditorPreview.css"/>
<f:asset.css identifier="cbIconGroupCssBackend" href="{cb:assetPath()}/preview.css"/>

<div class="cb-icon-group">
<f:if condition="{data.icon_group_item}">
Expand Down
2 changes: 1 addition & 1 deletion ...tElements/icon_group/Source/Frontend.html → ...ements/icon_group/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbIconGroupCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.css identifier="cbIconGroupCssFrontend" href="{cb:assetPath()}/frontend.css"/>

<div class="cb-icon-group">
<f:if condition="{data.icon_group_item}">
Expand Down
0 ...ibrary/SwiffySlider/swiffy-slider.min.css → ...ibrary/SwiffySlider/swiffy-slider.min.css
View file
File renamed without changes.
0 ...Library/SwiffySlider/swiffy-slider.min.js → ...Library/SwiffySlider/swiffy-slider.min.js
View file
File renamed without changes.
0 ...tElements/imageslider/Assets/Frontend.css → ...tElements/imageslider/assets/frontend.css
View file
File renamed without changes.
0 ...ntentElements/imageslider/Assets/Icon.svg → ...ntentElements/imageslider/assets/icon.svg
View file
File renamed without changes
0 ...ents/imageslider/Assets/EditorPreview.css → ...ntElements/imageslider/assets/preview.css
View file
File renamed without changes.
0 ...Elements/imageslider/EditorInterface.yaml → ...s/ContentElements/imageslider/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ts/imageslider/Source/Language/Labels.xlf → ...tElements/imageslider/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="example/imageslider">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/imageslider">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
2 changes: 1 addition & 1 deletion ...nts/imageslider/Source/EditorPreview.html → ...mageslider/templates/backend-preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbImagesliderCssBackend" href="{cb:assetPath()}/EditorPreview.css"/>
<f:asset.css identifier="cbImagesliderCssBackend" href="{cb:assetPath()}/preview.css"/>

<div class="cb-imageslider">
<f:for each="{data.assets}" as="asset">
Expand Down
2 changes: 1 addition & 1 deletion ...Elements/imageslider/Source/Frontend.html → ...ments/imageslider/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<f:asset.css identifier="cbImagesliderCssSwiffySlider" href="{cb:assetPath()}/Library/SwiffySlider/swiffy-slider.min.css"/>
<f:asset.script identifier="cbImagesliderJsSwiffySlider" src="{cb:assetPath()}/Library/SwiffySlider/swiffy-slider.min.js"/>
<f:asset.css identifier="cbImagesliderCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.css identifier="cbImagesliderCssFrontend" href="{cb:assetPath()}/frontend.css"/>

<div class="cb-imageslider">
<div class="swiffy-slider slider-item-ratio slider-item-ratio-16x9 slider-nav-animation slider-nav-animation-fadein slider-item-first-visible" id="swiffy-animation">
Expand Down
0 .../ContentElements/tabs/Assets/Frontend.css → .../ContentElements/tabs/assets/frontend.css
View file
File renamed without changes.
0 ...s/ContentElements/tabs/Assets/Frontend.js → ...s/ContentElements/tabs/assets/frontend.js
View file
File renamed without changes.
0 ...ocks/ContentElements/tabs/Assets/Icon.svg → ...ocks/ContentElements/tabs/assets/icon.svg
View file
File renamed without changes
0 ...ContentElements/tabs/Assets/tabs_item.svg → ...ContentElements/tabs/assets/tabs_item.svg
View file
File renamed without changes
0 ...ContentElements/tabs/EditorInterface.yaml → ...ntBlocks/ContentElements/tabs/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tElements/tabs/Source/Language/Labels.xlf → .../ContentElements/tabs/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="example/tabs">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/tabs">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
0 ...ntElements/tabs/Source/EditorPreview.html → ...ments/tabs/templates/backend-preview.html
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ContentElements/tabs/Source/Frontend.html → ...tentElements/tabs/templates/frontend.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
data-namespace-typo3-fluid="true"
>

<f:asset.css identifier="cbTabsCssFrontend" href="{cb:assetPath()}/Frontend.css"/>
<f:asset.script identifier="cbTabsJsFrontend" src="{cb:assetPath()}/Frontend.js"/>
<f:asset.css identifier="cbTabsCssFrontend" href="{cb:assetPath()}/frontend.css"/>
<f:asset.script identifier="cbTabsJsFrontend" src="{cb:assetPath()}/frontend.js"/>

<div class="cb-tabs">
<div class="tab">
Expand Down
0 ...ocks/ContentElements/text/Assets/Icon.svg → ...ocks/ContentElements/text/assets/icon.svg
View file
File renamed without changes
0 ...ContentElements/text/EditorInterface.yaml → ...ntBlocks/ContentElements/text/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tElements/text/Source/Language/Labels.xlf → .../ContentElements/text/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-30T18:23:22+00:00" product-name="example/text">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/text">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
0 ...ContentElements/text/Source/Frontend.html → ...tentElements/text/templates/frontend.html
View file
File renamed without changes.
0 ...geTypes/example/Assets/IconHideInMenu.svg → ...ypes/example/assets/icon-hide-in-menu.svg
View file
File renamed without changes
0 ...cks/PageTypes/example/Assets/IconRoot.svg → ...ks/PageTypes/example/assets/icon-root.svg
View file
File renamed without changes
0 ...tBlocks/PageTypes/example/Assets/Icon.svg → ...tBlocks/PageTypes/example/assets/icon.svg
View file
File renamed without changes
0 ...ks/PageTypes/example/EditorInterface.yaml → ...ntentBlocks/PageTypes/example/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...eTypes/example/Source/Language/Labels.xlf → ...cks/PageTypes/example/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="example/example-page-type">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="example/example-page-type">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
0 ...Blocks/RecordTypes/notype/Assets/Icon.svg → ...Blocks/RecordTypes/notype/assets/icon.svg
View file
File renamed without changes
0 ...s/RecordTypes/notype/EditorInterface.yaml → ...tentBlocks/RecordTypes/notype/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rdTypes/notype/Source/Language/Labels.xlf → ...ks/RecordTypes/notype/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="hov/notype">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="hov/notype">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
0 ...locks/RecordTypes/record1/Assets/Icon.svg → ...locks/RecordTypes/record1/assets/icon.svg
View file
File renamed without changes
0 .../RecordTypes/record1/EditorInterface.yaml → ...entBlocks/RecordTypes/record1/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dTypes/record1/Source/Language/Labels.xlf → ...s/RecordTypes/record1/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="hov/record1">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="hov/record1">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
0 ...locks/RecordTypes/record2/Assets/Icon.svg → ...locks/RecordTypes/record2/assets/icon.svg
View file
File renamed without changes
0 .../RecordTypes/record2/EditorInterface.yaml → ...entBlocks/RecordTypes/record2/config.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dTypes/record2/Source/Language/Labels.xlf → ...s/RecordTypes/record2/language/labels.xlf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file datatype="plaintext" original="Labels.xlf" source-language="en" date="2024-01-29T13:43:08+00:00" product-name="hov/record2">
<file datatype="plaintext" original="labels.xlf" source-language="en" date="2024-09-20T23:35:32+00:00" product-name="hov/record2">
<header/>
<body>
<trans-unit id="title" resname="title">
Expand Down
34 changes: 20 additions & 14 deletions Classes/Backend/Preview/PageLayout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

namespace TYPO3\CMS\ContentBlocks\Backend\Preview;

use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Controller\Event\ModifyPageLayoutContentEvent;
use TYPO3\CMS\Backend\Module\ModuleData;
use TYPO3\CMS\Backend\Utility\BackendUtility;
Expand All @@ -28,7 +29,9 @@
use TYPO3\CMS\ContentBlocks\Utility\ContentBlockPathUtility;
use TYPO3\CMS\Core\Domain\RecordFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Core\View\ViewFactoryData;
use TYPO3\CMS\Core\View\ViewFactoryInterface;
use TYPO3\CMS\Core\View\ViewInterface;

/**
* @internal Not part of TYPO3's public API.
Expand All @@ -42,6 +45,7 @@ public function __construct(
protected ContentBlockDataDecorator $contentBlockDataDecorator,
protected RootPathsSettings $rootPathsSettings,
protected ContentTypeResolver $contentTypeResolver,
protected ViewFactoryInterface $viewFactory,
) {}

public function __invoke(ModifyPageLayoutContentEvent $event): void
Expand Down Expand Up @@ -74,22 +78,24 @@ public function __invoke(ModifyPageLayoutContentEvent $event): void
return;
}
$contentBlockData = $this->contentBlockDataDecorator->decorate($resolvedRecord);
$view = $this->createView($contentTypeDefinition, $pageUid);
$view->setRequest($request);
$view = $this->createView($contentTypeDefinition, $pageUid, $request);
$view->assign('data', $contentBlockData);
$renderedView = (string)$view->render();
$renderedView = $view->render();
$event->addHeaderContent($renderedView);
}

protected function createView(ContentTypeInterface $contentTypeDefinition, int $pageUid): StandaloneView
protected function createView(ContentTypeInterface $contentTypeDefinition, int $pageUid, ServerRequestInterface $request): ViewInterface
{
$contentBlockPrivatePath = $this->getContentBlockPrivatePath($contentTypeDefinition);
$view = GeneralUtility::makeInstance(StandaloneView::class);
$view->setLayoutRootPaths($this->getContentBlocksLayoutRootPaths($contentBlockPrivatePath, $pageUid));
$view->setPartialRootPaths($this->getContentBlocksPartialRootPaths($contentBlockPrivatePath, $pageUid));
$view->setTemplateRootPaths([$contentBlockPrivatePath]);
$view->setTemplate(ContentBlockPathUtility::getBackendPreviewFileNameWithoutExtension());
return $view;
$layoutRootPaths = $this->getContentBlocksLayoutRootPaths($contentBlockPrivatePath, $pageUid);
$partialRootPaths = $this->getContentBlocksPartialRootPaths($contentBlockPrivatePath, $pageUid);
$viewData = new ViewFactoryData(
partialRootPaths: $partialRootPaths,
layoutRootPaths: $layoutRootPaths,
templatePathAndFilename: $contentBlockPrivatePath . '/' . ContentBlockPathUtility::getBackendPreviewFileName(),
request: $request,
);
return $this->viewFactory->create($viewData);
}

/**
Expand All @@ -98,7 +104,7 @@ protected function createView(ContentTypeInterface $contentTypeDefinition, int $
protected function getContentBlocksPartialRootPaths(string $contentBlockPrivatePath, int $pageUid): array
{
$partialRootPaths = $this->rootPathsSettings->getContentBlocksPartialRootPaths($pageUid);
$partialRootPaths[] = $contentBlockPrivatePath . '/Partials/';
$partialRootPaths[] = $contentBlockPrivatePath . '/partials/';
return $partialRootPaths;
}

Expand All @@ -108,14 +114,14 @@ protected function getContentBlocksPartialRootPaths(string $contentBlockPrivateP
protected function getContentBlocksLayoutRootPaths(string $contentBlockPrivatePath, int $pageUid): array
{
$partialRootPaths = $this->rootPathsSettings->getContentBlocksLayoutRootPaths($pageUid);
$partialRootPaths[] = $contentBlockPrivatePath . '/Layouts';
$partialRootPaths[] = $contentBlockPrivatePath . '/layouts';
return $partialRootPaths;
}

protected function getContentBlockPrivatePath(ContentTypeInterface $contentTypeDefinition): string
{
$contentBlockExtPath = $this->getEditorPreviewExtPath($contentTypeDefinition);
$contentBlockPrivatePath = $contentBlockExtPath . '/' . ContentBlockPathUtility::getPrivateFolder();
$contentBlockPrivatePath = $contentBlockExtPath . '/' . ContentBlockPathUtility::getTemplatesFolder();
return $contentBlockPrivatePath;
}

Expand Down
31 changes: 18 additions & 13 deletions Classes/Backend/Preview/PreviewRenderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
use TYPO3\CMS\ContentBlocks\Utility\ContentBlockPathUtility;
use TYPO3\CMS\Core\Domain\RecordFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Core\View\ViewFactoryData;
use TYPO3\CMS\Core\View\ViewFactoryInterface;
use TYPO3\CMS\Core\View\ViewInterface;

/**
* Sets up Fluid and applies the same DataProcessor as the frontend to the data record.
Expand All @@ -41,6 +43,7 @@ public function __construct(
protected ContentBlockRegistry $contentBlockRegistry,
protected ContentBlockDataDecorator $contentBlockDataDecorator,
protected RootPathsSettings $rootPathsSettings,
protected ViewFactoryInterface $viewFactory,
) {}

public function renderPageModulePreviewContent(GridColumnItem $item): string
Expand All @@ -58,7 +61,7 @@ public function renderPageModulePreviewContent(GridColumnItem $item): string
$contentTypeDefinition = $contentTypeCollection->getFirst();
}
$contentBlockExtPath = $this->contentBlockRegistry->getContentBlockExtPath($contentTypeDefinition->getName());
$contentBlockPrivatePath = $contentBlockExtPath . '/' . ContentBlockPathUtility::getPrivateFolder();
$contentBlockPrivatePath = $contentBlockExtPath . '/' . ContentBlockPathUtility::getTemplatesFolder();

// Fall back to standard preview rendering if EditorPreview.html does not exist.
$editorPreviewExtPath = $contentBlockExtPath . '/' . ContentBlockPathUtility::getBackendPreviewPath();
Expand All @@ -71,23 +74,25 @@ public function renderPageModulePreviewContent(GridColumnItem $item): string
$data = $this->contentBlockDataDecorator->decorate($resolvedRecord, $item->getContext());
$view = $this->createView($contentBlockPrivatePath, $request, $item);
$view->assign('data', $data);
$result = (string)$view->render();
$result = $view->render();
return $result;
}

protected function createView(
string $contentBlockPrivatePath,
ServerRequestInterface $request,
GridColumnItem $item
): StandaloneView {
): ViewInterface {
$pageUid = $item->getContext()->getPageId();
$view = GeneralUtility::makeInstance(StandaloneView::class);
$view->setLayoutRootPaths($this->getContentBlocksLayoutRootPaths($contentBlockPrivatePath, $pageUid));
$view->setPartialRootPaths($this->getContentBlocksPartialRootPaths($contentBlockPrivatePath, $pageUid));
$view->setTemplateRootPaths([$contentBlockPrivatePath]);
$view->setTemplate(ContentBlockPathUtility::getBackendPreviewFileNameWithoutExtension());
$view->setRequest($request);
return $view;
$partialRootPaths = $this->getContentBlocksPartialRootPaths($contentBlockPrivatePath, $pageUid);
$layoutRootPaths = $this->getContentBlocksLayoutRootPaths($contentBlockPrivatePath, $pageUid);
$viewFactoryData = new ViewFactoryData(
partialRootPaths: $partialRootPaths,
layoutRootPaths: $layoutRootPaths,
templatePathAndFilename: $contentBlockPrivatePath . '/' . ContentBlockPathUtility::getBackendPreviewFileName(),
request: $request
);
return $this->viewFactory->create($viewFactoryData);
}

/**
Expand All @@ -100,7 +105,7 @@ protected function getContentBlocksPartialRootPaths(string $contentBlockPrivateP
'EXT:backend/Resources/Private/Partials/',
'EXT:content_blocks/Resources/Private/Partials/',
...$contentBlockPartialRootPaths,
$contentBlockPrivatePath . '/Partials/',
$contentBlockPrivatePath . '/partials/',
];
return $partialRootPaths;
}
Expand All @@ -111,7 +116,7 @@ protected function getContentBlocksPartialRootPaths(string $contentBlockPrivateP
protected function getContentBlocksLayoutRootPaths(string $contentBlockPrivatePath, int $pageUid): array
{
$layoutRootPaths = $this->rootPathsSettings->getContentBlocksLayoutRootPaths($pageUid);
$layoutRootPaths[] = $contentBlockPrivatePath . '/Layouts/';
$layoutRootPaths[] = $contentBlockPrivatePath . '/layouts/';
return $layoutRootPaths;
}
}
Loading

0 comments on commit d96cbc5

Please sign in to comment.