From e2c241d8ef5ac86a102c1b100ee4a69b9633f2d1 Mon Sep 17 00:00:00 2001 From: David Mellen Date: Wed, 31 Jan 2024 09:49:14 +0100 Subject: [PATCH 1/2] feat: move footer to initialData REHLTYEXT-81 --- .../FooterConfiguration.typoscript | 27 ------------------- .../InitialDataConfiguration.typoscript | 11 ++++++++ .../ContentElement/FooterContent.typoscript | 16 +++++------ Configuration/TypoScript/constants.typoscript | 3 --- 4 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 Configuration/TypoScript/Configuration/FooterConfiguration.typoscript diff --git a/Configuration/TypoScript/Configuration/FooterConfiguration.typoscript b/Configuration/TypoScript/Configuration/FooterConfiguration.typoscript deleted file mode 100644 index a34abfb..0000000 --- a/Configuration/TypoScript/Configuration/FooterConfiguration.typoscript +++ /dev/null @@ -1,27 +0,0 @@ -footer = PAGE -footer { - typeNum = {$plugin.tx_headless.footer.typeNum} - config { - no_cache = 0 - sendCacheHeaders = 1 - debug = 0 - admPanel = 0 - disableAllHeaderCode = 1 - additionalHeaders.10 { - header = Content-Type: application/json; charset=utf-8 - replace = 1 - } - } - - 10 = CONTENT - 10 { - table = tt_content - select { - orderBy = sorting - where = {#colPos} = 1687238527 - max = 1 - } - slide = -1 - stdWrap.ifEmpty.cObject = JSON - } -} diff --git a/Configuration/TypoScript/Configuration/InitialDataConfiguration.typoscript b/Configuration/TypoScript/Configuration/InitialDataConfiguration.typoscript index 5a7b172..68bc7a0 100644 --- a/Configuration/TypoScript/Configuration/InitialDataConfiguration.typoscript +++ b/Configuration/TypoScript/Configuration/InitialDataConfiguration.typoscript @@ -16,6 +16,17 @@ initialData { } } } + footer = CONTENT + footer { + table = tt_content + select { + orderBy = sorting + where = {#colPos} = 1687238527 + max = 1 + } + slide = -1 + stdWrap.ifEmpty.cObject = JSON + } } } } diff --git a/Configuration/TypoScript/ContentElement/FooterContent.typoscript b/Configuration/TypoScript/ContentElement/FooterContent.typoscript index 50db6ea..ec99ef8 100644 --- a/Configuration/TypoScript/ContentElement/FooterContent.typoscript +++ b/Configuration/TypoScript/ContentElement/FooterContent.typoscript @@ -1,14 +1,10 @@ -tt_content.footer_content =< lib.contentElement +tt_content.footer_content = JSON tt_content.footer_content { - fields { - content { - dataProcessing { - 10 = Remind\Headless\DataProcessing\FlexFormProcessor - 10 { - fieldName = pi_flexform - as = flexform - } - } + dataProcessing { + 10 = Remind\Headless\DataProcessing\FlexFormProcessor + 10 { + fieldName = pi_flexform + as = flexform } } } diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript index 72d10bd..790ed69 100644 --- a/Configuration/TypoScript/constants.typoscript +++ b/Configuration/TypoScript/constants.typoscript @@ -5,7 +5,4 @@ plugin.tx_headless { pid = 0 pid := getEnv(LOGIN_PID) } - footer { - typeNum = 836 - } } From 29fcbb12cee60a999afae80ee45f3236db0fd560 Mon Sep 17 00:00:00 2001 From: David Mellen Date: Wed, 31 Jan 2024 10:32:19 +0100 Subject: [PATCH 2/2] style: change indentation in backend layouts to 4 spaces --- .../Page/BackendLayouts/default.tsconfig | 64 +++++++++--------- .../Page/BackendLayouts/root.tsconfig | 66 +++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/Configuration/TSConfig/Page/BackendLayouts/default.tsconfig b/Configuration/TSConfig/Page/BackendLayouts/default.tsconfig index e2096f9..65c19a0 100644 --- a/Configuration/TSConfig/Page/BackendLayouts/default.tsconfig +++ b/Configuration/TSConfig/Page/BackendLayouts/default.tsconfig @@ -1,39 +1,39 @@ mod { - web_layout { - BackendLayouts { - default { - title = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:default - config { - backend_layout { - colCount = 1 - rowCount = 2 - rows { - 1 { - columns { - 1 { - name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.above_breadcrumbs - colPos = 1687238554 - disallowed { - CType = footer_content + web_layout { + BackendLayouts { + default { + title = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:default + config { + backend_layout { + colCount = 1 + rowCount = 2 + rows { + 1 { + columns { + 1 { + name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.above_breadcrumbs + colPos = 1687238554 + disallowed { + CType = footer_content + } + } + } + } + 2 { + columns { + 1 { + name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.main + colPos = 0 + disallowed { + CType = footer_content + } + } + } + } + } } - } } - } - 2 { - columns { - 1 { - name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.main - colPos = 0 - disallowed { - CType = footer_content - } - } - } - } } - } } - } } - } } diff --git a/Configuration/TSConfig/Page/BackendLayouts/root.tsconfig b/Configuration/TSConfig/Page/BackendLayouts/root.tsconfig index 9b26928..8e2c726 100644 --- a/Configuration/TSConfig/Page/BackendLayouts/root.tsconfig +++ b/Configuration/TSConfig/Page/BackendLayouts/root.tsconfig @@ -1,40 +1,40 @@ mod { - web_layout { - BackendLayouts { - root { - title = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:root - config { - backend_layout { - colCount = 1 - rowCount = 2 - rows { - 1 { - columns { - 1 { - name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.main - colPos = 0 - disallowed { - CType = footer_content + web_layout { + BackendLayouts { + root { + title = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:root + config { + backend_layout { + colCount = 1 + rowCount = 2 + rows { + 1 { + columns { + 1 { + name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.main + colPos = 0 + disallowed { + CType = footer_content + } + } + } + } + 2 { + columns { + 1 { + name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.footer + colPos = 1687238527 + allowed { + CType = footer_content + } + maxitems = 1 + } + } + } + } } - } } - } - 2 { - columns { - 1 { - name = LLL:EXT:rmnd_headless/Resources/Private/Language/locallang_bl.xlf:column.footer - colPos = 1687238527 - allowed { - CType = footer_content - } - maxitems = 1 - } - } - } } - } } - } } - } }