From 3b4e2069fd65a5e09b6248444f8b714a334bfff3 Mon Sep 17 00:00:00 2001 From: Markus Klein <markus.klein@typo3.org> Date: Wed, 28 Oct 2015 09:45:08 +0100 Subject: [PATCH] [TASK] Improve default template path for FSC Resolves: #71088 Releases: master Change-Id: Id6304e6ee95b0681a8f2050ddcd2f6dd0d0995e8 Reviewed-on: https://review.typo3.org/44327 Reviewed-by: Mathias Brodala <mbrodala@pagemachine.de> Reviewed-by: Daniel Goerz <ervaude@gmail.com> Tested-by: Daniel Goerz <ervaude@gmail.com> Reviewed-by: Andreas Fernandez <typo3@scripting-base.de> Reviewed-by: Xavier Perseguers <xavier@typo3.org> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> --- .../TypoScript/Static/Setup/lib.fluidContent.ts | 3 +++ .../Configuration/TypoScript/Static/constants.txt | 12 ++++++------ .../Configuration/TypoScript/Static/setup.txt | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts index 5ba9938a9e9e..fd83ac3d628c 100644 --- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts +++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts @@ -4,12 +4,15 @@ lib.fluidContent = FLUIDTEMPLATE lib.fluidContent { templateName = Default templateRootPaths { + 0 = EXT:fluid_styled_content/Resources/Private/Templates/Content/ 10 = {$styles.templates.templateRootPath} } partialRootPaths { + 0 = EXT:fluid_styled_content/Resources/Private/Partials/ 10 = {$styles.templates.partialRootPath} } layoutRootPaths { + 0 = EXT:fluid_styled_content/Resources/Private/Layouts/ 10 = {$styles.templates.layoutRootPath} } settings { diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/constants.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/constants.txt index 099c161dcb6c..5e1d1fa44662 100644 --- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/constants.txt +++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/constants.txt @@ -1,10 +1,10 @@ styles.templates { - # cat=content/templates/b1; type=string; label= Default fallback path of Fluid Templates for all defined content elements - templateRootPath = EXT:fluid_styled_content/Resources/Private/Templates/Content/ - # cat=content/templates/b2; type=string; label= Default fallback path of Fluid Partials for all defined content elements - partialRootPath = EXT:fluid_styled_content/Resources/Private/Partials/ - # cat=content/templates/b3; type=string; label= Default fallback path of Fluid Layouts for all defined content elements - layoutRootPath = EXT:fluid_styled_content/Resources/Private/Layouts/ + # cat=content/templates/b1; type=string; label= Path of Fluid Templates for all defined content elements + templateRootPath = + # cat=content/templates/b2; type=string; label= Path of Fluid Partials for all defined content elements + partialRootPath = + # cat=content/templates/b3; type=string; label= Path of Fluid Layouts for all defined content elements + layoutRootPath = } styles.content { diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/setup.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/setup.txt index 9e8e0f8d3087..04b478cf0754 100644 --- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/setup.txt +++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/setup.txt @@ -1,7 +1,7 @@ -<INCLUDE_TYPOSCRIPT: source="FILE: EXT:fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.parseFunc.ts"> -<INCLUDE_TYPOSCRIPT: source="FILE: EXT:fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts"> -<INCLUDE_TYPOSCRIPT: source="FILE: EXT:fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.stdheader.ts"> -<INCLUDE_TYPOSCRIPT: source="FILE: EXT:fluid_styled_content/Configuration/TypoScript/Static/Setup/styles.content.get.ts"> +<INCLUDE_TYPOSCRIPT: source="FILE:./Setup/lib.parseFunc.ts"> +<INCLUDE_TYPOSCRIPT: source="FILE:./Setup/lib.fluidContent.ts"> +<INCLUDE_TYPOSCRIPT: source="FILE:./Setup/lib.stdheader.ts"> +<INCLUDE_TYPOSCRIPT: source="FILE:./Setup/styles.content.get.ts"> tt_content = CASE tt_content { -- GitLab