diff --git a/.gitignore b/.gitignore index 51235c2..a210dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ typings/ # next.js build output .next +.pnpm-store diff --git a/Classes/ViewHelpers/.gitkeep b/Classes/ViewHelpers/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/Classes/ViewHelpers/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Classes/ViewHelpers/PipeBreakViewHelper.php b/Classes/ViewHelpers/PipeBreakViewHelper.php index 42bf405..c2b81c1 100644 --- a/Classes/ViewHelpers/PipeBreakViewHelper.php +++ b/Classes/ViewHelpers/PipeBreakViewHelper.php @@ -52,7 +52,7 @@ public function initializeArguments() { */ public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) { $trim = empty($arguments['trim']) || (bool)$arguments['trim']; - $parts = explode('|', $renderChildrenClosure()); + $parts = explode('|', (string) $renderChildrenClosure()); return $trim ? array_map('trim', $parts) : $parts; } } diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php index 485c36d..8602392 100644 --- a/Configuration/TCA/Overrides/pages.php +++ b/Configuration/TCA/Overrides/pages.php @@ -32,21 +32,10 @@ 'label' => 'LLL:EXT:bdp_template/Resources/Private/Language/locallang_tca.xlf:pages.bdp_button_link', 'displayCond' => 'FIELD:is_siteroot:=:1', 'config' => [ - 'type' => 'input', - 'renderType' => 'inputLink', + 'type' => 'link', 'size' => 50, - 'max' => 1024, - 'eval' => 'trim', - 'fieldControl' => [ - 'linkPopup' => [ - 'options' => [ - 'title' => 'LLL:EXT:bdp_template/Resources/Private/Language/locallang_tca.xlf:pages.bdp_button_link', - 'blindLinkFields' => 'class,target,title', - 'blindLinkOptions' => 'mail,folder,file,telephone', - ], - ], - ], - 'softref' => 'typolink', + 'allowedTypes' => ['page', 'url', 'record'], + 'appearance' => ['browserTitle' => 'LLL:EXT:bdp_template/Resources/Private/Language/locallang_tca.xlf:pages.bdp_button_link', 'allowedOptions' => ['params', 'rel']], ], ], ], diff --git a/Configuration/TCA/Overrides/tt_content_bdp_text-image.php b/Configuration/TCA/Overrides/tt_content_bdp_text-image.php index 688c0c0..87e9ead 100644 --- a/Configuration/TCA/Overrides/tt_content_bdp_text-image.php +++ b/Configuration/TCA/Overrides/tt_content_bdp_text-image.php @@ -12,14 +12,14 @@ 'renderType' => 'selectSingle', 'items' => [ [ - 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imageorient.I.10', - 0, - 'content-beside-text-img-left' + 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imageorient.I.10', + 'value' => 0, + 'icon' => 'content-beside-text-img-left' ], [ - 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imageorient.I.9', - 1, - 'content-beside-text-img-right' + 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:imageorient.I.9', + 'value' => 1, + 'icon' => 'content-beside-text-img-right' ], ], 'default' => 0, diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript index 96fa780..6861dad 100644 --- a/Configuration/TypoScript/constants.typoscript +++ b/Configuration/TypoScript/constants.typoscript @@ -2,7 +2,6 @@ #### DEPENDENCIES #### ###################### @import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript' -@import 'EXT:typo3_encore/Configuration/TypoScript/constants.typoscript' @import 'EXT:bdp_template/Configuration/TypoScript/Constants/branding.typoscript' @import 'EXT:bdp_template/Configuration/TypoScript/Constants/contact.typoscript' @@ -37,9 +36,9 @@ page { templateRootPath = EXT:bdp_template/Resources/Private/Templates/Page/ } meta { - description = - author = - keywords = + description = + author = + keywords = viewport = width=device-width, initial-scale=1 robots = index,follow apple-mobile-web-app-capable = no @@ -64,10 +63,3 @@ config { headerComment = Bund der Pfadfinderinnen und Pfadfinder e. V. - Arbeitskreis Öffentlichkeitsarbeit sendCacheHeaders = 0 } - -plugin.tx_typo3encore { - settings { - entrypointJsonPath = EXT:bdp_template/Resources/Public/Build/entrypoints.json - manifestJsonPath = EXT:bdp_template/Resources/Public/Build/manifest.json - } -} diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 5fde553..57e9319 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -3,7 +3,6 @@ ###################### @import 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript' @import 'EXT:z7_semantilizer/Configuration/TypoScript/setup.typoscript' -@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript' ################### #### Container #### @@ -243,7 +242,7 @@ page { } includeCSS { - bdptemplate_layout = typo3_encore:pfadfinden + } includeJSLibs { @@ -255,7 +254,7 @@ page { } includeJSFooter { - bdptemplate_layout = typo3_encore:pfadfinden + } } @@ -281,8 +280,8 @@ config { debug = 0 cache_period = 604800 sendCacheHeaders = {$config.sendCacheHeaders} - intTarget = - extTarget = + intTarget = + extTarget = disablePrefixComment = 1 index_enable = 1 index_externals = 1 diff --git a/Configuration/TsConfig/Page/All.tsconfig b/Configuration/page.tsconfig similarity index 94% rename from Configuration/TsConfig/Page/All.tsconfig rename to Configuration/page.tsconfig index 894178f..a3ad469 100644 --- a/Configuration/TsConfig/Page/All.tsconfig +++ b/Configuration/page.tsconfig @@ -1,5 +1,5 @@ # -# PageTS for bdpTemplate +# PageTS for bdp_template # @import 'EXT:bdp_template/Configuration/TsConfig/Page/RTE.tsconfig' @import 'EXT:bdp_template/Configuration/TsConfig/Page/TCEFORM.tsconfig' diff --git a/Configuration/user.tsconfig b/Configuration/user.tsconfig new file mode 100644 index 0000000..5581281 --- /dev/null +++ b/Configuration/user.tsconfig @@ -0,0 +1,4 @@ +# +# UserTS for bdp_template +# +@import 'EXT:bdp_template/Configuration/TsConfig/User/Default.tsconfig' diff --git a/Resources/Private/Layouts/Page/Default.html b/Resources/Private/Layouts/Page/Default.html index e30abf9..fe5147d 100644 --- a/Resources/Private/Layouts/Page/Default.html +++ b/Resources/Private/Layouts/Page/Default.html @@ -1,4 +1,13 @@ +{namespace vac = Praetorius\ViteAssetCollector\ViewHelpers} +
diff --git a/Resources/Private/Layouts/Page/HeaderWithOneColumn.html b/Resources/Private/Layouts/Page/HeaderWithOneColumn.html index 658790d..b2bf4bb 100644 --- a/Resources/Private/Layouts/Page/HeaderWithOneColumn.html +++ b/Resources/Private/Layouts/Page/HeaderWithOneColumn.html @@ -1,4 +1,13 @@ +{namespace vac = Praetorius\ViteAssetCollector\ViewHelpers} +
@@ -6,9 +15,12 @@
-
- -
+ {f:render(section: 'Header', arguments: _all) -> f:variable(name: 'headerContent')} + +
+ {headerContent -> f:format.raw()} +
+
diff --git a/Resources/Private/Partials/Address/Mode_list.html b/Resources/Private/Partials/Address/Mode_list.html index 216c643..fe332ce 100644 --- a/Resources/Private/Partials/Address/Mode_list.html +++ b/Resources/Private/Partials/Address/Mode_list.html @@ -1,6 +1,11 @@ -{namespace encore = Ssch\Typo3Encore\ViewHelpers} - - +{namespace vac = Praetorius\ViteAssetCollector\ViewHelpers} +
diff --git a/Resources/Private/Partials/Address/Mode_lv.html b/Resources/Private/Partials/Address/Mode_lv.html index a62fd69..4a8ef46 100644 --- a/Resources/Private/Partials/Address/Mode_lv.html +++ b/Resources/Private/Partials/Address/Mode_lv.html @@ -1,6 +1,11 @@ -{namespace encore = Ssch\Typo3Encore\ViewHelpers} - - +{namespace vac = Praetorius\ViteAssetCollector\ViewHelpers} +
diff --git a/Resources/Private/Partials/Calendarize/List.html b/Resources/Private/Partials/Calendarize/List.html index 362c07a..998cbc6 100644 --- a/Resources/Private/Partials/Calendarize/List.html +++ b/Resources/Private/Partials/Calendarize/List.html @@ -1,7 +1,13 @@ - + xmlns:vac="http://typo3.org/ns/Praetorius/ViteAssetCollector/ViewHelpers"> +
diff --git a/Resources/Private/Partials/Frontend/Header/All.html b/Resources/Private/Partials/Frontend/Header/All.html index f08279a..08e595c 100644 --- a/Resources/Private/Partials/Frontend/Header/All.html +++ b/Resources/Private/Partials/Frontend/Header/All.html @@ -1,19 +1,25 @@ - +
- - + + - + {data.header} - + - +
diff --git a/Resources/Private/Partials/Page/Footer.html b/Resources/Private/Partials/Page/Footer.html index 885bb8a..9672f03 100644 --- a/Resources/Private/Partials/Page/Footer.html +++ b/Resources/Private/Partials/Page/Footer.html @@ -1,4 +1,4 @@ -{namespace encore = Ssch\Typo3Encore\ViewHelpers} +{namespace vac = Praetorius\ViteAssetCollector\ViewHelpers}