[FEATURE] Use new TypoScript and TSConfig files extension 83/57083/6
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Tue, 29 May 2018 20:29:56 +0000 (22:29 +0200)
committerBenni Mack <benni@typo3.org>
Wed, 30 May 2018 20:56:11 +0000 (22:56 +0200)
It was decided to use .typoscript and .tsconfig
The patch renames the files and adds little BC layer which allows
you to include TypoScript files using old (.txt) file extension.

Resolves: #81686
Releases: master
Change-Id: Id6784e4f573e2e0b060f37d241c07216ac5678e1
Reviewed-on: https://review.typo3.org/57083
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
139 files changed:
typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.ts [deleted file]
typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig [new file with mode: 0644]
typo3/sysext/backend/ext_localconf.php
typo3/sysext/belog/Classes/Controller/AbstractController.php
typo3/sysext/belog/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/belog/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/belog/ext_typoscript_setup.txt [deleted file]
typo3/sysext/belog/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/beuser/Classes/Controller/BackendUserController.php
typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
typo3/sysext/beuser/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/beuser/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/beuser/ext_typoscript_setup.txt [deleted file]
typo3/sysext/beuser/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
typo3/sysext/core/Documentation/Changelog/master/Deprecation-81686-AccessingCoreTypoScriptWithTxtFileExtensionHasBeenDeprecated.rst [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.txt [deleted file]
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts [deleted file]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts [deleted file]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts [deleted file]
typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.txt [deleted file]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.txt [deleted file]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.txt [deleted file]
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.ts [deleted file]
typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts [deleted file]
typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.typoscript [new file with mode: 0644]
typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedContentTest.php
typo3/sysext/extbase/ext_typoscript_setup.txt [deleted file]
typo3/sysext/extbase/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/extensionmanager/ext_typoscript_setup.txt [deleted file]
typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/fluid/ext_typoscript_setup.txt [deleted file]
typo3/sysext/fluid/ext_typoscript_setup.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Documentation/Configuration/OverridingFluidTemplates/Index.rst
typo3/sysext/fluid_styled_content/Documentation/Configuration/TypoScript/Index.rst
typo3/sysext/form/Configuration/PageTS/modWizards.ts [deleted file]
typo3/sysext/form/Configuration/PageTS/modWizards.tsconfig [new file with mode: 0644]
typo3/sysext/form/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/form/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/form/Documentation/Concepts/Configuration/Index.rst
typo3/sysext/form/Documentation/FAQ/Index.rst
typo3/sysext/form/ext_localconf.php
typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig [new file with mode: 0644]
typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.txt [deleted file]
typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig [new file with mode: 0644]
typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.txt [deleted file]
typo3/sysext/frontend/Tests/Functional/Rendering/LocalizedContentRenderingTest.php
typo3/sysext/frontend/ext_localconf.php
typo3/sysext/indexed_search/Configuration/TypoScript/constants.txt [deleted file]
typo3/sysext/indexed_search/Configuration/TypoScript/constants.typoscript [new file with mode: 0644]
typo3/sysext/indexed_search/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/indexed_search/Configuration/TypoScript/setup.typoscript [new file with mode: 0644]
typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.tsconfig [new file with mode: 0644]
typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.txt [deleted file]
typo3/sysext/linkvalidator/ext_localconf.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php

diff --git a/typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.ts b/typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.ts
deleted file mode 100644 (file)
index ddc9757..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# dummy placeholders for item groups
-mod.wizards.newContentElement.wizardItems {
-    common.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common
-    menu.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu
-    special.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special
-    forms.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms
-    plugins.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins
-    plugins.elements {
-        general {
-            iconIdentifier = content-plugin
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins_general_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins_general_description
-            tt_content_defValues.CType = list
-        }
-    }
-    plugins.show = *
-}
diff --git a/typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig b/typo3/sysext/backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig
new file mode 100644 (file)
index 0000000..ddc9757
--- /dev/null
@@ -0,0 +1,17 @@
+# dummy placeholders for item groups
+mod.wizards.newContentElement.wizardItems {
+    common.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common
+    menu.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu
+    special.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special
+    forms.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:forms
+    plugins.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins
+    plugins.elements {
+        general {
+            iconIdentifier = content-plugin
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins_general_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:plugins_general_description
+            tt_content_defValues.CType = list
+        }
+    }
+    plugins.show = *
+}
index 5c9d699..c06b037 100644 (file)
@@ -39,7 +39,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tsfebeuserauth.php'
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['livesearch']['page'] = 'pages';
 
 // Include base TSconfig setup
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.ts">');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:backend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">');
 
 // Register BackendLayoutDataProvider for PageTs
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['BackendLayoutDataProvider']['pagets'] = \TYPO3\CMS\Backend\Provider\PageTsBackendLayoutDataProvider::class;
index a525dbe..f4d7aa6 100644 (file)
@@ -124,7 +124,7 @@ abstract class AbstractController extends ActionController
     {
         // @TODO: Extbase backend modules rely on frontend TypoScript for view, persistence
         // and settings. Thus, we need a TypoScript root template, that then loads the
-        // ext_typoscript_setup.txt file of this module. This is nasty, but can not be
+        // ext_typoscript_setup.typoscript file of this module. This is nasty, but can not be
         // circumvented until there is a better solution in extbase.
         // For now we throw an exception if no settings are detected.
         if (empty($this->settings)) {
diff --git a/typo3/sysext/belog/Configuration/TypoScript/setup.txt b/typo3/sysext/belog/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index 9e51518..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-module.tx_belog {
-       persistence.classes {
-               TYPO3\CMS\Belog\Domain\Model\LogEntry {
-                       mapping {
-                               tableName = sys_log
-                               columns {
-                                       userid.mapOnProperty = backendUserUid
-                                       recuid.mapOnProperty = recordUid
-                                       tablename.mapOnProperty = tableName
-                                       recpid.mapOnProperty = recordPid
-                                       details_nr.mapOnProperty = detailsNumber
-                                       IP.mapOnProperty = ip
-                                       workspace.mapOnProperty = workspaceUid
-                                       NEWid.mapOnProperty = newId
-                               }
-                       }
-               }
-               TYPO3\CMS\Belog\Domain\Model\Workspace {
-                       mapping {
-                               tableName = sys_workspace
-                       }
-               }
-       }
-
-       settings {
-               selectableNumberOfLogEntries {
-                       20 = 20
-                       50 = 50
-                       100 = 100
-                       200 = 200
-                       500 = 500
-                       1000 = 1000
-                       1000000 = any
-               }
-
-               selectableTimeFrames {
-                       0 = thisWeek
-                       1 = lastWeek
-                       2 = last7Days
-                       10 = thisMonth
-                       11 = lastMonth
-                       12 = last31Days
-                       20 = noLimit
-                       30 = userDefined
-               }
-
-               selectableActions {
-                       0 = any
-                       1 = actionDatabase
-                       2 = actionFile
-                       3 = actionCache
-                       254 = actionSettings
-                       255 = actionLogin
-                       -1 = actionErrors
-               }
-       }
-}
\ No newline at end of file
diff --git a/typo3/sysext/belog/Configuration/TypoScript/setup.typoscript b/typo3/sysext/belog/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..9e51518
--- /dev/null
@@ -0,0 +1,57 @@
+module.tx_belog {
+       persistence.classes {
+               TYPO3\CMS\Belog\Domain\Model\LogEntry {
+                       mapping {
+                               tableName = sys_log
+                               columns {
+                                       userid.mapOnProperty = backendUserUid
+                                       recuid.mapOnProperty = recordUid
+                                       tablename.mapOnProperty = tableName
+                                       recpid.mapOnProperty = recordPid
+                                       details_nr.mapOnProperty = detailsNumber
+                                       IP.mapOnProperty = ip
+                                       workspace.mapOnProperty = workspaceUid
+                                       NEWid.mapOnProperty = newId
+                               }
+                       }
+               }
+               TYPO3\CMS\Belog\Domain\Model\Workspace {
+                       mapping {
+                               tableName = sys_workspace
+                       }
+               }
+       }
+
+       settings {
+               selectableNumberOfLogEntries {
+                       20 = 20
+                       50 = 50
+                       100 = 100
+                       200 = 200
+                       500 = 500
+                       1000 = 1000
+                       1000000 = any
+               }
+
+               selectableTimeFrames {
+                       0 = thisWeek
+                       1 = lastWeek
+                       2 = last7Days
+                       10 = thisMonth
+                       11 = lastMonth
+                       12 = last31Days
+                       20 = noLimit
+                       30 = userDefined
+               }
+
+               selectableActions {
+                       0 = any
+                       1 = actionDatabase
+                       2 = actionFile
+                       3 = actionCache
+                       254 = actionSettings
+                       255 = actionLogin
+                       -1 = actionErrors
+               }
+       }
+}
\ No newline at end of file
diff --git a/typo3/sysext/belog/ext_typoscript_setup.txt b/typo3/sysext/belog/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index 037126a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:belog/Configuration/TypoScript/setup.txt">
\ No newline at end of file
diff --git a/typo3/sysext/belog/ext_typoscript_setup.typoscript b/typo3/sysext/belog/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..3b0a45d
--- /dev/null
@@ -0,0 +1 @@
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:belog/Configuration/TypoScript/setup.typoscript">
index b932f51..a2edc0d 100644 (file)
@@ -117,7 +117,7 @@ class BackendUserController extends BackendUserActionController
     {
         // @TODO: Extbase backend modules relies on frontend TypoScript for view, persistence
         // and settings. Thus, we need a TypoScript root template, that then loads the
-        // ext_typoscript_setup.txt file of this module. This is nasty, but can not be
+        // ext_typoscript_setup.typoscript file of this module. This is nasty, but can not be
         // circumvented until there is a better solution in extbase.
         // For now we throw an exception if no settings are detected.
         if (empty($this->settings)) {
index 4f1dc19..00b3783 100644 (file)
@@ -43,7 +43,7 @@ class BackendUserGroupController extends BackendUserActionController
     {
         // @TODO: Extbase backend modules relies on frontend TypoScript for view, persistence
         // and settings. Thus, we need a TypoScript root template, that then loads the
-        // ext_typoscript_setup.txt file of this module. This is nasty, but can not be
+        // ext_typoscript_setup.typoscript file of this module. This is nasty, but can not be
         // circumvented until there is a better solution in extbase.
         // For now we throw an exception if no settings are detected.
         if (empty($this->settings)) {
diff --git a/typo3/sysext/beuser/Configuration/TypoScript/setup.txt b/typo3/sysext/beuser/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index 6ec5be8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-// Model/table mapping
-config.tx_extbase.persistence.classes {
-       TYPO3\CMS\Beuser\Domain\Model\BackendUser {
-               mapping {
-                       tableName = be_users
-                       columns {
-                               allowed_languages.mapOnProperty = allowedLanguages
-                               file_mountpoints.mapOnProperty = fileMountPoints
-                               db_mountpoints.mapOnProperty = dbMountPoints
-                               usergroup.mapOnProperty = backendUserGroups
-                       }
-               }
-       }
-       TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup {
-               mapping {
-                       tableName = be_groups
-                       columns {
-                               subgroup.mapOnProperty = subGroups
-                       }
-               }
-       }
-}
-
-module.tx_beuser {
-       persistence {
-               storagePid = 0
-       }
-
-       settings {
-               // This is a dummy entry. It is used in \TYPO3\CMS\Beuser\Controller\BackendUserController
-               // to test that some TypoScript configuration is set.
-               // This entry can be removed if extbase setup is made frontend TS independent
-               // or if there are other settings set.
-               dummy = foo
-       }
-}
\ No newline at end of file
diff --git a/typo3/sysext/beuser/Configuration/TypoScript/setup.typoscript b/typo3/sysext/beuser/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..6ec5be8
--- /dev/null
@@ -0,0 +1,36 @@
+// Model/table mapping
+config.tx_extbase.persistence.classes {
+       TYPO3\CMS\Beuser\Domain\Model\BackendUser {
+               mapping {
+                       tableName = be_users
+                       columns {
+                               allowed_languages.mapOnProperty = allowedLanguages
+                               file_mountpoints.mapOnProperty = fileMountPoints
+                               db_mountpoints.mapOnProperty = dbMountPoints
+                               usergroup.mapOnProperty = backendUserGroups
+                       }
+               }
+       }
+       TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup {
+               mapping {
+                       tableName = be_groups
+                       columns {
+                               subgroup.mapOnProperty = subGroups
+                       }
+               }
+       }
+}
+
+module.tx_beuser {
+       persistence {
+               storagePid = 0
+       }
+
+       settings {
+               // This is a dummy entry. It is used in \TYPO3\CMS\Beuser\Controller\BackendUserController
+               // to test that some TypoScript configuration is set.
+               // This entry can be removed if extbase setup is made frontend TS independent
+               // or if there are other settings set.
+               dummy = foo
+       }
+}
\ No newline at end of file
diff --git a/typo3/sysext/beuser/ext_typoscript_setup.txt b/typo3/sysext/beuser/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index f07dc5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:beuser/Configuration/TypoScript/setup.txt">
\ No newline at end of file
diff --git a/typo3/sysext/beuser/ext_typoscript_setup.typoscript b/typo3/sysext/beuser/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..78688e7
--- /dev/null
@@ -0,0 +1 @@
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:beuser/Configuration/TypoScript/setup.typoscript">
index 5ae0370..e276d3f 100644 (file)
@@ -885,7 +885,7 @@ class TypoScriptParser
 
                 // load default TypoScript for content rendering templates like
                 // fluid_styled_content if those have been included through f.e.
-                // <INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/setup.txt">
+                // <INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript">
                 if (strpos(strtolower($filename), 'ext:') === 0) {
                     $filePointerPathParts = explode('/', substr($filename, 4));
 
@@ -1079,19 +1079,36 @@ class TypoScriptParser
             // Check for allowed files
             if (!GeneralUtility::verifyFilenameAgainstDenyPattern($absfilename)) {
                 $newString .= self::typoscriptIncludeError('File "' . $filename . '" was not included since it is not allowed due to fileDenyPattern.');
-            } elseif (!@file_exists($absfilename)) {
-                $newString .= self::typoscriptIncludeError('File "' . $filename . '" was not found.');
             } else {
-                $includedFiles[] = $absfilename;
-                // check for includes in included text
-                $included_text = self::checkIncludeLines(file_get_contents($absfilename), $cycle_counter + 1, $returnFiles, $absfilename);
-                // If the method also has to return all included files, merge currently included
-                // files with files included by recursively calling itself
-                if ($returnFiles && is_array($included_text)) {
-                    $includedFiles = array_merge($includedFiles, $included_text['files']);
-                    $included_text = $included_text['typoscript'];
+                $fileExists = false;
+                if (@file_exists($absfilename)) {
+                    $fileExists = true;
+                } else {
+                    // BC layer after renaming core TypoScript files from .txt to .typoscript
+                    if (substr($absfilename, -4, 4) === '.txt') {
+                        $absfilename = substr($absfilename, 0, -4) . '.typoscript';
+                        if (@file_exists($absfilename)) {
+                            trigger_error('The TypoScript file ' . $filename . ' was renamed to .typoscript extension.'
+                                . ' Update your "<INCLUDE_TYPOSCRIPT" statements.', E_USER_DEPRECATED);
+                            $fileExists = true;
+                        }
+                    }
+                }
+
+                if ($fileExists) {
+                    $includedFiles[] = $absfilename;
+                    // check for includes in included text
+                    $included_text = self::checkIncludeLines(file_get_contents($absfilename), $cycle_counter + 1, $returnFiles, $absfilename);
+                    // If the method also has to return all included files, merge currently included
+                    // files with files included by recursively calling itself
+                    if ($returnFiles && is_array($included_text)) {
+                        $includedFiles = array_merge($includedFiles, $included_text['files']);
+                        $included_text = $included_text['typoscript'];
+                    }
+                    $newString .= $included_text . LF;
+                } else {
+                    $newString .= self::typoscriptIncludeError('File "' . $filename . '" was not found.');
                 }
-                $newString .= $included_text . LF;
             }
         }
         $newString .= '### <INCLUDE_TYPOSCRIPT: source="FILE:' . $filename . '"' . $optionalProperties . '> END:' . LF . LF;
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-81686-AccessingCoreTypoScriptWithTxtFileExtensionHasBeenDeprecated.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-81686-AccessingCoreTypoScriptWithTxtFileExtensionHasBeenDeprecated.rst
new file mode 100644 (file)
index 0000000..f602c40
--- /dev/null
@@ -0,0 +1,42 @@
+.. include:: ../../Includes.txt
+
+============================================================================================
+Deprecation: #81686 - Accessing core TypoScript with .txt file extension has been deprecated
+============================================================================================
+
+See :issue:`81686`
+
+Description
+===========
+
+TYPO3 Core TypoScript files were renamed from :file:`.txt` extension to :file:`.typoscript` and :file:`.tsconfig`.
+The backward compatibility layer has been introduced for :typoscript:`<INCLUDE_TYPOSCRIPT` inclusion.
+If including file with :file:`.txt` does not exists, then TYPO3 will try to load a file with :file:`.typoscript` extension.
+
+
+Impact
+======
+
+Installations including Core TypoScript using old file extension will report a deprecation notice.
+
+
+Migration
+=========
+
+Rename file name from :file:`.txt` to :file:`.typoscript` extension.
+For example code like:
+
+.. code-block:: typoscript
+
+   <INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/setup.txt">
+   <INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/constants.txt">
+
+should be changed to:
+
+.. code-block:: typoscript
+
+   <INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/TypoScript/setup.typoscript">
+   <INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript">
+
+
+.. index:: TSConfig, TypoScript, NotScanned
index 3152cfc..4cef5b2 100644 (file)
@@ -54,7 +54,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultElements');
         $this->importDataSet('PACKAGE:typo3/testing-framework/Resources/Core/Functional/Fixtures/sys_file_storage.xml');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
         $this->backendUser->workspace = 0;
     }
 
index 20846c3..db8256b 100644 (file)
@@ -88,8 +88,8 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\FAL\Abstr
         $this->assertAssertionDataSet('copyContentToLanguage');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections();
         $this->assertThat($responseSections, $this->getRequestSectionHasRecordConstraint()
index af39992..4ac52e0 100644 (file)
@@ -48,7 +48,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultElements');
         $this->importScenarioDataSet('ReferenceIndex');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
     }
 
     /**
index 12bfc7f..88ee453 100644 (file)
@@ -245,8 +245,8 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Group\Abs
         $this->assertAssertionDataSet('copyContentToLanguageOfRelation');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections();
         $this->assertThat($responseSections, $this->getRequestSectionStructureHasRecordConstraint()
index 61be400..796ba82 100644 (file)
@@ -48,7 +48,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultPages');
         $this->importScenarioDataSet('LiveDefaultElements');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
         $this->backendUser->workspace = 0;
     }
 
index 7b74765..143f4d7 100644 (file)
@@ -113,8 +113,8 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\IRRE\CSV\
         $this->assertAssertionDataSet('copyParentContentToLanguage');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections();
         $this->assertThat($responseSections, $this->getRequestSectionStructureHasRecordConstraint()
index 9c26360..57b32e0 100644 (file)
@@ -58,8 +58,8 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->setUpFrontendRootPage(
             1,
             [
-                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts',
+                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+                'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript',
             ]
         );
         $this->backendUser->workspace = 0;
index 8e1ab4e..46d0db5 100644 (file)
@@ -113,9 +113,9 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\IRRE\Fore
         $this->assertAssertionDataSet('copyParentContentToLanguageWAllChildren');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections('Default', 'Extbase:list()');
         $this->assertThat($responseSections, $this->getRequestSectionStructureHasRecordConstraint()
index 74b6851..e6c243f 100644 (file)
@@ -48,7 +48,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultPages');
         $this->importScenarioDataSet('LiveDefaultElements');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
         $this->backendUser->workspace = 0;
     }
 
index 613086a..a43f280 100644 (file)
@@ -45,7 +45,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultPages');
         $this->importScenarioDataSet('LiveDefaultElements');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
         $this->backendUser->workspace = 0;
     }
 
index 32cd9b1..86cddca 100644 (file)
@@ -125,8 +125,8 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Regular\A
         $this->assertAssertionDataSet('copyContentToLanguage');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageId)->getResponseSections();
         $this->assertThat($responseSections, $this->getRequestSectionHasRecordConstraint()
@@ -143,8 +143,8 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Regular\A
         $this->assertAssertionDataSet('copyContentToLanguageFromNonDefaultLanguage');
 
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts'
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript'
         ]);
         $responseSections = $this->getFrontendResponse(self::VALUE_PageId, self::VALUE_LanguageIdSecond)->getResponseSections();
         $this->assertThat($responseSections, $this->getRequestSectionHasRecordConstraint()
index c06a072..033f058 100644 (file)
@@ -47,7 +47,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
         $this->importScenarioDataSet('LiveDefaultElements');
         $this->importScenarioDataSet('ReferenceIndex');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript']);
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.txt b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.txt
deleted file mode 100644 (file)
index 15a2cbb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-plugin.tx_irretutorial {
-       view {
-               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template root (FE)
-               templateRootPath = EXT:irre_tutorial/Resources/Private/Templates/
-               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template partials (FE)
-               partialRootPath = EXT:irre_tutorial/Resources/Private/Partials/
-               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template layouts (FE)
-               layoutRootPath = EXT:irre_tutorial/Resources/Private/Layouts/
-       }
-       persistence {
-               # cat=plugin.tx_irretutorial//a; type=string; label=Default storage PID
-               storagePid =
-       }
-}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/constants.typoscript
new file mode 100644 (file)
index 0000000..15a2cbb
--- /dev/null
@@ -0,0 +1,15 @@
+
+plugin.tx_irretutorial {
+       view {
+               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template root (FE)
+               templateRootPath = EXT:irre_tutorial/Resources/Private/Templates/
+               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template partials (FE)
+               partialRootPath = EXT:irre_tutorial/Resources/Private/Partials/
+               # cat=plugin.tx_irretutorial/file; type=string; label=Path to template layouts (FE)
+               layoutRootPath = EXT:irre_tutorial/Resources/Private/Layouts/
+       }
+       persistence {
+               # cat=plugin.tx_irretutorial//a; type=string; label=Default storage PID
+               storagePid =
+       }
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.txt b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index b614b93..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-plugin.tx_irretutorial {
-       view {
-               templateRootPath = {$plugin.tx_irretutorial.view.templateRootPath}
-               partialRootPath = {$plugin.tx_irretutorial.view.partialRootPath}
-               layoutRootPath = {$plugin.tx_irretutorial.view.layoutRootPath}
-       }
-       persistence {
-               storagePid.data = page:uid
-               classes {
-                       OliverHader\IrreTutorial\Domain\Model\Content {
-                               mapping {
-                                       tableName = tt_content
-                                       columns {
-                                               tx_irretutorial_1nff_hotels.mapOnProperty = hotels
-                                       }
-                               }
-                       }
-                       OliverHader\IrreTutorial\Domain\Model\Hotel {
-                               mapping {
-                                       tableName = tx_irretutorial_1nff_hotel
-                               }
-                       }
-                       OliverHader\IrreTutorial\Domain\Model\Offer {
-                               mapping {
-                                       tableName = tx_irretutorial_1nff_offer
-                               }
-                       }
-                       OliverHader\IrreTutorial\Domain\Model\Price {
-                               mapping {
-                                       tableName = tx_irretutorial_1nff_price
-                               }
-                       }
-               }
-       }
-}
-
-plugin.tx_irretutorial._CSS_DEFAULT_STYLE (
-       textarea.f3-form-error {
-               background-color:#FF9F9F;
-               border: 1px #FF0000 solid;
-       }
-
-       input.f3-form-error {
-               background-color:#FF9F9F;
-               border: 1px #FF0000 solid;
-       }
-
-       .tx-irre-tutorial table {
-               border-collapse:separate;
-               border-spacing:10px;
-       }
-
-       .tx-irre-tutorial table th {
-               font-weight:bold;
-       }
-
-       .tx-irre-tutorial table td {
-               vertical-align:top;
-       }
-
-       .typo3-messages .message-error {
-               color:red;
-       }
-
-       .typo3-messages .message-ok {
-               color:green;
-       }
-)
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..b614b93
--- /dev/null
@@ -0,0 +1,68 @@
+plugin.tx_irretutorial {
+       view {
+               templateRootPath = {$plugin.tx_irretutorial.view.templateRootPath}
+               partialRootPath = {$plugin.tx_irretutorial.view.partialRootPath}
+               layoutRootPath = {$plugin.tx_irretutorial.view.layoutRootPath}
+       }
+       persistence {
+               storagePid.data = page:uid
+               classes {
+                       OliverHader\IrreTutorial\Domain\Model\Content {
+                               mapping {
+                                       tableName = tt_content
+                                       columns {
+                                               tx_irretutorial_1nff_hotels.mapOnProperty = hotels
+                                       }
+                               }
+                       }
+                       OliverHader\IrreTutorial\Domain\Model\Hotel {
+                               mapping {
+                                       tableName = tx_irretutorial_1nff_hotel
+                               }
+                       }
+                       OliverHader\IrreTutorial\Domain\Model\Offer {
+                               mapping {
+                                       tableName = tx_irretutorial_1nff_offer
+                               }
+                       }
+                       OliverHader\IrreTutorial\Domain\Model\Price {
+                               mapping {
+                                       tableName = tx_irretutorial_1nff_price
+                               }
+                       }
+               }
+       }
+}
+
+plugin.tx_irretutorial._CSS_DEFAULT_STYLE (
+       textarea.f3-form-error {
+               background-color:#FF9F9F;
+               border: 1px #FF0000 solid;
+       }
+
+       input.f3-form-error {
+               background-color:#FF9F9F;
+               border: 1px #FF0000 solid;
+       }
+
+       .tx-irre-tutorial table {
+               border-collapse:separate;
+               border-spacing:10px;
+       }
+
+       .tx-irre-tutorial table th {
+               font-weight:bold;
+       }
+
+       .tx-irre-tutorial table td {
+               vertical-align:top;
+       }
+
+       .typo3-messages .message-error {
+               color:red;
+       }
+
+       .typo3-messages .message-ok {
+               color:green;
+       }
+)
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.ts
deleted file mode 100644 (file)
index fb774f4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:irre_tutorial/Configuration/TypoScript/setup.txt">
-
-page {
-       20 = COA
-       20 {
-               10 = USER
-               10 {
-                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-                       extensionName = IrreTutorial
-                       pluginName = Irre
-                       vendorName = OliverHader
-               }
-               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
-               stdWrap.postUserFunc.as = Extbase
-       }
-}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/ExtbaseJsonRenderer.typoscript
new file mode 100644 (file)
index 0000000..22a01a8
--- /dev/null
@@ -0,0 +1,16 @@
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:irre_tutorial/Configuration/TypoScript/setup.typoscript">
+
+page {
+       20 = COA
+       20 {
+               10 = USER
+               10 {
+                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
+                       extensionName = IrreTutorial
+                       pluginName = Irre
+                       vendorName = OliverHader
+               }
+               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
+               stdWrap.postUserFunc.as = Extbase
+       }
+}
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts
deleted file mode 100644 (file)
index f930203..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-config {
-       no_cache = 1
-       debug = 0
-       xhtml_cleaning = 0
-       admPanel = 0
-       disableAllHeaderCode = 1
-       sendCacheHeaders = 0
-       sys_language_uid = 0
-       sys_language_mode = ignore
-       sys_language_overlay = 1
-       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
-       additionalHeaders.10.replace = 1
-
-       watcher {
-               tableFields {
-                       pages = uid,_PAGES_OVERLAY_UID,pid,sorting,title,tx_irretutorial_hotels
-                       sys_category = uid,_ORIG_uid,_LOCALIZED_UID,pid,sys_language_uid,title,parent,items,sys_language_uid
-                       sys_file = uid,_ORIG_uid,_LOCALIZED_UID,pid,title,sys_language_uid
-                       sys_file_reference = uid,_ORIG_uid,_LOCALIZED_UID,title,description,alternative,link,missing,identifier,file,pid,sys_language_uid,title,parent,items,sys_language_uid,uid_local,uid_foreign,tablenames,fieldname,table_local
-                       tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_irretutorial_1nff_hotels
-                       tx_irretutorial_1nff_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
-                       tx_irretutorial_1nff_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
-                       tx_irretutorial_1nff_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
-                       tx_irretutorial_1ncsv_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
-                       tx_irretutorial_1ncsv_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
-                       tx_irretutorial_1ncsv_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
-                       tx_testdatahandler_element = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title
-               }
-       }
-}
-
-lib.watcherDataObject = COA
-lib.watcherDataObject {
-       1 = LOAD_REGISTER
-       1.watcher.dataWrap = |
-       2 = USER
-       2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
-       99 = RESTORE_REGISTER
-}
-
-lib.watcherFileObject = COA
-lib.watcherFileObject {
-       1 = LOAD_REGISTER
-       1.watcher.dataWrap = |
-       2 = USER
-       2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addFileData
-       99 = RESTORE_REGISTER
-}
-
-page = PAGE
-page {
-       10 = COA
-       10 {
-               1 = LOAD_REGISTER
-               1.watcher.dataWrap = pages:{field:uid}
-               2 = USER
-               2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
-               10 = CONTENT
-               10 {
-                       stdWrap.required = 1
-                       table = pages
-                       select {
-                               orderBy = sorting
-                               pidInList = this
-                               # prevent sys_language_uid lookup
-                               languageField = 0
-                       }
-                       renderObj < lib.watcherDataObject
-                       renderObj.1.watcher.dataWrap = {register:watcher}|.__pages/pages:{field:uid}
-               }
-               15 = CONTENT
-               15 {
-                       if.isTrue.field = tx_irretutorial_hotels
-                       table = tx_irretutorial_1nff_hotel
-                       select {
-                               orderBy = sorting
-                               where.field = uid
-                               where.intval = 1
-                               where.wrap = parenttable='pages' AND parentid=|
-                       }
-                       renderObj < lib.watcherDataObject
-                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_hotels/tx_irretutorial_1nff_hotel:{field:uid}
-               }
-               20 = CONTENT
-               20 {
-                       table = tt_content
-                       select {
-                               orderBy = sorting
-                               where = {#colPos}=0
-                       }
-                       renderObj < lib.watcherDataObject
-                       renderObj.1.watcher.dataWrap = {register:watcher}|.__contents/tt_content:{field:uid}
-                       renderObj {
-                               10 = CONTENT
-                               10 {
-                                       if.isTrue.field = categories
-                                       table = sys_category
-                                       select {
-                                               pidInList = root,-1
-                                               selectFields = sys_category.*
-                                               join = sys_category_record_mm ON sys_category_record_mm.uid_local = sys_category.uid
-                                               where.data = field:_ORIG_uid // field:_LOCALIZED_UID // field:uid
-                                               where.intval = 1
-                                               where.wrap = sys_category_record_mm.uid_foreign=|
-                                               orderBy = sys_category_record_mm.sorting_foreign
-                                               languageField = sys_category.sys_language_uid
-                                       }
-                                       renderObj < lib.watcherDataObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.categories/sys_category:{field:uid}
-                               }
-                               20 = CONTENT
-                               20 {
-                                       if.isTrue.field = tx_irretutorial_1nff_hotels
-                                       table = tx_irretutorial_1nff_hotel
-                                       select {
-                                               orderBy = sorting
-                                               where.field = uid
-                                               where.intval = 1
-                                               where.wrap = parenttable='tt_content' AND parentid=|
-                                       }
-                                       renderObj < lib.watcherDataObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_1nff_hotels/tx_irretutorial_1nff_hotel:{field:uid}
-                                       renderObj {
-                                               10 = CONTENT
-                                               10 {
-                                                       if.isTrue.field = offers
-                                                       table = tx_irretutorial_1nff_offer
-                                                       select {
-                                                               orderBy = sorting
-                                                               where.field = uid
-                                                               where.intval = 1
-                                                               where.wrap = parenttable='tx_irretutorial_1nff_hotel' AND parentid=|
-                                                       }
-                                                       renderObj < lib.watcherDataObject
-                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_irretutorial_1nff_offer:{field:uid}
-                                                       renderObj {
-                                                               10 = CONTENT
-                                                               10 {
-                                                                       if.isTrue.field = prices
-                                                                       table = tx_irretutorial_1nff_price
-                                                                       select {
-                                                                               orderBy = sorting
-                                                                               where.field = uid
-                                                                               where.intval = 1
-                                                                               where.wrap = parenttable='tx_irretutorial_1nff_offer' AND parentid=|
-                                                                       }
-                                                                       renderObj < lib.watcherDataObject
-                                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_irretutorial_1nff_price:{field:uid}
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               30 = CONTENT
-                               30 {
-                                       if.isTrue.field = tx_irretutorial_1ncsv_hotels
-                                       table = tx_irretutorial_1ncsv_hotel
-                                       select {
-                                               uidInList.data = field:tx_irretutorial_1ncsv_hotels
-                                               orderBy = sorting
-                                               # prevent sys_language_uid lookup
-                                               languageField = 0
-                                       }
-                                       renderObj < lib.watcherDataObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_1ncsv_hotels/tx_irretutorial_1ncsv_hotel:{field:uid}
-                                       renderObj {
-                                               10 = CONTENT
-                                               10 {
-                                                       if.isTrue.field = offers
-                                                       table = tx_irretutorial_1ncsv_offer
-                                                       select {
-                                                               uidInList.data = field:offers
-                                                               orderBy = sorting
-                                                               # prevent sys_language_uid lookup
-                                                               languageField = 0
-                                                       }
-                                                       renderObj < lib.watcherDataObject
-                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_irretutorial_1ncsv_offer:{field:uid}
-                                                       renderObj {
-                                                               10 = CONTENT
-                                                               10 {
-                                                                       if.isTrue.field = prices
-                                                                       table = tx_irretutorial_1ncsv_price
-                                                                       select {
-                                                                               uidInList.data = field:prices
-                                                                               orderBy = sorting
-                                                                               # prevent sys_language_uid lookup
-                                                                               languageField = 0
-                                                                       }
-                                                                       renderObj < lib.watcherDataObject
-                                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_irretutorial_1ncsv_price:{field:uid}
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               40 = FILES
-                               40 {
-                                       if.isTrue.field = image
-                                       references {
-                                               fieldName = image
-                                       }
-                                       renderObj < lib.watcherFileObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.image/
-                               }
-                               50 = CONTENT
-                               50 {
-                                       if.isTrue.field = tx_testdatahandler_select
-                                       table = tx_testdatahandler_element
-                                       select {
-                                               uidInList.data = field:tx_testdatahandler_select
-                                               pidInList = 0
-                                               orderBy = sorting
-                                               # prevent sys_language_uid lookup
-                                               languageField = 0
-                                       }
-                                       renderObj < lib.watcherDataObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testdatahandler_select/tx_testdatahandler_element:{field:uid}
-                               }
-                               60 = CONTENT
-                               60 {
-                                       if.isTrue.field = tx_testdatahandler_group
-                                       table = tx_testdatahandler_element
-                                       select {
-                                               uidInList.data = field:tx_testdatahandler_group
-                                               pidInList = 0
-                                               orderBy = sorting
-                                               # prevent sys_language_uid lookup
-                                               languageField = 0
-                                       }
-                                       renderObj < lib.watcherDataObject
-                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testdatahandler_group/tx_testdatahandler_element:{field:uid}
-                               }
-                       }
-               }
-               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->attachSection
-               stdWrap.postUserFunc.as = Default
-       }
-       99999 = COA
-       99999 {
-               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderValues
-               stdWrap.postUserFunc.values {
-                       page.children {
-                               uid.data = page:uid
-                               pid.data = page:pid
-                               title.data = page:title
-                       }
-                       tsfe.children {
-                               sys_language_uid.data = tsfe:sys_language_uid
-                               sys_language_mode.data = tsfe:sys_language_mode
-                               sys_language_content.data = tsfe:sys_language_content
-                               sys_language_contentOL.data = tsfe:sys_language_contentOL
-                       }
-               }
-               stdWrap.postUserFunc.as = Scope
-       }
-       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
-}
-
-[globalVar = GP:L = 1]
-config.sys_language_uid = 1
-[end]
-[globalVar = GP:L = 2]
-config.sys_language_uid = 2
-[end]
-[globalVar = GP:L = 3]
-config.sys_language_uid = 3
-[end]
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript
new file mode 100644 (file)
index 0000000..f930203
--- /dev/null
@@ -0,0 +1,268 @@
+config {
+       no_cache = 1
+       debug = 0
+       xhtml_cleaning = 0
+       admPanel = 0
+       disableAllHeaderCode = 1
+       sendCacheHeaders = 0
+       sys_language_uid = 0
+       sys_language_mode = ignore
+       sys_language_overlay = 1
+       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
+       additionalHeaders.10.replace = 1
+
+       watcher {
+               tableFields {
+                       pages = uid,_PAGES_OVERLAY_UID,pid,sorting,title,tx_irretutorial_hotels
+                       sys_category = uid,_ORIG_uid,_LOCALIZED_UID,pid,sys_language_uid,title,parent,items,sys_language_uid
+                       sys_file = uid,_ORIG_uid,_LOCALIZED_UID,pid,title,sys_language_uid
+                       sys_file_reference = uid,_ORIG_uid,_LOCALIZED_UID,title,description,alternative,link,missing,identifier,file,pid,sys_language_uid,title,parent,items,sys_language_uid,uid_local,uid_foreign,tablenames,fieldname,table_local
+                       tt_content = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,header,categories,tx_irretutorial_1nff_hotels
+                       tx_irretutorial_1nff_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
+                       tx_irretutorial_1nff_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
+                       tx_irretutorial_1nff_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
+                       tx_irretutorial_1ncsv_hotel = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,offers
+                       tx_irretutorial_1ncsv_offer = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,prices
+                       tx_irretutorial_1ncsv_price = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title,price
+                       tx_testdatahandler_element = uid,_ORIG_uid,_LOCALIZED_UID,pid,sorting,sys_language_uid,title
+               }
+       }
+}
+
+lib.watcherDataObject = COA
+lib.watcherDataObject {
+       1 = LOAD_REGISTER
+       1.watcher.dataWrap = |
+       2 = USER
+       2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+       99 = RESTORE_REGISTER
+}
+
+lib.watcherFileObject = COA
+lib.watcherFileObject {
+       1 = LOAD_REGISTER
+       1.watcher.dataWrap = |
+       2 = USER
+       2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addFileData
+       99 = RESTORE_REGISTER
+}
+
+page = PAGE
+page {
+       10 = COA
+       10 {
+               1 = LOAD_REGISTER
+               1.watcher.dataWrap = pages:{field:uid}
+               2 = USER
+               2.userFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->addRecordData
+               10 = CONTENT
+               10 {
+                       stdWrap.required = 1
+                       table = pages
+                       select {
+                               orderBy = sorting
+                               pidInList = this
+                               # prevent sys_language_uid lookup
+                               languageField = 0
+                       }
+                       renderObj < lib.watcherDataObject
+                       renderObj.1.watcher.dataWrap = {register:watcher}|.__pages/pages:{field:uid}
+               }
+               15 = CONTENT
+               15 {
+                       if.isTrue.field = tx_irretutorial_hotels
+                       table = tx_irretutorial_1nff_hotel
+                       select {
+                               orderBy = sorting
+                               where.field = uid
+                               where.intval = 1
+                               where.wrap = parenttable='pages' AND parentid=|
+                       }
+                       renderObj < lib.watcherDataObject
+                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_hotels/tx_irretutorial_1nff_hotel:{field:uid}
+               }
+               20 = CONTENT
+               20 {
+                       table = tt_content
+                       select {
+                               orderBy = sorting
+                               where = {#colPos}=0
+                       }
+                       renderObj < lib.watcherDataObject
+                       renderObj.1.watcher.dataWrap = {register:watcher}|.__contents/tt_content:{field:uid}
+                       renderObj {
+                               10 = CONTENT
+                               10 {
+                                       if.isTrue.field = categories
+                                       table = sys_category
+                                       select {
+                                               pidInList = root,-1
+                                               selectFields = sys_category.*
+                                               join = sys_category_record_mm ON sys_category_record_mm.uid_local = sys_category.uid
+                                               where.data = field:_ORIG_uid // field:_LOCALIZED_UID // field:uid
+                                               where.intval = 1
+                                               where.wrap = sys_category_record_mm.uid_foreign=|
+                                               orderBy = sys_category_record_mm.sorting_foreign
+                                               languageField = sys_category.sys_language_uid
+                                       }
+                                       renderObj < lib.watcherDataObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.categories/sys_category:{field:uid}
+                               }
+                               20 = CONTENT
+                               20 {
+                                       if.isTrue.field = tx_irretutorial_1nff_hotels
+                                       table = tx_irretutorial_1nff_hotel
+                                       select {
+                                               orderBy = sorting
+                                               where.field = uid
+                                               where.intval = 1
+                                               where.wrap = parenttable='tt_content' AND parentid=|
+                                       }
+                                       renderObj < lib.watcherDataObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_1nff_hotels/tx_irretutorial_1nff_hotel:{field:uid}
+                                       renderObj {
+                                               10 = CONTENT
+                                               10 {
+                                                       if.isTrue.field = offers
+                                                       table = tx_irretutorial_1nff_offer
+                                                       select {
+                                                               orderBy = sorting
+                                                               where.field = uid
+                                                               where.intval = 1
+                                                               where.wrap = parenttable='tx_irretutorial_1nff_hotel' AND parentid=|
+                                                       }
+                                                       renderObj < lib.watcherDataObject
+                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_irretutorial_1nff_offer:{field:uid}
+                                                       renderObj {
+                                                               10 = CONTENT
+                                                               10 {
+                                                                       if.isTrue.field = prices
+                                                                       table = tx_irretutorial_1nff_price
+                                                                       select {
+                                                                               orderBy = sorting
+                                                                               where.field = uid
+                                                                               where.intval = 1
+                                                                               where.wrap = parenttable='tx_irretutorial_1nff_offer' AND parentid=|
+                                                                       }
+                                                                       renderObj < lib.watcherDataObject
+                                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_irretutorial_1nff_price:{field:uid}
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               30 = CONTENT
+                               30 {
+                                       if.isTrue.field = tx_irretutorial_1ncsv_hotels
+                                       table = tx_irretutorial_1ncsv_hotel
+                                       select {
+                                               uidInList.data = field:tx_irretutorial_1ncsv_hotels
+                                               orderBy = sorting
+                                               # prevent sys_language_uid lookup
+                                               languageField = 0
+                                       }
+                                       renderObj < lib.watcherDataObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_irretutorial_1ncsv_hotels/tx_irretutorial_1ncsv_hotel:{field:uid}
+                                       renderObj {
+                                               10 = CONTENT
+                                               10 {
+                                                       if.isTrue.field = offers
+                                                       table = tx_irretutorial_1ncsv_offer
+                                                       select {
+                                                               uidInList.data = field:offers
+                                                               orderBy = sorting
+                                                               # prevent sys_language_uid lookup
+                                                               languageField = 0
+                                                       }
+                                                       renderObj < lib.watcherDataObject
+                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.offers/tx_irretutorial_1ncsv_offer:{field:uid}
+                                                       renderObj {
+                                                               10 = CONTENT
+                                                               10 {
+                                                                       if.isTrue.field = prices
+                                                                       table = tx_irretutorial_1ncsv_price
+                                                                       select {
+                                                                               uidInList.data = field:prices
+                                                                               orderBy = sorting
+                                                                               # prevent sys_language_uid lookup
+                                                                               languageField = 0
+                                                                       }
+                                                                       renderObj < lib.watcherDataObject
+                                                                       renderObj.1.watcher.dataWrap = {register:watcher}|.prices/tx_irretutorial_1ncsv_price:{field:uid}
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               40 = FILES
+                               40 {
+                                       if.isTrue.field = image
+                                       references {
+                                               fieldName = image
+                                       }
+                                       renderObj < lib.watcherFileObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.image/
+                               }
+                               50 = CONTENT
+                               50 {
+                                       if.isTrue.field = tx_testdatahandler_select
+                                       table = tx_testdatahandler_element
+                                       select {
+                                               uidInList.data = field:tx_testdatahandler_select
+                                               pidInList = 0
+                                               orderBy = sorting
+                                               # prevent sys_language_uid lookup
+                                               languageField = 0
+                                       }
+                                       renderObj < lib.watcherDataObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testdatahandler_select/tx_testdatahandler_element:{field:uid}
+                               }
+                               60 = CONTENT
+                               60 {
+                                       if.isTrue.field = tx_testdatahandler_group
+                                       table = tx_testdatahandler_element
+                                       select {
+                                               uidInList.data = field:tx_testdatahandler_group
+                                               pidInList = 0
+                                               orderBy = sorting
+                                               # prevent sys_language_uid lookup
+                                               languageField = 0
+                                       }
+                                       renderObj < lib.watcherDataObject
+                                       renderObj.1.watcher.dataWrap = {register:watcher}|.tx_testdatahandler_group/tx_testdatahandler_element:{field:uid}
+                               }
+                       }
+               }
+               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Collector->attachSection
+               stdWrap.postUserFunc.as = Default
+       }
+       99999 = COA
+       99999 {
+               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderValues
+               stdWrap.postUserFunc.values {
+                       page.children {
+                               uid.data = page:uid
+                               pid.data = page:pid
+                               title.data = page:title
+                       }
+                       tsfe.children {
+                               sys_language_uid.data = tsfe:sys_language_uid
+                               sys_language_mode.data = tsfe:sys_language_mode
+                               sys_language_content.data = tsfe:sys_language_content
+                               sys_language_contentOL.data = tsfe:sys_language_contentOL
+                       }
+               }
+               stdWrap.postUserFunc.as = Scope
+       }
+       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+}
+
+[globalVar = GP:L = 1]
+config.sys_language_uid = 1
+[end]
+[globalVar = GP:L = 2]
+config.sys_language_uid = 2
+[end]
+[globalVar = GP:L = 3]
+config.sys_language_uid = 3
+[end]
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.ts
deleted file mode 100644 (file)
index ea34270..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-config {
-       sys_language_overlay = 0
-}
\ No newline at end of file
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRendererNoOverlay.typoscript
new file mode 100644 (file)
index 0000000..ea34270
--- /dev/null
@@ -0,0 +1,3 @@
+config {
+       sys_language_overlay = 0
+}
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.txt b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.txt
deleted file mode 100644 (file)
index 51b049c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
- # Include BlogExample default styles
-
-page.includeCSS.tx_blogexample = EXT:blog_example/Resources/Public/Css/BlogExample.css
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.typoscript b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/DefaultStyles/setup.typoscript
new file mode 100644 (file)
index 0000000..51b049c
--- /dev/null
@@ -0,0 +1,3 @@
+ # Include BlogExample default styles
+
+page.includeCSS.tx_blogexample = EXT:blog_example/Resources/Public/Css/BlogExample.css
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.txt b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.txt
deleted file mode 100644 (file)
index 0790585..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-plugin.tx_blogexample {
-       settings {
-                # cat=plugin.tx_blogexample/a; type=int+; label=Editor FE Usergroup uid:Enter the uid of the FE Usergroup that should be allowed to edit Blogs and Post in the frontend
-               editorUsergroupUid = 1
-                # cat=plugin.tx_blogexample/a; type=int+; label=Plaintext page type:If the default plaintext page typenum (778) conflicts with your setup, you can override this setting here
-               plaintextPageType = 778
-       }
-       view {
-                # cat=plugin.tx_blogexample/file; type=string; label=Path to template root (FE)
-               templateRootPath = EXT:blog_example/Resources/Private/Templates/
-                # cat=plugin.tx_blogexample/file; type=string; label=Path to template partials (FE)
-               partialRootPath = EXT:blog_example/Resources/Private/Partials/
-                # cat=plugin.tx_blogexample/file; type=string; label=Path to template layouts (FE)
-               layoutRootPath = EXT:blog_example/Resources/Private/Layouts/
-       }
-       persistence {
-                # cat=plugin.tx_blogexample//a; type=int+; label=Default storage PID
-               storagePid =
-       }
-}
-module.tx_blogexample {
-       view {
-                # cat=module.tx_blogexample/file; type=string; label=Path to template root (BE)
-               templateRootPath = EXT:blog_example/Resources/Private/Backend/Templates/
-                # cat=module.tx_blogexample/file; type=string; label=Path to template partials (BE)
-               partialRootPath = EXT:blog_example/Resources/Private/Partials/
-                # cat=module.tx_blogexample/file; type=string; label=Path to template layouts (BE)
-               layoutRootPath = EXT:blog_example/Resources/Private/Backend/Layouts/
-       }
-}
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.typoscript b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/constants.typoscript
new file mode 100644 (file)
index 0000000..0790585
--- /dev/null
@@ -0,0 +1,30 @@
+plugin.tx_blogexample {
+       settings {
+                # cat=plugin.tx_blogexample/a; type=int+; label=Editor FE Usergroup uid:Enter the uid of the FE Usergroup that should be allowed to edit Blogs and Post in the frontend
+               editorUsergroupUid = 1
+                # cat=plugin.tx_blogexample/a; type=int+; label=Plaintext page type:If the default plaintext page typenum (778) conflicts with your setup, you can override this setting here
+               plaintextPageType = 778
+       }
+       view {
+                # cat=plugin.tx_blogexample/file; type=string; label=Path to template root (FE)
+               templateRootPath = EXT:blog_example/Resources/Private/Templates/
+                # cat=plugin.tx_blogexample/file; type=string; label=Path to template partials (FE)
+               partialRootPath = EXT:blog_example/Resources/Private/Partials/
+                # cat=plugin.tx_blogexample/file; type=string; label=Path to template layouts (FE)
+               layoutRootPath = EXT:blog_example/Resources/Private/Layouts/
+       }
+       persistence {
+                # cat=plugin.tx_blogexample//a; type=int+; label=Default storage PID
+               storagePid =
+       }
+}
+module.tx_blogexample {
+       view {
+                # cat=module.tx_blogexample/file; type=string; label=Path to template root (BE)
+               templateRootPath = EXT:blog_example/Resources/Private/Backend/Templates/
+                # cat=module.tx_blogexample/file; type=string; label=Path to template partials (BE)
+               partialRootPath = EXT:blog_example/Resources/Private/Partials/
+                # cat=module.tx_blogexample/file; type=string; label=Path to template layouts (BE)
+               layoutRootPath = EXT:blog_example/Resources/Private/Backend/Layouts/
+       }
+}
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.txt b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index 5ce83c7..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
- # Plugin configuration
-plugin.tx_blogexample {
-       settings {
-                # maximum number of posts to display per page
-               postsPerPage = 3
-                # Editor FE Usergroup uid
-               editorUsergroupUid = {$plugin.tx_blogexample.settings.editorUsergroupUid}
-                # Plaintext page type number
-               plaintextPageType = {$plugin.tx_blogexample.settings.plaintextPageType}
-       }
-       persistence {
-               storagePid = {$plugin.tx_blogexample.persistence.storagePid}
-       }
-       view {
-               templateRootPath = {$plugin.tx_blogexample.view.templateRootPath}
-               partialRootPath = {$plugin.tx_blogexample.view.partialRootPath}
-               layoutRootPath = {$plugin.tx_blogexample.view.layoutRootPath}
-               defaultPid = auto
-       }
-       # This is an example how to modify the translation
-       _LOCAL_LANG {
-               default {
-                       someUnusedKey = foo
-               }
-       }
-}
-
- # Module configuration
-module.tx_blogexample {
-       settings < plugin.tx_blogexample.settings
-       persistence < plugin.tx_blogexample.persistence
-       view < plugin.tx_blogexample.view
-       view {
-               templateRootPath = {$module.tx_blogexample.view.templateRootPath}
-               partialRootPath = {$module.tx_blogexample.view.partialRootPath}
-               layoutRootPath = {$module.tx_blogexample.view.layoutRootPath}
-       }
-}
-
- # plaintext rendering
-tx_blogexample_plaintext = PAGE
-tx_blogexample_plaintext {
-       typeNum = {$plugin.tx_blogexample.settings.plaintextPageType}
-       10 = USER
-       10 {
-               userFunc = tx_extbase_core_bootstrap->run
-               extensionName = BlogExample
-               pluginName = PostList
-               switchableControllerActions {
-                       Post {
-                               1 = index
-                       }
-               }
-       }
-       config {
-               admPanel = 0
-               no_cache = 1
-               disableAllHeaderCode = 1
-               additionalHeaders.10.header = Content-Type: text/plain
-               additionalHeaders.10.replace = 1
-               defaultGetVars {
-                       tx_blogexample_postlist.format = txt
-               }
-       }
-}
-
- # Adjust plaintext rendering, if blog_example runs as single, fully fledged plugin
-[globalVar = TYPO3_CONF_VARS|EXTCONF|blog_example|registerSinglePlugin > 0]
-       tx_blogexample_plaintext {
-               10.pluginName = Pi1
-               #config.defaultGetVars =
-       }
-[end]
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.typoscript b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..5ce83c7
--- /dev/null
@@ -0,0 +1,73 @@
+ # Plugin configuration
+plugin.tx_blogexample {
+       settings {
+                # maximum number of posts to display per page
+               postsPerPage = 3
+                # Editor FE Usergroup uid
+               editorUsergroupUid = {$plugin.tx_blogexample.settings.editorUsergroupUid}
+                # Plaintext page type number
+               plaintextPageType = {$plugin.tx_blogexample.settings.plaintextPageType}
+       }
+       persistence {
+               storagePid = {$plugin.tx_blogexample.persistence.storagePid}
+       }
+       view {
+               templateRootPath = {$plugin.tx_blogexample.view.templateRootPath}
+               partialRootPath = {$plugin.tx_blogexample.view.partialRootPath}
+               layoutRootPath = {$plugin.tx_blogexample.view.layoutRootPath}
+               defaultPid = auto
+       }
+       # This is an example how to modify the translation
+       _LOCAL_LANG {
+               default {
+                       someUnusedKey = foo
+               }
+       }
+}
+
+ # Module configuration
+module.tx_blogexample {
+       settings < plugin.tx_blogexample.settings
+       persistence < plugin.tx_blogexample.persistence
+       view < plugin.tx_blogexample.view
+       view {
+               templateRootPath = {$module.tx_blogexample.view.templateRootPath}
+               partialRootPath = {$module.tx_blogexample.view.partialRootPath}
+               layoutRootPath = {$module.tx_blogexample.view.layoutRootPath}
+       }
+}
+
+ # plaintext rendering
+tx_blogexample_plaintext = PAGE
+tx_blogexample_plaintext {
+       typeNum = {$plugin.tx_blogexample.settings.plaintextPageType}
+       10 = USER
+       10 {
+               userFunc = tx_extbase_core_bootstrap->run
+               extensionName = BlogExample
+               pluginName = PostList
+               switchableControllerActions {
+                       Post {
+                               1 = index
+                       }
+               }
+       }
+       config {
+               admPanel = 0
+               no_cache = 1
+               disableAllHeaderCode = 1
+               additionalHeaders.10.header = Content-Type: text/plain
+               additionalHeaders.10.replace = 1
+               defaultGetVars {
+                       tx_blogexample_postlist.format = txt
+               }
+       }
+}
+
+ # Adjust plaintext rendering, if blog_example runs as single, fully fledged plugin
+[globalVar = TYPO3_CONF_VARS|EXTCONF|blog_example|registerSinglePlugin > 0]
+       tx_blogexample_plaintext {
+               10.pluginName = Pi1
+               #config.defaultGetVars =
+       }
+[end]
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.txt b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index 05a8066..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
- # global configuration
-
-config.tx_extbase {
-       persistence{
-               classes {
-                       Extbase\Domain\ModelFrontendUser {
-                               subclasses {
-                                       ExtbaseTeam\BlogExample\Domain\Model\Administrator = ExtbaseTeam\BlogExample\Domain\Model\Administrator
-                               }
-                       }
-                       ExtbaseTeam\BlogExample\Domain\Model\Administrator {
-                               mapping {
-                                       tableName = fe_users
-                                       recordType = ExtbaseTeam\BlogExample\Domain\Model\Administrator
-                               }
-                       }
-                       ExtbaseTeam\BlogExample\Domain\Model\TtContent {
-                               mapping {
-                                       tableName = tt_content
-                                       columns {
-                                               uid.mapOnProperty = uid
-                                               pid.mapOnProperty = pid
-                                               header.mapOnProperty = header
-                                       }
-                               }
-                       }
-               }
-       }
-}
\ No newline at end of file
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.typoscript b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..05a8066
--- /dev/null
@@ -0,0 +1,29 @@
+ # global configuration
+
+config.tx_extbase {
+       persistence{
+               classes {
+                       Extbase\Domain\ModelFrontendUser {
+                               subclasses {
+                                       ExtbaseTeam\BlogExample\Domain\Model\Administrator = ExtbaseTeam\BlogExample\Domain\Model\Administrator
+                               }
+                       }
+                       ExtbaseTeam\BlogExample\Domain\Model\Administrator {
+                               mapping {
+                                       tableName = fe_users
+                                       recordType = ExtbaseTeam\BlogExample\Domain\Model\Administrator
+                               }
+                       }
+                       ExtbaseTeam\BlogExample\Domain\Model\TtContent {
+                               mapping {
+                                       tableName = tt_content
+                                       columns {
+                                               uid.mapOnProperty = uid
+                                               pid.mapOnProperty = pid
+                                               header.mapOnProperty = header
+                                       }
+                               }
+                       }
+               }
+       }
+}
\ No newline at end of file
index fbf7ea7..6158933 100644 (file)
@@ -45,7 +45,7 @@ class EnableFieldsTest extends AbstractDataHandlerActionTestCase
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/fe_users.xml');
         $this->importDataSet(ORIGINAL_ROOT . 'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/blogs-with-fe_groups.xml');
 
-        $this->setUpFrontendRootPage(1, ['typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts']);
+        $this->setUpFrontendRootPage(1, ['typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.typoscript']);
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.ts b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.ts
deleted file mode 100644 (file)
index b9cf140..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-config {
-       no_cache = 1
-       debug = 0
-       xhtml_cleaning = 0
-       admPanel = 0
-       disableAllHeaderCode = 1
-       sendCacheHeaders = 0
-       sys_language_uid = 0
-       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
-       additionalHeaders.10.replace = 1
-}
-
-plugin.tx_blogexample {
-       persistence {
-               storagePid = 89
-       }
-}
-
-page = PAGE
-page {
-       10 = COA
-       10 {
-               10 = USER
-               10 {
-                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-                       extensionName = BlogExample
-                       pluginName = Content
-                       vendorName = ExtbaseTeam
-               }
-               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
-               stdWrap.postUserFunc.as = Extbase
-       }
-
-       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
-}
-
-[globalVar = GP:L = 1]
-       config.sys_language_uid = 1
-[end]
-[globalVar = GP:L = 2]
-       config.sys_language_uid = 2
-[end]
-[globalVar = GP:L = 3]
-       config.sys_language_uid = 3
-[end]
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.typoscript b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.typoscript
new file mode 100644 (file)
index 0000000..b9cf140
--- /dev/null
@@ -0,0 +1,45 @@
+config {
+       no_cache = 1
+       debug = 0
+       xhtml_cleaning = 0
+       admPanel = 0
+       disableAllHeaderCode = 1
+       sendCacheHeaders = 0
+       sys_language_uid = 0
+       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
+       additionalHeaders.10.replace = 1
+}
+
+plugin.tx_blogexample {
+       persistence {
+               storagePid = 89
+       }
+}
+
+page = PAGE
+page {
+       10 = COA
+       10 {
+               10 = USER
+               10 {
+                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
+                       extensionName = BlogExample
+                       pluginName = Content
+                       vendorName = ExtbaseTeam
+               }
+               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
+               stdWrap.postUserFunc.as = Extbase
+       }
+
+       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+}
+
+[globalVar = GP:L = 1]
+       config.sys_language_uid = 1
+[end]
+[globalVar = GP:L = 2]
+       config.sys_language_uid = 2
+[end]
+[globalVar = GP:L = 3]
+       config.sys_language_uid = 3
+[end]
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.ts
deleted file mode 100644 (file)
index 332cf13..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-config {
-       no_cache = 1
-       debug = 0
-       xhtml_cleaning = 0
-       admPanel = 0
-       disableAllHeaderCode = 1
-       sendCacheHeaders = 0
-       sys_language_uid = 0
-       sys_language_mode = ignore
-       sys_language_overlay = 1
-       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
-       additionalHeaders.10.replace = 1
-}
-
-plugin.tx_blogexample {
-       persistence {
-               storagePid = 1
-       }
-}
-
-page = PAGE
-page {
-       10 = COA
-       10 {
-               10 = USER
-               10 {
-                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
-                       extensionName = BlogExample
-                       pluginName = Blogs
-                       vendorName = ExtbaseTeam
-               }
-               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
-               stdWrap.postUserFunc.as = Extbase
-       }
-
-       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
-}
-
-[globalVar = GP:L = 1]
-       config.sys_language_uid = 1
-[end]
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.typoscript b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/JsonRenderer.typoscript
new file mode 100644 (file)
index 0000000..332cf13
--- /dev/null
@@ -0,0 +1,41 @@
+config {
+       no_cache = 1
+       debug = 0
+       xhtml_cleaning = 0
+       admPanel = 0
+       disableAllHeaderCode = 1
+       sendCacheHeaders = 0
+       sys_language_uid = 0
+       sys_language_mode = ignore
+       sys_language_overlay = 1
+       additionalHeaders.10.header = Content-Type: application/json; charset=utf-8
+       additionalHeaders.10.replace = 1
+}
+
+plugin.tx_blogexample {
+       persistence {
+               storagePid = 1
+       }
+}
+
+page = PAGE
+page {
+       10 = COA
+       10 {
+               10 = USER
+               10 {
+                       userFunc = TYPO3\CMS\Extbase\Core\Bootstrap->run
+                       extensionName = BlogExample
+                       pluginName = Blogs
+                       vendorName = ExtbaseTeam
+               }
+               stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->parseValues
+               stdWrap.postUserFunc.as = Extbase
+       }
+
+       stdWrap.postUserFunc = TYPO3\TestingFramework\Core\Functional\Framework\Frontend\Renderer->renderSections
+}
+
+[globalVar = GP:L = 1]
+       config.sys_language_uid = 1
+[end]
index 6eb1eee..79714c7 100644 (file)
@@ -86,8 +86,8 @@ class TranslatedContentTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandlin
         $this->objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->contentRepository = $this->objectManager->get(\ExtbaseTeam\BlogExample\Domain\Repository\TtContentRepository::class);
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.txt',
-            'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.ts'
+            'typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TypoScript/setup.typoscript',
+            'typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/Frontend/ContentJsonRenderer.typoscript'
 
         ]);
     }
diff --git a/typo3/sysext/extbase/ext_typoscript_setup.txt b/typo3/sysext/extbase/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index 0eb0c73..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-config.tx_extbase {
-       mvc {
-               requestHandlers {
-                       TYPO3\CMS\Extbase\Mvc\Web\FrontendRequestHandler = TYPO3\CMS\Extbase\Mvc\Web\FrontendRequestHandler
-                       TYPO3\CMS\Extbase\Mvc\Web\BackendRequestHandler = TYPO3\CMS\Extbase\Mvc\Web\BackendRequestHandler
-                       TYPO3\CMS\Extbase\Mvc\Cli\RequestHandler = TYPO3\CMS\Extbase\Mvc\Cli\RequestHandler
-               }
-               throwPageNotFoundExceptionIfActionCantBeResolved = 0
-       }
-       persistence{
-               enableAutomaticCacheClearing = 1
-               updateReferenceIndex = 0
-               classes {
-                       TYPO3\CMS\Extbase\Domain\Model\FileMount {
-                               mapping {
-                                       tableName = sys_filemounts
-                                       columns {
-                                               title.mapOnProperty = title
-                                               path.mapOnProperty = path
-                                               base.mapOnProperty = isAbsolutePath
-                                       }
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\FileReference {
-                               mapping {
-                                       tableName = sys_file_reference
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\File {
-                               mapping {
-                                       tableName = sys_file
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\BackendUser {
-                               mapping {
-                                       tableName = be_users
-                                       columns {
-                                               username.mapOnProperty = userName
-                                               admin.mapOnProperty = isAdministrator
-                                               disable.mapOnProperty = isDisabled
-                                               realName.mapOnProperty = realName
-                                               starttime.mapOnProperty = startDateAndTime
-                                               endtime.mapOnProperty = endDateAndTime
-                                               disableIPlock.mapOnProperty = ipLockIsDisabled
-                                               lastlogin.mapOnProperty = lastLoginDateAndTime
-                                       }
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup {
-                               mapping {
-                                       tableName = be_groups
-                                       columns {
-                                               subgroup.mapOnProperty = subGroups
-                                               groupMods.mapOnProperty = modules
-                                               tables_select.mapOnProperty = tablesListening
-                                               tables_modify.mapOnProperty = tablesModify
-                                               pagetypes_select.mapOnProperty = pageTypes
-                                               non_exclude_fields.mapOnProperty = allowedExcludeFields
-                                               explicit_allowdeny.mapOnProperty = explicitlyAllowAndDeny
-                                               allowed_languages.mapOnProperty = allowedLanguages
-                                               workspace_perms.mapOnProperty = workspacePermission
-                                               db_mountpoints.mapOnProperty = databaseMounts
-                                               file_permissions.mapOnProperty = fileOperationPermissions
-                                               lockToDomain.mapOnProperty = lockToDomain
-                                               TSconfig.mapOnProperty = tsConfig
-                                       }
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\FrontendUser {
-                               mapping {
-                                       tableName = fe_users
-                                       columns {
-                                               lockToDomain.mapOnProperty = lockToDomain
-                                       }
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup {
-                               mapping {
-                                       tableName = fe_groups
-                                       columns {
-                                               lockToDomain.mapOnProperty = lockToDomain
-                                       }
-                               }
-                       }
-                       TYPO3\CMS\Extbase\Domain\Model\Category {
-                               mapping {
-                                       tableName = sys_category
-                               }
-                       }
-               }
-       }
-       features {
-                # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
-               skipDefaultArguments = 0
-               # if set to 1, the enable fields are ignored in BE context
-               ignoreAllEnableFieldsInBe = 0
-               # Should be on by default, but can be disabled if all action in the plugin are uncached
-               requireCHashArgumentForActionArguments = 1
-       }
-}
diff --git a/typo3/sysext/extbase/ext_typoscript_setup.typoscript b/typo3/sysext/extbase/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..0eb0c73
--- /dev/null
@@ -0,0 +1,100 @@
+config.tx_extbase {
+       mvc {
+               requestHandlers {
+                       TYPO3\CMS\Extbase\Mvc\Web\FrontendRequestHandler = TYPO3\CMS\Extbase\Mvc\Web\FrontendRequestHandler
+                       TYPO3\CMS\Extbase\Mvc\Web\BackendRequestHandler = TYPO3\CMS\Extbase\Mvc\Web\BackendRequestHandler
+                       TYPO3\CMS\Extbase\Mvc\Cli\RequestHandler = TYPO3\CMS\Extbase\Mvc\Cli\RequestHandler
+               }
+               throwPageNotFoundExceptionIfActionCantBeResolved = 0
+       }
+       persistence{
+               enableAutomaticCacheClearing = 1
+               updateReferenceIndex = 0
+               classes {
+                       TYPO3\CMS\Extbase\Domain\Model\FileMount {
+                               mapping {
+                                       tableName = sys_filemounts
+                                       columns {
+                                               title.mapOnProperty = title
+                                               path.mapOnProperty = path
+                                               base.mapOnProperty = isAbsolutePath
+                                       }
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\FileReference {
+                               mapping {
+                                       tableName = sys_file_reference
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\File {
+                               mapping {
+                                       tableName = sys_file
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\BackendUser {
+                               mapping {
+                                       tableName = be_users
+                                       columns {
+                                               username.mapOnProperty = userName
+                                               admin.mapOnProperty = isAdministrator
+                                               disable.mapOnProperty = isDisabled
+                                               realName.mapOnProperty = realName
+                                               starttime.mapOnProperty = startDateAndTime
+                                               endtime.mapOnProperty = endDateAndTime
+                                               disableIPlock.mapOnProperty = ipLockIsDisabled
+                                               lastlogin.mapOnProperty = lastLoginDateAndTime
+                                       }
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\BackendUserGroup {
+                               mapping {
+                                       tableName = be_groups
+                                       columns {
+                                               subgroup.mapOnProperty = subGroups
+                                               groupMods.mapOnProperty = modules
+                                               tables_select.mapOnProperty = tablesListening
+                                               tables_modify.mapOnProperty = tablesModify
+                                               pagetypes_select.mapOnProperty = pageTypes
+                                               non_exclude_fields.mapOnProperty = allowedExcludeFields
+                                               explicit_allowdeny.mapOnProperty = explicitlyAllowAndDeny
+                                               allowed_languages.mapOnProperty = allowedLanguages
+                                               workspace_perms.mapOnProperty = workspacePermission
+                                               db_mountpoints.mapOnProperty = databaseMounts
+                                               file_permissions.mapOnProperty = fileOperationPermissions
+                                               lockToDomain.mapOnProperty = lockToDomain
+                                               TSconfig.mapOnProperty = tsConfig
+                                       }
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\FrontendUser {
+                               mapping {
+                                       tableName = fe_users
+                                       columns {
+                                               lockToDomain.mapOnProperty = lockToDomain
+                                       }
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup {
+                               mapping {
+                                       tableName = fe_groups
+                                       columns {
+                                               lockToDomain.mapOnProperty = lockToDomain
+                                       }
+                               }
+                       }
+                       TYPO3\CMS\Extbase\Domain\Model\Category {
+                               mapping {
+                                       tableName = sys_category
+                               }
+                       }
+               }
+       }
+       features {
+                # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
+               skipDefaultArguments = 0
+               # if set to 1, the enable fields are ignored in BE context
+               ignoreAllEnableFieldsInBe = 0
+               # Should be on by default, but can be disabled if all action in the plugin are uncached
+               requireCHashArgumentForActionArguments = 1
+       }
+}
diff --git a/typo3/sysext/extensionmanager/ext_typoscript_setup.txt b/typo3/sysext/extensionmanager/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index bf4446f..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-module.tx_extensionmanager {
-       settings {
-               repositoryUid = 1
-       }
-       features {
-                # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
-               skipDefaultArguments = 0
-       }
-}
\ No newline at end of file
diff --git a/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript b/typo3/sysext/extensionmanager/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..bf4446f
--- /dev/null
@@ -0,0 +1,9 @@
+module.tx_extensionmanager {
+       settings {
+               repositoryUid = 1
+       }
+       features {
+                # if enabled, default controller and/or action is skipped when creating URIs through the URI Builder (see https://wiki.typo3.org/Skip_default_arguments_in_URIs)
+               skipDefaultArguments = 0
+       }
+}
\ No newline at end of file
diff --git a/typo3/sysext/fluid/ext_typoscript_setup.txt b/typo3/sysext/fluid/ext_typoscript_setup.txt
deleted file mode 100644 (file)
index 80f9b27..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-fluidAjaxWidgetResponse = PAGE
-fluidAjaxWidgetResponse {
-        # todo: make page type configurable
-       typeNum = 7076
-       headerData >
-       config {
-               no_cache = 1
-               disableAllHeaderCode = 1
-               additionalHeaders.10.header = Content-Type: text/plain
-               additionalHeaders.10.replace = 1
-               debug = 0
-       }
-       10 = USER_INT
-       10 {
-               userFunc = TYPO3\CMS\Fluid\Core\Widget\Bootstrap->run
-       }
-}
-
-config.tx_extbase {
-       mvc {
-               requestHandlers {
-                       TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler = TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler
-               }
-       }
-}
diff --git a/typo3/sysext/fluid/ext_typoscript_setup.typoscript b/typo3/sysext/fluid/ext_typoscript_setup.typoscript
new file mode 100644 (file)
index 0000000..80f9b27
--- /dev/null
@@ -0,0 +1,25 @@
+fluidAjaxWidgetResponse = PAGE
+fluidAjaxWidgetResponse {
+        # todo: make page type configurable
+       typeNum = 7076
+       headerData >
+       config {
+               no_cache = 1
+               disableAllHeaderCode = 1
+               additionalHeaders.10.header = Content-Type: text/plain
+               additionalHeaders.10.replace = 1
+               debug = 0
+       }
+       10 = USER_INT
+       10 {
+               userFunc = TYPO3\CMS\Fluid\Core\Widget\Bootstrap->run
+       }
+}
+
+config.tx_extbase {
+       mvc {
+               requestHandlers {
+                       TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler = TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler
+               }
+       }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.txt
deleted file mode 100644 (file)
index 2a17943..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-# Bullet List:
-# A single bullet list.
-#
-# CType: bullets
-
-tt_content.bullets =< lib.contentElement
-tt_content.bullets {
-    templateName = Bullets
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\SplitProcessor
-        10 {
-            if {
-                value = 2
-                isLessThan.field = bullets_type
-            }
-            fieldName = bodytext
-            removeEmptyEntries = 1
-            as = bullets
-        }
-        20 = TYPO3\CMS\Frontend\DataProcessing\CommaSeparatedValueProcessor
-        20 {
-            fieldName = bodytext
-            if {
-                value = 2
-                equals.field = bullets_type
-            }
-            fieldDelimiter = |
-            as = bullets
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], bodytext [bullets_type]
-        editIcons {
-            beforeLastTag = 1
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.bullets
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.typoscript
new file mode 100644 (file)
index 0000000..2a17943
--- /dev/null
@@ -0,0 +1,38 @@
+# Bullet List:
+# A single bullet list.
+#
+# CType: bullets
+
+tt_content.bullets =< lib.contentElement
+tt_content.bullets {
+    templateName = Bullets
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\SplitProcessor
+        10 {
+            if {
+                value = 2
+                isLessThan.field = bullets_type
+            }
+            fieldName = bodytext
+            removeEmptyEntries = 1
+            as = bullets
+        }
+        20 = TYPO3\CMS\Frontend\DataProcessing\CommaSeparatedValueProcessor
+        20 {
+            fieldName = bodytext
+            if {
+                value = 2
+                equals.field = bullets_type
+            }
+            fieldDelimiter = |
+            as = bullets
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], bodytext [bullets_type]
+        editIcons {
+            beforeLastTag = 1
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.bullets
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.txt
deleted file mode 100644 (file)
index 52c39f3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# Divider:
-# This element inserts a visual divider, which is by default a horizontal line.
-#
-# CType: div
-
-tt_content.div =< lib.contentElement
-tt_content.div {
-    templateName = Div
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Div.typoscript
new file mode 100644 (file)
index 0000000..52c39f3
--- /dev/null
@@ -0,0 +1,9 @@
+# Divider:
+# This element inserts a visual divider, which is by default a horizontal line.
+#
+# CType: div
+
+tt_content.div =< lib.contentElement
+tt_content.div {
+    templateName = Div
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.txt
deleted file mode 100644 (file)
index 0d8ca17..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Header Only:
-# Adds a header only.
-#
-# CType: header
-
-tt_content.header =< lib.contentElement
-tt_content.header {
-    templateName = Header
-    stdWrap {
-        editIcons = tt_content: header [header_layout|header_link], subheader, date
-        editIcons {
-            beforeLastTag = 1
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.header
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Header.typoscript
new file mode 100644 (file)
index 0000000..0d8ca17
--- /dev/null
@@ -0,0 +1,16 @@
+# Header Only:
+# Adds a header only.
+#
+# CType: header
+
+tt_content.header =< lib.contentElement
+tt_content.header {
+    templateName = Header
+    stdWrap {
+        editIcons = tt_content: header [header_layout|header_link], subheader, date
+        editIcons {
+            beforeLastTag = 1
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.header
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.txt
deleted file mode 100644 (file)
index dec0344..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Plain HTML:
-# With this element you can output raw HTML code on the page.
-#
-# CType: html
-
-tt_content.html =< lib.contentElement
-tt_content.html {
-    templateName = Html
-    stdWrap {
-        editIcons = tt_content: bodytext
-        editIcons {
-            beforeLastTag = 1
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.html
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Html.typoscript
new file mode 100644 (file)
index 0000000..dec0344
--- /dev/null
@@ -0,0 +1,16 @@
+# Plain HTML:
+# With this element you can output raw HTML code on the page.
+#
+# CType: html
+
+tt_content.html =< lib.contentElement
+tt_content.html {
+    templateName = Html
+    stdWrap {
+        editIcons = tt_content: bodytext
+        editIcons {
+            beforeLastTag = 1
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.html
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.txt
deleted file mode 100644 (file)
index 9ddd63a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Image:
-# ...
-#
-# CType: image
-
-tt_content.image =< lib.contentElement
-tt_content.image {
-    templateName = Image
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-        10 {
-            references.fieldName = image
-        }
-        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
-        20 {
-            maxGalleryWidth = {$styles.content.textmedia.maxW}
-            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
-            columnSpacing = {$styles.content.textmedia.columnSpacing}
-            borderWidth = {$styles.content.textmedia.borderWidth}
-            borderPadding = {$styles.content.textmedia.borderPadding}
-        }
-    }
-    stdWrap {
-        editIcons = tt_content : image [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.image
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Image.typoscript
new file mode 100644 (file)
index 0000000..9ddd63a
--- /dev/null
@@ -0,0 +1,29 @@
+# Image:
+# ...
+#
+# CType: image
+
+tt_content.image =< lib.contentElement
+tt_content.image {
+    templateName = Image
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+        10 {
+            references.fieldName = image
+        }
+        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
+        20 {
+            maxGalleryWidth = {$styles.content.textmedia.maxW}
+            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
+            columnSpacing = {$styles.content.textmedia.columnSpacing}
+            borderWidth = {$styles.content.textmedia.borderWidth}
+            borderPadding = {$styles.content.textmedia.borderPadding}
+        }
+    }
+    stdWrap {
+        editIcons = tt_content : image [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.image
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.txt
deleted file mode 100644 (file)
index 5f0cf15..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# General Plugin:
-# This is the default rendering definition for plugins.
-#
-# CType: list
-
-tt_content.list =< lib.contentElement
-tt_content.list {
-    templateName = List
-    stdWrap {
-        editIcons = tt_content: header [header_layout], list_type, layout, pages [recursive]
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.list
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/List.typoscript
new file mode 100644 (file)
index 0000000..5f0cf15
--- /dev/null
@@ -0,0 +1,15 @@
+# General Plugin:
+# This is the default rendering definition for plugins.
+#
+# CType: list
+
+tt_content.list =< lib.contentElement
+tt_content.list {
+    templateName = List
+    stdWrap {
+        editIcons = tt_content: header [header_layout], list_type, layout, pages [recursive]
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.list
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.txt
deleted file mode 100644 (file)
index 8e7bcc1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# Menu of subpages of selected pages including abstracts:
-# ...
-#
-# CType: menu_abstract
-
-tt_content.menu_abstract =< lib.contentElement
-tt_content.menu_abstract {
-    templateName = MenuAbstract
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = directory
-            special.value.field = pages
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript
new file mode 100644 (file)
index 0000000..8e7bcc1
--- /dev/null
@@ -0,0 +1,28 @@
+# Menu of subpages of selected pages including abstracts:
+# ...
+#
+# CType: menu_abstract
+
+tt_content.menu_abstract =< lib.contentElement
+tt_content.menu_abstract {
+    templateName = MenuAbstract
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = directory
+            special.value.field = pages
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.txt
deleted file mode 100644 (file)
index c84deac..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Content elements for selected categories:
-# ...
-#
-# CType: menu_categorized_content
-
-tt_content.menu_categorized_content =< lib.contentElement
-tt_content.menu_categorized_content {
-    templateName = MenuCategorizedContent
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
-        10 {
-            table = tt_content
-            selectFields = tt_content.*
-            groupBy = uid
-            pidInList.data = leveluid : 0
-            recursive = 99
-            join.data = field:selected_categories
-            join.wrap = sys_category_record_mm ON uid = sys_category_record_mm.uid_foreign AND sys_category_record_mm.uid_local IN(|)
-            where.data = field:category_field
-            where.wrap = tablenames='tt_content' and fieldname='|'
-            orderBy = tt_content.sorting
-            as = content
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = image
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], selected_categories, category_field
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.typoscript
new file mode 100644 (file)
index 0000000..c84deac
--- /dev/null
@@ -0,0 +1,37 @@
+# Content elements for selected categories:
+# ...
+#
+# CType: menu_categorized_content
+
+tt_content.menu_categorized_content =< lib.contentElement
+tt_content.menu_categorized_content {
+    templateName = MenuCategorizedContent
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
+        10 {
+            table = tt_content
+            selectFields = tt_content.*
+            groupBy = uid
+            pidInList.data = leveluid : 0
+            recursive = 99
+            join.data = field:selected_categories
+            join.wrap = sys_category_record_mm ON uid = sys_category_record_mm.uid_foreign AND sys_category_record_mm.uid_local IN(|)
+            where.data = field:category_field
+            where.wrap = tablenames='tt_content' and fieldname='|'
+            orderBy = tt_content.sorting
+            as = content
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = image
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], selected_categories, category_field
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.txt
deleted file mode 100644 (file)
index 269ceaf..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Pages for selected categories:
-# ...
-#
-# CType: menu_categorized_pages
-
-tt_content.menu_categorized_pages =< lib.contentElement
-tt_content.menu_categorized_pages {
-    templateName = MenuCategorizedPages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = categories
-            special {
-                value.field = selected_categories
-                relation.field = category_field
-                sorting = title
-                order = asc
-            }
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], selected_categories, category_field
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript
new file mode 100644 (file)
index 0000000..269ceaf
--- /dev/null
@@ -0,0 +1,33 @@
+# Pages for selected categories:
+# ...
+#
+# CType: menu_categorized_pages
+
+tt_content.menu_categorized_pages =< lib.contentElement
+tt_content.menu_categorized_pages {
+    templateName = MenuCategorizedPages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = categories
+            special {
+                value.field = selected_categories
+                relation.field = category_field
+                sorting = title
+                order = asc
+            }
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], selected_categories, category_field
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.txt
deleted file mode 100644 (file)
index 93942b6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# Menu of selected pages:
-# ...
-#
-# CType: menu_pages
-
-tt_content.menu_pages =< lib.contentElement
-tt_content.menu_pages {
-    templateName = MenuPages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = list
-            special.value.field = pages
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.typoscript
new file mode 100644 (file)
index 0000000..93942b6
--- /dev/null
@@ -0,0 +1,28 @@
+# Menu of selected pages:
+# ...
+#
+# CType: menu_pages
+
+tt_content.menu_pages =< lib.contentElement
+tt_content.menu_pages {
+    templateName = MenuPages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = list
+            special.value.field = pages
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.txt
deleted file mode 100644 (file)
index 3bcefbe..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Recently updated pages:
-# ...
-#
-# CType: menu_recently_updated
-
-tt_content.menu_recently_updated =< lib.contentElement
-tt_content.menu_recently_updated {
-    templateName = MenuRecentlyUpdated
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = updated
-            special {
-                value.field = pages
-                maxAge = 3600*24*7
-                excludeNoSearchPages = 1
-            }
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript
new file mode 100644 (file)
index 0000000..3bcefbe
--- /dev/null
@@ -0,0 +1,32 @@
+# Recently updated pages:
+# ...
+#
+# CType: menu_recently_updated
+
+tt_content.menu_recently_updated =< lib.contentElement
+tt_content.menu_recently_updated {
+    templateName = MenuRecentlyUpdated
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = updated
+            special {
+                value.field = pages
+                maxAge = 3600*24*7
+                excludeNoSearchPages = 1
+            }
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.txt
deleted file mode 100644 (file)
index e388b65..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Related pages (based on keywords):
-# ...
-#
-# CType: menu_related_pages
-
-tt_content.menu_related_pages =< lib.contentElement
-tt_content.menu_related_pages {
-    templateName = MenuRelatedPages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = keywords
-            special {
-                value.field = pages
-                excludeNoSearchPages = 1
-            }
-            alternativeSortingField = title
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript
new file mode 100644 (file)
index 0000000..e388b65
--- /dev/null
@@ -0,0 +1,32 @@
+# Related pages (based on keywords):
+# ...
+#
+# CType: menu_related_pages
+
+tt_content.menu_related_pages =< lib.contentElement
+tt_content.menu_related_pages {
+    templateName = MenuRelatedPages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = keywords
+            special {
+                value.field = pages
+                excludeNoSearchPages = 1
+            }
+            alternativeSortingField = title
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.txt
deleted file mode 100644 (file)
index b6f0610..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Section index (page content marked for section menus):
-# ...
-#
-# CType: menu_section
-
-tt_content.menu_section =< lib.contentElement
-tt_content.menu_section {
-    templateName = MenuSection
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = list
-            special {
-                value {
-                    field = pages
-                    override {
-                        data = page:uid
-                        if {
-                            isFalse.field = pages
-                        }
-                    }
-                }
-            }
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-                20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
-                20 {
-                    table = tt_content
-                    pidInList.field = uid
-                    as = content
-                    where = sectionIndex = 1
-                    dataProcessing {
-                        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                        10 {
-                            references.fieldName = image
-                        }
-                    }
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.typoscript
new file mode 100644 (file)
index 0000000..b6f0610
--- /dev/null
@@ -0,0 +1,51 @@
+# Section index (page content marked for section menus):
+# ...
+#
+# CType: menu_section
+
+tt_content.menu_section =< lib.contentElement
+tt_content.menu_section {
+    templateName = MenuSection
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = list
+            special {
+                value {
+                    field = pages
+                    override {
+                        data = page:uid
+                        if {
+                            isFalse.field = pages
+                        }
+                    }
+                }
+            }
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+                20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
+                20 {
+                    table = tt_content
+                    pidInList.field = uid
+                    as = content
+                    where = sectionIndex = 1
+                    dataProcessing {
+                        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                        10 {
+                            references.fieldName = image
+                        }
+                    }
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.txt
deleted file mode 100644 (file)
index 2a7dc6a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Menu of subpages of selected pages including sections:
-# ...
-#
-# CType: menu_section_pages
-
-tt_content.menu_section_pages =< lib.contentElement
-tt_content.menu_section_pages {
-    templateName = MenuSectionPages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = directory
-            special.value.field = pages
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-                20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
-                20 {
-                    table = tt_content
-                    pidInList.field = uid
-                    as = content
-                    dataProcessing {
-                        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                        10 {
-                            references.fieldName = image
-                        }
-                    }
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.typoscript
new file mode 100644 (file)
index 0000000..2a7dc6a
--- /dev/null
@@ -0,0 +1,40 @@
+# Menu of subpages of selected pages including sections:
+# ...
+#
+# CType: menu_section_pages
+
+tt_content.menu_section_pages =< lib.contentElement
+tt_content.menu_section_pages {
+    templateName = MenuSectionPages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = directory
+            special.value.field = pages
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+                20 = TYPO3\CMS\Frontend\DataProcessing\DatabaseQueryProcessor
+                20 {
+                    table = tt_content
+                    pidInList.field = uid
+                    as = content
+                    dataProcessing {
+                        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                        10 {
+                            references.fieldName = image
+                        }
+                    }
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.txt
deleted file mode 100644 (file)
index fb4fa42..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Sitemap:
-# ...
-#
-# CType: menu_sitemap
-
-tt_content.menu_sitemap =< lib.contentElement
-tt_content.menu_sitemap {
-    templateName = MenuSitemap
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = list
-            special.value.field = pages
-            levels = 7
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript
new file mode 100644 (file)
index 0000000..fb4fa42
--- /dev/null
@@ -0,0 +1,29 @@
+# Sitemap:
+# ...
+#
+# CType: menu_sitemap
+
+tt_content.menu_sitemap =< lib.contentElement
+tt_content.menu_sitemap {
+    templateName = MenuSitemap
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = list
+            special.value.field = pages
+            levels = 7
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.txt
deleted file mode 100644 (file)
index cb673a7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Sitemaps of selected pages:
-# ...
-#
-# CType: menu_sitemap_pages
-
-tt_content.menu_sitemap_pages =< lib.contentElement
-tt_content.menu_sitemap_pages {
-    templateName = MenuSitemapPages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = directory
-            special.value.field = pages
-            levels = 7
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript
new file mode 100644 (file)
index 0000000..cb673a7
--- /dev/null
@@ -0,0 +1,29 @@
+# Sitemaps of selected pages:
+# ...
+#
+# CType: menu_sitemap_pages
+
+tt_content.menu_sitemap_pages =< lib.contentElement
+tt_content.menu_sitemap_pages {
+    templateName = MenuSitemapPages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = directory
+            special.value.field = pages
+            levels = 7
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.txt
deleted file mode 100644 (file)
index 80e1bd6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# Menu of subpages of selected pages:
-# ...
-#
-# CType: menu_subpages
-
-tt_content.menu_subpages =< lib.contentElement
-tt_content.menu_subpages {
-    templateName = MenuSubpages
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
-        10 {
-            special = directory
-            special.value.field = pages
-            dataProcessing {
-                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-                10 {
-                    references.fieldName = media
-                }
-            }
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], pages
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.typoscript
new file mode 100644 (file)
index 0000000..80e1bd6
--- /dev/null
@@ -0,0 +1,28 @@
+# Menu of subpages of selected pages:
+# ...
+#
+# CType: menu_subpages
+
+tt_content.menu_subpages =< lib.contentElement
+tt_content.menu_subpages {
+    templateName = MenuSubpages
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\MenuProcessor
+        10 {
+            special = directory
+            special.value.field = pages
+            dataProcessing {
+                10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+                10 {
+                    references.fieldName = media
+                }
+            }
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], pages
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.menu
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.txt
deleted file mode 100644 (file)
index ab1fbae..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Insert records:
-# This element embeds other content elements.
-#
-# CType: shortcut
-
-tt_content.shortcut =< lib.contentElement
-tt_content.shortcut {
-    templateName = Shortcut
-
-    # Keep this, since the "conf" option can be used
-    variables.shortcuts = RECORDS
-    variables.shortcuts {
-        source.field = records
-        tables = {$styles.content.shortcut.tables}
-    }
-
-    stdWrap {
-        editIcons = tt_content: header [header_layout], records
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.shortcut
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.typoscript
new file mode 100644 (file)
index 0000000..ab1fbae
--- /dev/null
@@ -0,0 +1,23 @@
+# Insert records:
+# This element embeds other content elements.
+#
+# CType: shortcut
+
+tt_content.shortcut =< lib.contentElement
+tt_content.shortcut {
+    templateName = Shortcut
+
+    # Keep this, since the "conf" option can be used
+    variables.shortcuts = RECORDS
+    variables.shortcuts {
+        source.field = records
+        tables = {$styles.content.shortcut.tables}
+    }
+
+    stdWrap {
+        editIcons = tt_content: header [header_layout], records
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.shortcut
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.txt
deleted file mode 100644 (file)
index 18ce3a4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Table:
-# A simple table.
-#
-# CType: table
-
-tt_content.table =< lib.contentElement
-tt_content.table {
-    templateName = Table
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\CommaSeparatedValueProcessor
-        10 {
-            fieldName = bodytext
-            fieldDelimiter.char.cObject = TEXT
-            fieldDelimiter.char.cObject {
-                field = table_delimiter
-            }
-            fieldEnclosure.char.cObject = TEXT
-            fieldEnclosure.char.cObject {
-                field = table_enclosure
-            }
-            maximumColumns.field = cols
-            as = table
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], bodytext, [table_caption|cols|table_header_position|table_tfoot]
-        editIcons {
-            beforeLastTag = 1
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.table
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Table.typoscript
new file mode 100644 (file)
index 0000000..18ce3a4
--- /dev/null
@@ -0,0 +1,32 @@
+# Table:
+# A simple table.
+#
+# CType: table
+
+tt_content.table =< lib.contentElement
+tt_content.table {
+    templateName = Table
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\CommaSeparatedValueProcessor
+        10 {
+            fieldName = bodytext
+            fieldDelimiter.char.cObject = TEXT
+            fieldDelimiter.char.cObject {
+                field = table_delimiter
+            }
+            fieldEnclosure.char.cObject = TEXT
+            fieldEnclosure.char.cObject {
+                field = table_enclosure
+            }
+            maximumColumns.field = cols
+            as = table
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], bodytext, [table_caption|cols|table_header_position|table_tfoot]
+        editIcons {
+            beforeLastTag = 1
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.table
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.txt
deleted file mode 100644 (file)
index 8e3fddb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Regular Text Element:
-# A regular text element with header and bodytext fields.
-#
-# CType: text
-
-tt_content.text =< lib.contentElement
-tt_content.text {
-    templateName = Text
-    stdWrap {
-        editIcons = tt_content: bodytext
-        editIcons {
-            beforeLastTag = 1
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.html
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Text.typoscript
new file mode 100644 (file)
index 0000000..8e3fddb
--- /dev/null
@@ -0,0 +1,16 @@
+# Regular Text Element:
+# A regular text element with header and bodytext fields.
+#
+# CType: text
+
+tt_content.text =< lib.contentElement
+tt_content.text {
+    templateName = Text
+    stdWrap {
+        editIcons = tt_content: bodytext
+        editIcons {
+            beforeLastTag = 1
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.html
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.txt
deleted file mode 100644 (file)
index 0189f44..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Text & Media:
-# Any number of media wrapped right around a regular text element.
-#
-# CType: textmedia
-
-tt_content.textmedia =< lib.contentElement
-tt_content.textmedia {
-    templateName = Textmedia
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-        10 {
-            references.fieldName = assets
-        }
-        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
-        20 {
-            maxGalleryWidth = {$styles.content.textmedia.maxW}
-            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
-            columnSpacing = {$styles.content.textmedia.columnSpacing}
-            borderWidth = {$styles.content.textmedia.borderWidth}
-            borderPadding = {$styles.content.textmedia.borderPadding}
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], bodytext, assets [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.textmedia
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.typoscript
new file mode 100644 (file)
index 0000000..0189f44
--- /dev/null
@@ -0,0 +1,29 @@
+# Text & Media:
+# Any number of media wrapped right around a regular text element.
+#
+# CType: textmedia
+
+tt_content.textmedia =< lib.contentElement
+tt_content.textmedia {
+    templateName = Textmedia
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+        10 {
+            references.fieldName = assets
+        }
+        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
+        20 {
+            maxGalleryWidth = {$styles.content.textmedia.maxW}
+            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
+            columnSpacing = {$styles.content.textmedia.columnSpacing}
+            borderWidth = {$styles.content.textmedia.borderWidth}
+            borderPadding = {$styles.content.textmedia.borderPadding}
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], bodytext, assets [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.textmedia
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.txt
deleted file mode 100644 (file)
index b61b2fe..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Text and Images:
-# Text with images.
-#
-# CType: textpic
-
-tt_content.textpic =< lib.contentElement
-tt_content.textpic {
-    templateName = Textpic
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-        10 {
-            references.fieldName = image
-        }
-        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
-        20 {
-            maxGalleryWidth = {$styles.content.textmedia.maxW}
-            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
-            columnSpacing = {$styles.content.textmedia.columnSpacing}
-            borderWidth = {$styles.content.textmedia.borderWidth}
-            borderPadding = {$styles.content.textmedia.borderPadding}
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], bodytext, image [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.textpic
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.typoscript
new file mode 100644 (file)
index 0000000..b61b2fe
--- /dev/null
@@ -0,0 +1,29 @@
+# Text and Images:
+# Text with images.
+#
+# CType: textpic
+
+tt_content.textpic =< lib.contentElement
+tt_content.textpic {
+    templateName = Textpic
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+        10 {
+            references.fieldName = image
+        }
+        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
+        20 {
+            maxGalleryWidth = {$styles.content.textmedia.maxW}
+            maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
+            columnSpacing = {$styles.content.textmedia.columnSpacing}
+            borderWidth = {$styles.content.textmedia.borderWidth}
+            borderPadding = {$styles.content.textmedia.borderPadding}
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], bodytext, image [imageorient|imagewidth|imageheight], [imagecols|imageborder], image_zoom
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.textpic
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.txt
deleted file mode 100644 (file)
index 262a175..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# File Links:
-# Makes a list of files for download.
-#
-# CType: uploads
-
-tt_content.uploads =< lib.contentElement
-tt_content.uploads {
-    templateName = Uploads
-    dataProcessing {
-        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
-        10 {
-            references.fieldName = media
-            collections.field = file_collections
-            sorting.field = filelink_sorting
-            sorting.direction.field = filelink_sorting_direction
-        }
-    }
-    stdWrap {
-        editIcons = tt_content: header [header_layout], media, file_collections, filelink_sorting, [filelink_size|uploads_description|uploads_type]
-        editIcons {
-            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.uploads
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.typoscript
new file mode 100644 (file)
index 0000000..262a175
--- /dev/null
@@ -0,0 +1,24 @@
+# File Links:
+# Makes a list of files for download.
+#
+# CType: uploads
+
+tt_content.uploads =< lib.contentElement
+tt_content.uploads {
+    templateName = Uploads
+    dataProcessing {
+        10 = TYPO3\CMS\Frontend\DataProcessing\FilesProcessor
+        10 {
+            references.fieldName = media
+            collections.field = file_collections
+            sorting.field = filelink_sorting
+            sorting.direction.field = filelink_sorting_direction
+        }
+    }
+    stdWrap {
+        editIcons = tt_content: header [header_layout], media, file_collections, filelink_sorting, [filelink_size|uploads_description|uploads_type]
+        editIcons {
+            iconTitle.data = LLL:EXT:fluid_styled_content/Resources/Private/Language/FrontendEditing.xlf:editIcon.uploads
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.txt
deleted file mode 100644 (file)
index d20dc55..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Default configuration for content elements which are using FLUIDTEMPLATE directly
-lib.contentElement >
-lib.contentElement = FLUIDTEMPLATE
-lib.contentElement {
-    templateName = Default
-    templateRootPaths {
-        0 = EXT:fluid_styled_content/Resources/Private/Templates/
-        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 {
-        defaultHeaderType = {$styles.content.defaultHeaderType}
-        media {
-            popup {
-                bodyTag = <body style="margin:0; background:#fff;">
-                wrap = <a href="javascript:close();"> | </a>
-                width = {$styles.content.textmedia.linkWrap.width}
-                height = {$styles.content.textmedia.linkWrap.height}
-                crop.data = file:current:crop
-                JSwindow = 1
-                JSwindow {
-                    newWindow = {$styles.content.textmedia.linkWrap.newWindow}
-                    if.isFalse = {$styles.content.textmedia.linkWrap.lightboxEnabled}
-                }
-                directImageLink = {$styles.content.textmedia.linkWrap.lightboxEnabled}
-                linkParams.ATagParams.dataWrap =  class="{$styles.content.textmedia.linkWrap.lightboxCssClass}" rel="{$styles.content.textmedia.linkWrap.lightboxRelAttribute}"
-            }
-            additionalConfig {
-                no-cookie = 1
-            }
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.typoscript
new file mode 100644 (file)
index 0000000..d20dc55
--- /dev/null
@@ -0,0 +1,40 @@
+# Default configuration for content elements which are using FLUIDTEMPLATE directly
+lib.contentElement >
+lib.contentElement = FLUIDTEMPLATE
+lib.contentElement {
+    templateName = Default
+    templateRootPaths {
+        0 = EXT:fluid_styled_content/Resources/Private/Templates/
+        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 {
+        defaultHeaderType = {$styles.content.defaultHeaderType}
+        media {
+            popup {
+                bodyTag = <body style="margin:0; background:#fff;">
+                wrap = <a href="javascript:close();"> | </a>
+                width = {$styles.content.textmedia.linkWrap.width}
+                height = {$styles.content.textmedia.linkWrap.height}
+                crop.data = file:current:crop
+                JSwindow = 1
+                JSwindow {
+                    newWindow = {$styles.content.textmedia.linkWrap.newWindow}
+                    if.isFalse = {$styles.content.textmedia.linkWrap.lightboxEnabled}
+                }
+                directImageLink = {$styles.content.textmedia.linkWrap.lightboxEnabled}
+                linkParams.ATagParams.dataWrap =  class="{$styles.content.textmedia.linkWrap.lightboxCssClass}" rel="{$styles.content.textmedia.linkWrap.lightboxRelAttribute}"
+            }
+            additionalConfig {
+                no-cookie = 1
+            }
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt
deleted file mode 100644 (file)
index 28172c9..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# Creates persistent ParseFunc setup for non-HTML content.
-lib.parseFunc {
-    makelinks = 1
-    makelinks {
-        http {
-            keep = {$styles.content.links.keep}
-            extTarget = {$styles.content.links.extTarget}
-        }
-        mailto {
-            keep = path
-        }
-    }
-    tags {
-        link = TEXT
-        link {
-            current = 1
-            typolink {
-                parameter.data = parameters : allParams
-                extTarget = {$styles.content.links.extTarget}
-            }
-            parseFunc.constants = 1
-        }
-        a = TEXT
-        a {
-            current = 1
-            typolink {
-                parameter.data = parameters:href
-                title.data = parameters:title
-                ATagParams.data = parameters:allParams
-                target.data = parameters:target
-                extTarget = {$styles.content.links.extTarget}
-                extTarget.override.data = parameters:target
-            }
-        }
-    }
-    allowTags = {$styles.content.allowTags}
-    denyTags = *
-    sword = <span class="ce-sword">|</span>
-    constants = 1
-    nonTypoTagStdWrap {
-        HTMLparser = 1
-        HTMLparser {
-            keepNonMatchedTags = 1
-            htmlSpecialChars = 2
-        }
-    }
-}
-
-
-# Creates persistent ParseFunc setup for RTE content (which is mainly HTML) based on the "default" transformation.
-lib.parseFunc_RTE < lib.parseFunc
-lib.parseFunc_RTE {
-    # Processing <ol>, <ul> and <table> blocks separately
-    externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre
-    externalBlocks {
-        ol {
-            stripNL = 1
-            stdWrap.parseFunc = < lib.parseFunc
-        }
-        ul {
-            stripNL = 1
-            stdWrap.parseFunc = < lib.parseFunc
-        }
-        pre {
-            stdWrap.parseFunc < lib.parseFunc
-        }
-        table {
-            stripNL = 1
-            stdWrap {
-                HTMLparser = 1
-                HTMLparser {
-                    tags.table.fixAttrib.class {
-                        default = contenttable
-                        always = 1
-                        list = contenttable
-                    }
-                    keepNonMatchedTags = 1
-                }
-            }
-            HTMLtableCells = 1
-            HTMLtableCells {
-                # Recursive call to self but without wrapping non-wrapped cell content
-                default.stdWrap {
-                    parseFunc = < lib.parseFunc_RTE
-                    parseFunc.nonTypoTagStdWrap.encapsLines.nonWrappedTag =
-                }
-                addChr10BetweenParagraphs = 1
-            }
-        }
-        div {
-            stripNL = 1
-            callRecursive = 1
-        }
-        article < .div
-        aside < .div
-        blockquote < .div
-        footer < .div
-        header < .div
-        nav < .div
-        section < .div
-        dl < .div
-        dd < .div
-    }
-    nonTypoTagStdWrap {
-        encapsLines {
-            encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
-            remapTag.DIV = P
-            nonWrappedTag = P
-            innerStdWrap_all.ifBlank = &nbsp;
-        }
-    }
-    nonTypoTagStdWrap {
-        HTMLparser = 1
-        HTMLparser {
-            keepNonMatchedTags = 1
-            htmlSpecialChars = 2
-        }
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.typoscript
new file mode 100644 (file)
index 0000000..28172c9
--- /dev/null
@@ -0,0 +1,119 @@
+# Creates persistent ParseFunc setup for non-HTML content.
+lib.parseFunc {
+    makelinks = 1
+    makelinks {
+        http {
+            keep = {$styles.content.links.keep}
+            extTarget = {$styles.content.links.extTarget}
+        }
+        mailto {
+            keep = path
+        }
+    }
+    tags {
+        link = TEXT
+        link {
+            current = 1
+            typolink {
+                parameter.data = parameters : allParams
+                extTarget = {$styles.content.links.extTarget}
+            }
+            parseFunc.constants = 1
+        }
+        a = TEXT
+        a {
+            current = 1
+            typolink {
+                parameter.data = parameters:href
+                title.data = parameters:title
+                ATagParams.data = parameters:allParams
+                target.data = parameters:target
+                extTarget = {$styles.content.links.extTarget}
+                extTarget.override.data = parameters:target
+            }
+        }
+    }
+    allowTags = {$styles.content.allowTags}
+    denyTags = *
+    sword = <span class="ce-sword">|</span>
+    constants = 1
+    nonTypoTagStdWrap {
+        HTMLparser = 1
+        HTMLparser {
+            keepNonMatchedTags = 1
+            htmlSpecialChars = 2
+        }
+    }
+}
+
+
+# Creates persistent ParseFunc setup for RTE content (which is mainly HTML) based on the "default" transformation.
+lib.parseFunc_RTE < lib.parseFunc
+lib.parseFunc_RTE {
+    # Processing <ol>, <ul> and <table> blocks separately
+    externalBlocks = article, aside, blockquote, div, dd, dl, footer, header, nav, ol, section, table, ul, pre
+    externalBlocks {
+        ol {
+            stripNL = 1
+            stdWrap.parseFunc = < lib.parseFunc
+        }
+        ul {
+            stripNL = 1
+            stdWrap.parseFunc = < lib.parseFunc
+        }
+        pre {
+            stdWrap.parseFunc < lib.parseFunc
+        }
+        table {
+            stripNL = 1
+            stdWrap {
+                HTMLparser = 1
+                HTMLparser {
+                    tags.table.fixAttrib.class {
+                        default = contenttable
+                        always = 1
+                        list = contenttable
+                    }
+                    keepNonMatchedTags = 1
+                }
+            }
+            HTMLtableCells = 1
+            HTMLtableCells {
+                # Recursive call to self but without wrapping non-wrapped cell content
+                default.stdWrap {
+                    parseFunc = < lib.parseFunc_RTE
+                    parseFunc.nonTypoTagStdWrap.encapsLines.nonWrappedTag =
+                }
+                addChr10BetweenParagraphs = 1
+            }
+        }
+        div {
+            stripNL = 1
+            callRecursive = 1
+        }
+        article < .div
+        aside < .div
+        blockquote < .div
+        footer < .div
+        header < .div
+        nav < .div
+        section < .div
+        dl < .div
+        dd < .div
+    }
+    nonTypoTagStdWrap {
+        encapsLines {
+            encapsTagList = p,pre,h1,h2,h3,h4,h5,h6,hr,dt
+            remapTag.DIV = P
+            nonWrappedTag = P
+            innerStdWrap_all.ifBlank = &nbsp;
+        }
+    }
+    nonTypoTagStdWrap {
+        HTMLparser = 1
+        HTMLparser {
+            keepNonMatchedTags = 1
+            htmlSpecialChars = 2
+        }
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.txt
deleted file mode 100644 (file)
index afa8936..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-plugin.tx_frontend._CSS_DEFAULT_STYLE (
-    .ce-align-left { text-align: left; }
-    .ce-align-center { text-align: center; }
-    .ce-align-right { text-align: right; }
-
-    .ce-table td, .ce-table th { vertical-align: top; }
-
-    .ce-textpic, .ce-image, .ce-nowrap .ce-bodytext, .ce-gallery, .ce-row, .ce-uploads li, .ce-uploads div { overflow: hidden; }
-
-    .ce-left .ce-gallery, .ce-column { float: left; }
-    .ce-center .ce-outer { position: relative; float: right; right: 50%; }
-    .ce-center .ce-inner { position: relative; float: right; right: -50%; }
-    .ce-right .ce-gallery { float: right; }
-
-    .ce-gallery figure { display: table; margin: 0; }
-    .ce-gallery figcaption { display: table-caption; caption-side: bottom; }
-    .ce-gallery img { display: block; }
-    .ce-gallery iframe { border-width: 0; }
-    .ce-border img,
-    .ce-border iframe {
-        border: {$styles.content.textmedia.borderWidth}px solid {$styles.content.textmedia.borderColor};
-        padding: {$styles.content.textmedia.borderPadding}px;
-    }
-
-    .ce-intext.ce-right .ce-gallery, .ce-intext.ce-left .ce-gallery, .ce-above .ce-gallery {
-        margin-bottom: {$styles.content.textmedia.textMargin}px;
-    }
-    .ce-intext.ce-right .ce-gallery { margin-left: {$styles.content.textmedia.textMargin}px; }
-    .ce-intext.ce-left .ce-gallery { margin-right: {$styles.content.textmedia.textMargin}px; }
-    .ce-below .ce-gallery { margin-top: {$styles.content.textmedia.textMargin}px; }
-
-    .ce-column { margin-right: {$styles.content.textmedia.columnSpacing}px; }
-    .ce-column:last-child { margin-right: 0; }
-
-    .ce-row { margin-bottom: {$styles.content.textmedia.rowSpacing}px; }
-    .ce-row:last-child { margin-bottom: 0; }
-
-    .ce-above .ce-bodytext { clear: both; }
-
-    .ce-intext.ce-left ol, .ce-intext.ce-left ul { padding-left: 40px; overflow: auto; }
-
-    /* Headline */
-    .ce-headline-left { text-align: left; }
-    .ce-headline-center { text-align: center; }
-    .ce-headline-right { text-align: right; }
-
-    /* Uploads */
-    .ce-uploads { margin: 0; padding: 0; }
-    .ce-uploads li { list-style: none outside none; margin: 1em 0; }
-    .ce-uploads img { float: left; padding-right: 1em; vertical-align: top; }
-    .ce-uploads span { display: block; }
-
-    /* Table */
-    .ce-table { width: 100%; max-width: 100%; }
-    .ce-table th, .ce-table td { padding: 0.5em 0.75em; vertical-align: top; }
-    .ce-table thead th { border-bottom: 2px solid #dadada; }
-    .ce-table th, .ce-table td { border-top: 1px solid #dadada; }
-    .ce-table-striped tbody tr:nth-of-type(odd) { background-color: rgba(0,0,0,.05); }
-    .ce-table-bordered th, .ce-table-bordered td { border: 1px solid #dadada; }
-
-    /* Space */
-    .frame-space-before-extra-small { margin-top: 1em; }
-    .frame-space-before-small { margin-top: 2em; }
-    .frame-space-before-medium { margin-top: 3em; }
-    .frame-space-before-large { margin-top: 4em; }
-    .frame-space-before-extra-large { margin-top: 5em; }
-    .frame-space-after-extra-small { margin-bottom: 1em; }
-    .frame-space-after-small { margin-bottom: 2em; }
-    .frame-space-after-medium { margin-bottom: 3em; }
-    .frame-space-after-large { margin-bottom: 4em; }
-    .frame-space-after-extra-large { margin-bottom: 5em; }
-
-    /* Frame */
-    .frame-ruler-before:before { content: ''; display: block; border-top: 1px solid rgba(0,0,0,0.25); margin-bottom: 2em; }
-    .frame-ruler-after:after { content: ''; display: block; border-bottom: 1px solid rgba(0,0,0,0.25); margin-top: 2em; }
-    .frame-indent { margin-left: 15%; margin-right: 15%; }
-    .frame-indent-left { margin-left: 33%; }
-    .frame-indent-right { margin-right: 33%; }
-)
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.typoscript
new file mode 100644 (file)
index 0000000..afa8936
--- /dev/null
@@ -0,0 +1,79 @@
+plugin.tx_frontend._CSS_DEFAULT_STYLE (
+    .ce-align-left { text-align: left; }
+    .ce-align-center { text-align: center; }
+    .ce-align-right { text-align: right; }
+
+    .ce-table td, .ce-table th { vertical-align: top; }
+
+    .ce-textpic, .ce-image, .ce-nowrap .ce-bodytext, .ce-gallery, .ce-row, .ce-uploads li, .ce-uploads div { overflow: hidden; }
+
+    .ce-left .ce-gallery, .ce-column { float: left; }
+    .ce-center .ce-outer { position: relative; float: right; right: 50%; }
+    .ce-center .ce-inner { position: relative; float: right; right: -50%; }
+    .ce-right .ce-gallery { float: right; }
+
+    .ce-gallery figure { display: table; margin: 0; }
+    .ce-gallery figcaption { display: table-caption; caption-side: bottom; }
+    .ce-gallery img { display: block; }
+    .ce-gallery iframe { border-width: 0; }
+    .ce-border img,
+    .ce-border iframe {
+        border: {$styles.content.textmedia.borderWidth}px solid {$styles.content.textmedia.borderColor};
+        padding: {$styles.content.textmedia.borderPadding}px;
+    }
+
+    .ce-intext.ce-right .ce-gallery, .ce-intext.ce-left .ce-gallery, .ce-above .ce-gallery {
+        margin-bottom: {$styles.content.textmedia.textMargin}px;
+    }
+    .ce-intext.ce-right .ce-gallery { margin-left: {$styles.content.textmedia.textMargin}px; }
+    .ce-intext.ce-left .ce-gallery { margin-right: {$styles.content.textmedia.textMargin}px; }
+    .ce-below .ce-gallery { margin-top: {$styles.content.textmedia.textMargin}px; }
+
+    .ce-column { margin-right: {$styles.content.textmedia.columnSpacing}px; }
+    .ce-column:last-child { margin-right: 0; }
+
+    .ce-row { margin-bottom: {$styles.content.textmedia.rowSpacing}px; }
+    .ce-row:last-child { margin-bottom: 0; }
+
+    .ce-above .ce-bodytext { clear: both; }
+
+    .ce-intext.ce-left ol, .ce-intext.ce-left ul { padding-left: 40px; overflow: auto; }
+
+    /* Headline */
+    .ce-headline-left { text-align: left; }
+    .ce-headline-center { text-align: center; }
+    .ce-headline-right { text-align: right; }
+
+    /* Uploads */
+    .ce-uploads { margin: 0; padding: 0; }
+    .ce-uploads li { list-style: none outside none; margin: 1em 0; }
+    .ce-uploads img { float: left; padding-right: 1em; vertical-align: top; }
+    .ce-uploads span { display: block; }
+
+    /* Table */
+    .ce-table { width: 100%; max-width: 100%; }
+    .ce-table th, .ce-table td { padding: 0.5em 0.75em; vertical-align: top; }
+    .ce-table thead th { border-bottom: 2px solid #dadada; }
+    .ce-table th, .ce-table td { border-top: 1px solid #dadada; }
+    .ce-table-striped tbody tr:nth-of-type(odd) { background-color: rgba(0,0,0,.05); }
+    .ce-table-bordered th, .ce-table-bordered td { border: 1px solid #dadada; }
+
+    /* Space */
+    .frame-space-before-extra-small { margin-top: 1em; }
+    .frame-space-before-small { margin-top: 2em; }
+    .frame-space-before-medium { margin-top: 3em; }
+    .frame-space-before-large { margin-top: 4em; }
+    .frame-space-before-extra-large { margin-top: 5em; }
+    .frame-space-after-extra-small { margin-bottom: 1em; }
+    .frame-space-after-small { margin-bottom: 2em; }
+    .frame-space-after-medium { margin-bottom: 3em; }
+    .frame-space-after-large { margin-bottom: 4em; }
+    .frame-space-after-extra-large { margin-bottom: 5em; }
+
+    /* Frame */
+    .frame-ruler-before:before { content: ''; display: block; border-top: 1px solid rgba(0,0,0,0.25); margin-bottom: 2em; }
+    .frame-ruler-after:after { content: ''; display: block; border-bottom: 1px solid rgba(0,0,0,0.25); margin-top: 2em; }
+    .frame-indent { margin-left: 15%; margin-right: 15%; }
+    .frame-indent-left { margin-left: 33%; }
+    .frame-indent-right { margin-right: 33%; }
+)
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.txt
deleted file mode 100644 (file)
index 90fb339..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-styles.templates {
-    # 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 {
-    # cat=content/cHeader/h0; type=int[1-5]; label=Default Header type: Enter the number of the header layout to be used by default
-    defaultHeaderType = 2
-
-    # cat=content/cShortcut/t0; type=string; label=List of accepted tables
-    shortcut.tables = tt_content
-
-    # cat=content/parseFunc/a0; type=string; label=List of allowed HTML tags when rendering RTE content
-    allowTags = a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, meta, nav, ol, p, pre, q, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var
-
-    textmedia {
-        # cat=content/cTextmedia/b1; type=int+; label= Max Image/Media Width: This indicates that maximum number of pixels (width) a block of media elements inserted as content is allowed to consume
-        maxW = 600
-        # cat=content/cTextmedia/b2; type=int+; label= Max Image/Media Width (Text): Same as above, but this is the maximum width when text is wrapped around an block of media elements. Default is 50% of the normal Max Media Item Width
-        maxWInText = 300
-
-        # cat=content/cTextmedia/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between media elements in a block in content elements of type "Media & Images". If you change this manually in your CSS, you need to adjust this setting accordingly
-        columnSpacing = 10
-        # cat=content/cTextmedia/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each media elements row in content elements of type ""Text & Media". If you change this manually in your CSS, you need to adjust this setting accordingly
-        rowSpacing = 10
-        # cat=content/cTextmedia/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images"
-        textMargin = 10
-
-        # cat=content/cTextmedia/i1; type=color; label= Media element border, color: Bordercolor of media elements in content elements when "Border"-option for an element is set
-        borderColor = #000000
-        # cat=content/cTextmedia/i2; type=int[0-100]; label= Media element border, thickness: Thickness of border around media elements in content elements when "Border"-option for element is set
-        borderWidth = 2
-        # cat=content/cTextmedia/i3; type=int+; label= Media element border, padding: Padding left and right to the media element, around the border
-        borderPadding = 0
-
-        # cat=content/cTextmedia/c1; type=string; label= Click-enlarge Media Width: This specifies the width of the enlarged media element when click-enlarge is enabled
-        linkWrap.width = 800m
-        # cat=content/cTextmedia/c2; type=string; label= Click-enlarge Media Height: This specifies the height of the enlarged media element when click-enlarge is enabled
-        linkWrap.height = 600m
-        # cat=content/cTextmedia/c3; type=boolean; label= Advanced, New window: If set, every click-enlarged media element will open in it's own popup window and not the current popup window (which may have a wrong size for the media element to fit in)
-        linkWrap.newWindow = 0
-        # cat=content/cTextmedia/c4; type=boolean; label= Lightbox click-enlarge rendering: Whether media elements with click-enlarge checked should be rendered lightbox-compliant
-        linkWrap.lightboxEnabled = 0
-        # cat=content/cTextmedia/c5; type=string; label= Lightbox CSS class: Which CSS class to use for lightbox links (only applicable if lightbox rendering is enabled)
-        linkWrap.lightboxCssClass = lightbox
-        # cat=content/cTextmedia/c6; type=string; label= Lightbox rel="" attribute: Which rel="" attribute to use for lightbox links (only applicable if lightbox rendering is enabled)
-        linkWrap.lightboxRelAttribute = lightbox[{field:uid}]
-    }
-
-    links {
-        # cat=content/links/l2; type=small; label= Target for external links
-        extTarget = _blank
-        # cat=content/links/l3; type=string; label= Parts to keep when building links: Comma separated list of the link parts to show when building the link-text: scheme,path,query. Example: "" (empty) => www.example.com, "scheme,path" => http://www.example.com
-        keep = path
-    }
-}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/constants.typoscript
new file mode 100644 (file)
index 0000000..90fb339
--- /dev/null
@@ -0,0 +1,60 @@
+styles.templates {
+    # 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 {
+    # cat=content/cHeader/h0; type=int[1-5]; label=Default Header type: Enter the number of the header layout to be used by default
+    defaultHeaderType = 2
+
+    # cat=content/cShortcut/t0; type=string; label=List of accepted tables
+    shortcut.tables = tt_content
+
+    # cat=content/parseFunc/a0; type=string; label=List of allowed HTML tags when rendering RTE content
+    allowTags = a, abbr, acronym, address, article, aside, b, bdo, big, blockquote, br, caption, center, cite, code, col, colgroup, dd, del, dfn, dl, div, dt, em, font, footer, header, h1, h2, h3, h4, h5, h6, hr, i, img, ins, kbd, label, li, link, meta, nav, ol, p, pre, q, samp, sdfield, section, small, span, strike, strong, style, sub, sup, table, thead, tbody, tfoot, td, th, tr, title, tt, u, ul, var
+
+    textmedia {
+        # cat=content/cTextmedia/b1; type=int+; label= Max Image/Media Width: This indicates that maximum number of pixels (width) a block of media elements inserted as content is allowed to consume
+        maxW = 600
+        # cat=content/cTextmedia/b2; type=int+; label= Max Image/Media Width (Text): Same as above, but this is the maximum width when text is wrapped around an block of media elements. Default is 50% of the normal Max Media Item Width
+        maxWInText = 300
+
+        # cat=content/cTextmedia/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between media elements in a block in content elements of type "Media & Images". If you change this manually in your CSS, you need to adjust this setting accordingly
+        columnSpacing = 10
+        # cat=content/cTextmedia/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each media elements row in content elements of type ""Text & Media". If you change this manually in your CSS, you need to adjust this setting accordingly
+        rowSpacing = 10
+        # cat=content/cTextmedia/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images"
+        textMargin = 10
+
+        # cat=content/cTextmedia/i1; type=color; label= Media element border, color: Bordercolor of media elements in content elements when "Border"-option for an element is set
+        borderColor = #000000
+        # cat=content/cTextmedia/i2; type=int[0-100]; label= Media element border, thickness: Thickness of border around media elements in content elements when "Border"-option for element is set
+        borderWidth = 2
+        # cat=content/cTextmedia/i3; type=int+; label= Media element border, padding: Padding left and right to the media element, around the border
+        borderPadding = 0
+
+        # cat=content/cTextmedia/c1; type=string; label= Click-enlarge Media Width: This specifies the width of the enlarged media element when click-enlarge is enabled
+        linkWrap.width = 800m
+        # cat=content/cTextmedia/c2; type=string; label= Click-enlarge Media Height: This specifies the height of the enlarged media element when click-enlarge is enabled
+        linkWrap.height = 600m
+        # cat=content/cTextmedia/c3; type=boolean; label= Advanced, New window: If set, every click-enlarged media element will open in it's own popup window and not the current popup window (which may have a wrong size for the media element to fit in)
+        linkWrap.newWindow = 0
+        # cat=content/cTextmedia/c4; type=boolean; label= Lightbox click-enlarge rendering: Whether media elements with click-enlarge checked should be rendered lightbox-compliant
+        linkWrap.lightboxEnabled = 0
+        # cat=content/cTextmedia/c5; type=string; label= Lightbox CSS class: Which CSS class to use for lightbox links (only applicable if lightbox rendering is enabled)
+        linkWrap.lightboxCssClass = lightbox
+        # cat=content/cTextmedia/c6; type=string; label= Lightbox rel="" attribute: Which rel="" attribute to use for lightbox links (only applicable if lightbox rendering is enabled)
+        linkWrap.lightboxRelAttribute = lightbox[{field:uid}]
+    }
+
+    links {
+        # cat=content/links/l2; type=small; label= Target for external links
+        extTarget = _blank
+        # cat=content/links/l3; type=string; label= Parts to keep when building links: Comma separated list of the link parts to show when building the link-text: scheme,path,query. Example: "" (empty) => www.example.com, "scheme,path" => http://www.example.com
+        keep = path
+    }
+}
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.txt b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index 1ccbd61..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# Include setup
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.txt">
-
-
-# Content element rendering
-tt_content {
-    stdWrap {
-        # Setup the edit panel for all content elements
-        editPanel = 1
-        editPanel {
-            allow = move, new, edit, hide, delete
-            label = %s
-            onlyCurrentPid = 1
-            previewBorder = 1
-            edit.displayRecord = 1
-        }
-    }
-}
-
-
-# Typical content elements
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Div.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Header.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Html.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Image.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/List.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Table.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Text.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.txt">
-
-
-# Menu content elements
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.txt">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.txt">
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..db6d335
--- /dev/null
@@ -0,0 +1,48 @@
+# Include setup
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.typoscript">
+
+
+# Content element rendering
+tt_content {
+    stdWrap {
+        # Setup the edit panel for all content elements
+        editPanel = 1
+        editPanel {
+            allow = move, new, edit, hide, delete
+            label = %s
+            onlyCurrentPid = 1
+            previewBorder = 1
+            edit.displayRecord = 1
+        }
+    }
+}
+
+
+# Typical content elements
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Div.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Header.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Html.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Image.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/List.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Table.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Text.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.typoscript">
+
+
+# Menu content elements
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript">
+<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript">
index bcba0df..6ee60d7 100644 (file)
@@ -8,7 +8,7 @@ Overriding the FLUID templates
 
 At :ref:`typoscript` we have described the way content elements are rendered.
 
-By default these settings are done in the file :file:`setup.txt` which can be found in the
+By default these settings are done in the file :file:`setup.typoscript` which can be found in the
 folder :file:`EXT:fluid_styled_content/Configuration/TypoScript/`.
 
 
@@ -34,7 +34,7 @@ the same as `partialRootPaths` and `layoutRootPaths`:
       }
    }
 
-A content element is using a `templateName`, which is defined in :file:`setup.txt`. You
+A content element is using a `templateName`, which is defined in :file:`setup.typoscript`. You
 can override this value, but the template from the extension "fluid_styled_content" will
 not be loaded then, since its name is still the default value.
 
index 3a692d6..8cf7737 100644 (file)
@@ -17,61 +17,61 @@ in the directory :file:`EXT:fluid_styled_content/Configuration/TypoScript/`.
 
 In this folder there are two files:
 
-- :file:`constants.txt` - The file with the default constants. The "Constant Editor", as
+- :file:`constants.typoscript` - The file with the default constants. The "Constant Editor", as
   described above, is using this file for its default settings.
 
-- :file:`setup.txt` - This file will first include some other files which are located in
+- :file:`setup.typoscript` - This file will first include some other files which are located in
   the "Setup" folder in the same directory. More about these files later.
 
 In the folder :file:`ContentElement` there are files which are included by the file
-:file:`setup.txt` as mentioned above. These files contain the rendering definitions of all
+:file:`setup.typoscript` as mentioned above. These files contain the rendering definitions of all
 content elements, that are provided by the TYPO3 core. These are:
 
-- :file:`Bullets.txt` - Configuration for Content Element "Bullet List"
+- :file:`Bullets.typoscript` - Configuration for Content Element "Bullet List"
 
-- :file:`Div.txt` - Configuration for Content Element "Divider"
+- :file:`Div.typoscript` - Configuration for Content Element "Divider"
 
-- :file:`Header.txt` - Configuration for Content Element "Header Only"
+- :file:`Header.typoscript` - Configuration for Content Element "Header Only"
 
-- :file:`Html.txt` - Configuration for Content Element "Plain HTML"
+- :file:`Html.typoscript` - Configuration for Content Element "Plain HTML"
 
-- :file:`Image.txt` - Configuration for Content Element "Image"
+- :file:`Image.typoscript` - Configuration for Content Element "Image"
 
-- :file:`List.txt` - Configuration for Content Element "General Plugin"
+- :file:`List.typoscript` - Configuration for Content Element "General Plugin"
 
-- :file:`MenuAbstract.txt` - Configuration for Content Element "Menu of subpages of selected pages including abstracts"
+- :file:`MenuAbstract.typoscript` - Configuration for Content Element "Menu of subpages of selected pages including abstracts"
 
-- :file:`MenuCategorizedContent.txt` - Configuration for Content Element "Content elements for selected categories"
+- :file:`MenuCategorizedContent.typoscript` - Configuration for Content Element "Content elements for selected categories"
 
-- :file:`MenuCategorizedPages.txt` - Configuration for Content Element "Pages for selected categories"
+- :file:`MenuCategorizedPages.typoscript` - Configuration for Content Element "Pages for selected categories"
 
-- :file:`MenuPages.txt` - Configuration for Content Element "Menu of selected pages"
+- :file:`MenuPages.typoscript` - Configuration for Content Element "Menu of selected pages"
 
-- :file:`MenuRecentlyUpdated.txt` - Configuration for Content Element "Recently updated pages"
+- :file:`MenuRecentlyUpdated.typoscript` - Configuration for Content Element "Recently updated pages"
 
-- :file:`MenuRelatedPages.txt` - Configuration for Content Element "Related pages (based on keywords)"
+- :file:`MenuRelatedPages.typoscript` - Configuration for Content Element "Related pages (based on keywords)"
 
-- :file:`MenuSection.txt` - Configuration for Content Element "Section index (page content marked for section menus)"
+- :file:`MenuSection.typoscript` - Configuration for Content Element "Section index (page content marked for section menus)"
 
-- :file:`MenuSectionPages.txt` - Configuration for Content Element "Menu of subpages of selected pages including sections"
+- :file:`MenuSectionPages.typoscript` - Configuration for Content Element "Menu of subpages of selected pages including sections"
 
-- :file:`MenuSitemap.txt` - Configuration for Content Element "Sitemap"
+- :file:`MenuSitemap.typoscript` - Configuration for Content Element "Sitemap"
 
-- :file:`MenuSitemapPages.txt` - Configuration for Content Element "Sitemaps of selected pages"
+- :file:`MenuSitemapPages.typoscript` - Configuration for Content Element "Sitemaps of selected pages"
 
-- :file:`MenuSubpages.txt` - Configuration for Content Element "Menu of subpages of selected pages"
+- :file:`MenuSubpages.typoscript` - Configuration for Content Element "Menu of subpages of selected pages"
 
-- :file:`Shortcut.txt` - Configuration for Content Element "Insert records"
+- :file:`Shortcut.typoscript` - Configuration for Content Element "Insert records"
 
-- :file:`Table.txt` - Configuration for Content Element "Table"
+- :file:`Table.typoscript` - Configuration for Content Element "Table"
 
-- :file:`Text.txt` - Configuration for Content Element "Regular Text Element"
+- :file:`Text.typoscript` - Configuration for Content Element "Regular Text Element"
 
-- :file:`Textmedia.txt` - Configuration for Content Element "Text and Media"
+- :file:`Textmedia.typoscript` - Configuration for Content Element "Text and Media"
 
-- :file:`Textpic.txt` - Configuration for Content Element "Text and Images"
+- :file:`Textpic.typoscript` - Configuration for Content Element "Text and Images"
 
-- :file:`Uploads.txt` - Configuration for Content Element "File Links"
+- :file:`Uploads.typoscript` - Configuration for Content Element "File Links"
 
 Since we move away from TypoScript as much as possible, these rendering
 definitions only declare the following:
@@ -87,9 +87,9 @@ definitions only declare the following:
   see this in action.
 
 In the folder :file:`Helper` there are files which are included by the file
-:file:`setup.txt` as mentioned above. These are:
+:file:`setup.typoscript` as mentioned above. These are:
 
-- :file:`ContentElement.txt` - Default configuration for content elements using
+- :file:`ContentElement.typoscript` - Default configuration for content elements using
   FLUIDTEMPLATE
 
-- :file:`ParseFunc.txt` - Creates persistent ParseFunc setup for non-HTML content
+- :file:`ParseFunc.typoscript` - Creates persistent ParseFunc setup for non-HTML content
diff --git a/typo3/sysext/form/Configuration/PageTS/modWizards.ts b/typo3/sysext/form/Configuration/PageTS/modWizards.ts
deleted file mode 100644 (file)
index 61c7c7f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-mod.wizards.newContentElement.wizardItems.forms {
-    show :=addToList(formframework)
-    elements {
-        formframework {
-            iconIdentifier = content-form
-            title = LLL:EXT:form/Resources/Private/Language/locallang.xlf:form_new_wizard_title
-            description = LLL:EXT:form/Resources/Private/Language/locallang:form_new_wizard_description
-            tt_content_defValues {
-                CType = form_formframework
-            }
-        }
-    }
-}
diff --git a/typo3/sysext/form/Configuration/PageTS/modWizards.tsconfig b/typo3/sysext/form/Configuration/PageTS/modWizards.tsconfig
new file mode 100644 (file)
index 0000000..61c7c7f
--- /dev/null
@@ -0,0 +1,13 @@
+mod.wizards.newContentElement.wizardItems.forms {
+    show :=addToList(formframework)
+    elements {
+        formframework {
+            iconIdentifier = content-form
+            title = LLL:EXT:form/Resources/Private/Language/locallang.xlf:form_new_wizard_title
+            description = LLL:EXT:form/Resources/Private/Language/locallang:form_new_wizard_description
+            tt_content_defValues {
+                CType = form_formframework
+            }
+        }
+    }
+}
diff --git a/typo3/sysext/form/Configuration/TypoScript/setup.txt b/typo3/sysext/form/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index eb81df0..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-plugin.tx_form {
-    view {
-        # Note that this configuration only affects the EXT:Form plugin
-        # template (form/Resources/Private/Frontend/Templates/Render.html)
-        # The fluid paths for the formelements reside within the YAML settings.
-        # @see TYPO3.CMS.Form.<prototypeName>.standard.formElementsDefinition.Form.renderingOptions
-        #
-        # That means: If you want to override the formelement templates
-        # then change them within the YAML settings, not here.
-        templateRootPaths.0 = EXT:form/Resources/Private/Frontend/Templates/
-        partialRootPaths.0 = EXT:form/Resources/Private/Frontend/Partials/
-        layoutRootPaths.0 = EXT:form/Resources/Private/Frontend/Layouts/
-    }
-
-    mvc {
-        callDefaultActionIfActionCantBeResolved = 1
-    }
-
-    settings {
-        yamlConfigurations {
-            10 = EXT:form/Configuration/Yaml/BaseSetup.yaml
-            20 = EXT:form/Configuration/Yaml/FormEngineSetup.yaml
-        }
-    }
-}
-
-# Rendering of content elements
-lib.tx_form.contentElementRendering = RECORDS
-lib.tx_form.contentElementRendering {
-    tables = tt_content
-    source.current = 1
-    dontCheckPid = 1
-}
\ No newline at end of file
diff --git a/typo3/sysext/form/Configuration/TypoScript/setup.typoscript b/typo3/sysext/form/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..eb81df0
--- /dev/null
@@ -0,0 +1,33 @@
+plugin.tx_form {
+    view {
+        # Note that this configuration only affects the EXT:Form plugin
+        # template (form/Resources/Private/Frontend/Templates/Render.html)
+        # The fluid paths for the formelements reside within the YAML settings.
+        # @see TYPO3.CMS.Form.<prototypeName>.standard.formElementsDefinition.Form.renderingOptions
+        #
+        # That means: If you want to override the formelement templates
+        # then change them within the YAML settings, not here.
+        templateRootPaths.0 = EXT:form/Resources/Private/Frontend/Templates/
+        partialRootPaths.0 = EXT:form/Resources/Private/Frontend/Partials/
+        layoutRootPaths.0 = EXT:form/Resources/Private/Frontend/Layouts/
+    }
+
+    mvc {
+        callDefaultActionIfActionCantBeResolved = 1
+    }
+
+    settings {
+        yamlConfigurations {
+            10 = EXT:form/Configuration/Yaml/BaseSetup.yaml
+            20 = EXT:form/Configuration/Yaml/FormEngineSetup.yaml
+        }
+    }
+}
+
+# Rendering of content elements
+lib.tx_form.contentElementRendering = RECORDS
+lib.tx_form.contentElementRendering {
+    tables = tt_content
+    source.current = 1
+    dontCheckPid = 1
+}
\ No newline at end of file
index 61ebe0f..baee38c 100644 (file)
@@ -140,12 +140,12 @@ configuration of the backend ``module.tx_[pluginkey]`` is used.
 There are different ways to include the TypoScript configuration for the
 backend:
 
-- a) use a file called `ext_typoscript_setup.txt`,
+- a) use a file called `ext_typoscript_setup.typoscript`,
 - b) use the API function ``\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptSetup()``,
 - c) add the configuration to your existing TypoScript template.
 
 We recommend using methods a and b. Here is why. The file
-:file:`ext_typoscript_setup.txt` can be stored within the root folder of
+:file:`ext_typoscript_setup.typoscript` can be stored within the root folder of
 your own site package. It will be automatically loaded in both frontend and
 backend of your TYPO3 installation. The API call (method b) does pretty
 much the same.
@@ -161,7 +161,7 @@ To sum it up: choose either method a or b, and you will be fine.
 
 .. _concepts-configuration-yamlregistration-backend-ext_typoscript_setup.txt:
 
-YAML registration for the backend via ext_typoscript_setup.txt
+YAML registration for the backend via ext_typoscript_setup.typoscript
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 .. code-block:: typoscript
index 0dedfd1..8e6b918 100644 (file)
@@ -25,7 +25,7 @@ sitepackage ``EXT:my_site_package`` which contains your whole frontend
 integration.
 
 
-EXT:my_site_package/Configuration/TypoScript/setup.txt
+EXT:my_site_package/Configuration/TypoScript/setup.typoscript
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 First of all, register a new EXT:form configuration for the frontend via
@@ -73,12 +73,12 @@ Next, define the additional fluid template search paths via YAML.
    templates, register the new paths for the backend module as well.
 
 
-EXT:my_site_package/ext_typoscript_setup.txt
+EXT:my_site_package/ext_typoscript_setup.typoscript
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Register your EXT:form configuration for the backend via TypoScript. Read
 the :ref:`chapter <concepts-configuration-yamlregistration-backend>` to
-learn why we recommend using the concept behind ``ext_typoscript_setup.txt``.
+learn why we recommend using the concept behind ``ext_typoscript_setup.typoscript``.
 
 .. code-block:: typoscript
 
@@ -182,4 +182,4 @@ string which will be shown as the first select-option. If both settings exist,
 the :yaml:`defaultValue` is prioritized.
 
 Learn more :ref:`here<typo3.cms.form.prototypes.\<prototypeIdentifier>.formelementsdefinition.\<formelementtypeidentifier>.defaultValue>`
-and see the forge issue `#82422 <https://forge.typo3.org/issues/82422#note-6>`_.
\ No newline at end of file
+and see the forge issue `#82422 <https://forge.typo3.org/issues/82422#note-6>`_.
index bdb4d7d..f0224f5 100644 (file)
@@ -17,7 +17,7 @@ call_user_func(function () {
 
     // Add new content element wizard entry
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
-        '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/PageTS/modWizards.ts">'
+        '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/PageTS/modWizards.tsconfig">'
     );
 
     // Add module configuration
diff --git a/typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig b/typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig
new file mode 100644 (file)
index 0000000..7a03f69
--- /dev/null
@@ -0,0 +1,208 @@
+mod.wizards.newContentElement.wizardItems {
+    common.elements {
+        header {
+            iconIdentifier = content-header
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_headerOnly_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_headerOnly_description
+            tt_content_defValues {
+                CType = header
+            }
+        }
+        text {
+            iconIdentifier = content-text
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_regularText_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_regularText_description
+            tt_content_defValues {
+                CType = text
+            }
+        }
+        textpic {
+            iconIdentifier = content-textpic
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textImage_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textImage_description
+            tt_content_defValues {
+                CType = textpic
+            }
+        }
+        image {
+            iconIdentifier = content-image
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_imagesOnly_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_imagesOnly_description
+            tt_content_defValues {
+                CType = image
+            }
+        }
+        textmedia {
+            iconIdentifier = content-textmedia
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textMedia_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textMedia_description
+            tt_content_defValues {
+                CType = textmedia
+            }
+        }
+        bullets {
+            iconIdentifier = content-bullets
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_bulletList_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_bulletList_description
+            tt_content_defValues {
+                CType = bullets
+            }
+        }
+        table {
+            iconIdentifier = content-table
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_table_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_table_description
+            tt_content_defValues {
+                CType = table
+            }
+        }
+        uploads {
+            iconIdentifier = content-special-uploads
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_filelinks_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_filelinks_description
+            tt_content_defValues {
+                CType = uploads
+            }
+        }
+    }
+    common.show := addToList(header)
+    common.show := addToList(text)
+    common.show := addToList(textpic)
+    common.show := addToList(image)
+    common.show := addToList(textmedia)
+    common.show := addToList(bullets)
+    common.show := addToList(table)
+    common.show := addToList(uploads)
+
+    menu.elements {
+        menu_abstract {
+            iconIdentifier = content-menu-abstract
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_abstract.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_abstract.description
+            tt_content_defValues {
+                CType = menu_abstract
+            }
+        }
+        menu_categorized_content {
+            iconIdentifier = content-menu-categorized
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_content.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_content.description
+            tt_content_defValues {
+                CType = menu_categorized_content
+            }
+        }
+        menu_categorized_pages {
+            iconIdentifier = content-menu-categorized
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_pages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_pages.description
+            tt_content_defValues {
+                CType = menu_categorized_pages
+            }
+        }
+        menu_pages {
+            iconIdentifier = content-menu-pages
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_pages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_pages.description
+            tt_content_defValues {
+                CType = menu_pages
+            }
+        }
+        menu_subpages {
+            iconIdentifier = content-menu-pages
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_subpages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_subpages.description
+            tt_content_defValues {
+                CType = menu_subpages
+            }
+        }
+        menu_recently_updated {
+            iconIdentifier = content-menu-recently-updated
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_recently_updated.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_recently_updated.description
+            tt_content_defValues {
+                CType = menu_recently_updated
+            }
+        }
+        menu_related_pages {
+            iconIdentifier = content-menu-related
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_related_pages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_related_pages.description
+            tt_content_defValues {
+                CType = menu_related_pages
+            }
+        }
+        menu_section {
+            iconIdentifier = content-menu-section
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section.description
+            tt_content_defValues {
+                CType = menu_section
+            }
+        }
+        menu_section_pages {
+            iconIdentifier = content-menu-section
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section_pages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section_pages.description
+            tt_content_defValues {
+                CType = menu_section_pages
+            }
+        }
+        menu_sitemap {
+            iconIdentifier = content-menu-sitemap
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap.description
+            tt_content_defValues {
+                CType = menu_sitemap
+            }
+        }
+        menu_sitemap_pages {
+            iconIdentifier = content-menu-sitemap-pages
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap_pages.title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap_pages.description
+            tt_content_defValues {
+                CType = menu_sitemap_pages
+            }
+        }
+    }
+    menu.show := addToList(menu_abstract)
+    menu.show := addToList(menu_categorized_content)
+    menu.show := addToList(menu_categorized_pages)
+    menu.show := addToList(menu_pages)
+    menu.show := addToList(menu_subpages)
+    menu.show := addToList(menu_recently_updated)
+    menu.show := addToList(menu_related_pages)
+    menu.show := addToList(menu_section)
+    menu.show := addToList(menu_section_pages)
+    menu.show := addToList(menu_sitemap)
+    menu.show := addToList(menu_sitemap_pages)
+
+    special.elements {
+        html {
+            iconIdentifier = content-special-html
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_plainHTML_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_plainHTML_description
+            tt_content_defValues {
+                CType = html
+            }
+        }
+        div {
+            iconIdentifier = content-special-div
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_divider_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_divider_description
+            tt_content_defValues {
+                CType = div
+            }
+        }
+        shortcut {
+            iconIdentifier = content-special-shortcut
+            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_shortcut_title
+            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_shortcut_description
+            tt_content_defValues {
+                CType = shortcut
+            }
+        }
+    }
+    special.show := addToList(html)
+    special.show := addToList(div)
+    special.show := addToList(shortcut)
+}
diff --git a/typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.txt b/typo3/sysext/frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.txt
deleted file mode 100644 (file)
index 7a03f69..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-mod.wizards.newContentElement.wizardItems {
-    common.elements {
-        header {
-            iconIdentifier = content-header
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_headerOnly_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_headerOnly_description
-            tt_content_defValues {
-                CType = header
-            }
-        }
-        text {
-            iconIdentifier = content-text
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_regularText_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_regularText_description
-            tt_content_defValues {
-                CType = text
-            }
-        }
-        textpic {
-            iconIdentifier = content-textpic
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textImage_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textImage_description
-            tt_content_defValues {
-                CType = textpic
-            }
-        }
-        image {
-            iconIdentifier = content-image
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_imagesOnly_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_imagesOnly_description
-            tt_content_defValues {
-                CType = image
-            }
-        }
-        textmedia {
-            iconIdentifier = content-textmedia
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textMedia_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_textMedia_description
-            tt_content_defValues {
-                CType = textmedia
-            }
-        }
-        bullets {
-            iconIdentifier = content-bullets
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_bulletList_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_bulletList_description
-            tt_content_defValues {
-                CType = bullets
-            }
-        }
-        table {
-            iconIdentifier = content-table
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_table_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common_table_description
-            tt_content_defValues {
-                CType = table
-            }
-        }
-        uploads {
-            iconIdentifier = content-special-uploads
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_filelinks_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_filelinks_description
-            tt_content_defValues {
-                CType = uploads
-            }
-        }
-    }
-    common.show := addToList(header)
-    common.show := addToList(text)
-    common.show := addToList(textpic)
-    common.show := addToList(image)
-    common.show := addToList(textmedia)
-    common.show := addToList(bullets)
-    common.show := addToList(table)
-    common.show := addToList(uploads)
-
-    menu.elements {
-        menu_abstract {
-            iconIdentifier = content-menu-abstract
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_abstract.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_abstract.description
-            tt_content_defValues {
-                CType = menu_abstract
-            }
-        }
-        menu_categorized_content {
-            iconIdentifier = content-menu-categorized
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_content.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_content.description
-            tt_content_defValues {
-                CType = menu_categorized_content
-            }
-        }
-        menu_categorized_pages {
-            iconIdentifier = content-menu-categorized
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_pages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_categorized_pages.description
-            tt_content_defValues {
-                CType = menu_categorized_pages
-            }
-        }
-        menu_pages {
-            iconIdentifier = content-menu-pages
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_pages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_pages.description
-            tt_content_defValues {
-                CType = menu_pages
-            }
-        }
-        menu_subpages {
-            iconIdentifier = content-menu-pages
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_subpages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_subpages.description
-            tt_content_defValues {
-                CType = menu_subpages
-            }
-        }
-        menu_recently_updated {
-            iconIdentifier = content-menu-recently-updated
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_recently_updated.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_recently_updated.description
-            tt_content_defValues {
-                CType = menu_recently_updated
-            }
-        }
-        menu_related_pages {
-            iconIdentifier = content-menu-related
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_related_pages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_related_pages.description
-            tt_content_defValues {
-                CType = menu_related_pages
-            }
-        }
-        menu_section {
-            iconIdentifier = content-menu-section
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section.description
-            tt_content_defValues {
-                CType = menu_section
-            }
-        }
-        menu_section_pages {
-            iconIdentifier = content-menu-section
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section_pages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_section_pages.description
-            tt_content_defValues {
-                CType = menu_section_pages
-            }
-        }
-        menu_sitemap {
-            iconIdentifier = content-menu-sitemap
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap.description
-            tt_content_defValues {
-                CType = menu_sitemap
-            }
-        }
-        menu_sitemap_pages {
-            iconIdentifier = content-menu-sitemap-pages
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap_pages.title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:menu_sitemap_pages.description
-            tt_content_defValues {
-                CType = menu_sitemap_pages
-            }
-        }
-    }
-    menu.show := addToList(menu_abstract)
-    menu.show := addToList(menu_categorized_content)
-    menu.show := addToList(menu_categorized_pages)
-    menu.show := addToList(menu_pages)
-    menu.show := addToList(menu_subpages)
-    menu.show := addToList(menu_recently_updated)
-    menu.show := addToList(menu_related_pages)
-    menu.show := addToList(menu_section)
-    menu.show := addToList(menu_section_pages)
-    menu.show := addToList(menu_sitemap)
-    menu.show := addToList(menu_sitemap_pages)
-
-    special.elements {
-        html {
-            iconIdentifier = content-special-html
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_plainHTML_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_plainHTML_description
-            tt_content_defValues {
-                CType = html
-            }
-        }
-        div {
-            iconIdentifier = content-special-div
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_divider_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_divider_description
-            tt_content_defValues {
-                CType = div
-            }
-        }
-        shortcut {
-            iconIdentifier = content-special-shortcut
-            title = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_shortcut_title
-            description = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:special_shortcut_description
-            tt_content_defValues {
-                CType = shortcut
-            }
-        }
-    }
-    special.show := addToList(html)
-    special.show := addToList(div)
-    special.show := addToList(shortcut)
-}
diff --git a/typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig b/typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig
new file mode 100644 (file)
index 0000000..220cac4
--- /dev/null
@@ -0,0 +1,9 @@
+TCEFORM.tt_content {
+    imageorient {
+        types {
+            image {
+                removeItems = 8,9,10,17,18,25,26
+            }
+        }
+    }
+}
diff --git a/typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.txt b/typo3/sysext/frontend/Configuration/TSconfig/Page/TCEFORM.txt
deleted file mode 100644 (file)
index 220cac4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-TCEFORM.tt_content {
-    imageorient {
-        types {
-            image {
-                removeItems = 8,9,10,17,18,25,26
-            }
-        }
-    }
-}
index dbf52cf..a8e35c4 100644 (file)
@@ -109,7 +109,7 @@ class LocalizedContentRenderingTest extends \TYPO3\CMS\Core\Tests\Functional\Dat
         $this->importScenarioDataSet('LiveDefaultPages');
         $this->importScenarioDataSet('LiveDefaultElements');
         $this->setUpFrontendRootPage(1, [
-            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.ts',
+            'typo3/sysext/core/Tests/Functional/Fixtures/Frontend/JsonRenderer.typoscript',
         ]);
         $this->backendUser->workspace = 0;
     }
index e0d9561..c10552e 100644 (file)
@@ -108,9 +108,9 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['urlProcessing']['urlHandlers']['front
 
 // Include new content elements to modWizards
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
-    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.txt">'
+    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig">'
 );
 // Include FormEngine adjustments
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
-    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/TCEFORM.txt">'
+    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:frontend/Configuration/TSconfig/Page/TCEFORM.tsconfig">'
 );
diff --git a/typo3/sysext/indexed_search/Configuration/TypoScript/constants.txt b/typo3/sysext/indexed_search/Configuration/TypoScript/constants.txt
deleted file mode 100644 (file)
index 2f93e9e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-plugin.tx_indexedsearch {
-       view {
-                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template root (FE)
-               templateRootPath = EXT:indexed_search/Resources/Private/Templates/
-                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template partials (FE)
-               partialRootPath = EXT:indexed_search/Resources/Private/Partials/
-                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template layouts (FE)
-               layoutRootPath = EXT:indexed_search/Resources/Private/Layouts/
-       }
-       settings {
-               # cat=plugin.tx_indexedsearch/settings; type=integer; label=Set the target page where search results are shown
-               targetPid =
-               # cat=plugin.tx_indexedsearch/settings; type=string; label=A list of integer which should be root-pages to search from
-               rootPidList =
-       }
-}
diff --git a/typo3/sysext/indexed_search/Configuration/TypoScript/constants.typoscript b/typo3/sysext/indexed_search/Configuration/TypoScript/constants.typoscript
new file mode 100644 (file)
index 0000000..2f93e9e
--- /dev/null
@@ -0,0 +1,16 @@
+plugin.tx_indexedsearch {
+       view {
+                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template root (FE)
+               templateRootPath = EXT:indexed_search/Resources/Private/Templates/
+                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template partials (FE)
+               partialRootPath = EXT:indexed_search/Resources/Private/Partials/
+                # cat=plugin.tx_indexedsearch/file; type=string; label=Path to template layouts (FE)
+               layoutRootPath = EXT:indexed_search/Resources/Private/Layouts/
+       }
+       settings {
+               # cat=plugin.tx_indexedsearch/settings; type=integer; label=Set the target page where search results are shown
+               targetPid =
+               # cat=plugin.tx_indexedsearch/settings; type=string; label=A list of integer which should be root-pages to search from
+               rootPidList =
+       }
+}
diff --git a/typo3/sysext/indexed_search/Configuration/TypoScript/setup.txt b/typo3/sysext/indexed_search/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index cf9b38b..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-config.index_enable = 1
-config.index_externals = 1
-config.index_metatags = 1
-
- # Plugin configuration
-plugin.tx_indexedsearch {
-
-       settings {
-               targetPid = {$plugin.tx_indexedsearch.settings.targetPid}
-               # show the rules
-               displayRules = 1
-
-               # show a link to the advanced search
-               displayAdvancedSearchLink = 1
-
-               # show the number of results
-               displayResultNumber = 0
-
-               breadcrumbWrap = / || /
-
-               # show the parse times
-               displayParsetimes = 0
-               displayLevel1Sections = 1
-               displayLevel2Sections = 0
-               displayLevelxAllTypes = 0
-               displayForbiddenRecords = 0
-               alwaysShowPageLinks = 1
-               mediaList =
-
-               rootPidList = {$plugin.tx_indexedsearch.settings.rootPidList}
-               page_links = 10
-               # @deprecated left for BC reasons, will be removed in 10
-               detectDomainRcords = 0
-               detectDomainRecords < .detectDomainRcords
-               defaultFreeIndexUidList =
-               searchSkipExtendToSubpagesChecking = 0
-               exactCount = 0
-               forwardSearchWordsInResultLink = 0
-               forwardSearchWordsInResultLink.no_cache = 1
-
-               # various crop/offset settings for single result items
-               results {
-                       titleCropAfter = 50
-                       titleCropSignifier = ...
-                       summaryCropAfter = 180
-                       summaryCropSignifier =
-                       hrefInSummaryCropAfter = 60
-                       hrefInSummaryCropSignifier = ...
-                       markupSW_summaryMax = 300
-                       markupSW_postPreLgd = 60
-                       markupSW_postPreLgd_offset = 5
-                       markupSW_divider = ...
-                       markupSW_divider.noTrimWrap = | | |
-                       pathExcludeDoktypes =
-               }
-
-               # Blinding of option-selectors / values in these (advanced search)
-               blind {
-                       searchType = 0
-                       defaultOperand = 0
-                       sections = 0
-                       freeIndexUid = 1
-                       mediaType = 0
-                       sortOrder = 0
-                       group = 0
-                       languageUid = 0
-                       desc = 0
-                       # List of available number of results. First will be used as default.
-                       numberOfResults = 10,25,50,100
-                       # defaultOperand.1 = 1
-                       # extResume=1
-               }
-/*
-               flagRendering = CASE
-               flagRendering {
-                       key.current = 1
-                       2 = TEXT
-                       2.value = German
-                       default = TEXT
-                       default.value = English
-               }
-
-               iconRendering = CASE
-               iconRendering {
-                       key.current = 1
-                       html = TEXT
-                       html.value = HtmL
-                       default = TEXT
-                       default.value = TYPO3 pages
-               }
-
-               specialConfiguration {
-                       0.pageIcon = IMAGE
-                       0.pageIcon.file = typo3/sysext/indexed_search/Resources/Public/Icons/FileTypes/pages.gif
-                       1.pageIcon = IMAGE
-                       1.pageIcon.file = typo3/sysext/indexed_search/Resources/Public/Icons/FileTypes/pdf.gif
-               }
-*/
-               defaultOptions {
-                       defaultOperand = 0
-                       sections = 0
-                       freeIndexUid = -1
-                       mediaType = -1
-                       sortOrder = rank_flag
-                       languageUid = -1
-                       sortDesc = 1
-                       searchType = 1
-                       extResume = 1
-               }
-
-       }
-
-
-       view {
-               templateRootPaths {
-                       0 = EXT:indexed_search/Resources/Private/Templates/
-                       10 = {$plugin.tx_indexedsearch.view.templateRootPath}
-               }
-               partialRootPaths {
-                       0 = EXT:indexed_search/Resources/Private/Partials/
-                       10 = {$plugin.tx_indexedsearch.view.partialRootPath}
-               }
-               layoutRootPaths {
-                       0 = EXT:indexed_search/Resources/Private/Layouts/
-                       10 = {$plugin.tx_indexedsearch.view.layoutRootPath}
-               }
-       }
-}
diff --git a/typo3/sysext/indexed_search/Configuration/TypoScript/setup.typoscript b/typo3/sysext/indexed_search/Configuration/TypoScript/setup.typoscript
new file mode 100644 (file)
index 0000000..cf9b38b
--- /dev/null
@@ -0,0 +1,128 @@
+config.index_enable = 1
+config.index_externals = 1
+config.index_metatags = 1
+
+ # Plugin configuration
+plugin.tx_indexedsearch {
+
+       settings {
+               targetPid = {$plugin.tx_indexedsearch.settings.targetPid}
+               # show the rules
+               displayRules = 1
+
+               # show a link to the advanced search
+               displayAdvancedSearchLink = 1
+
+               # show the number of results
+               displayResultNumber = 0
+
+               breadcrumbWrap = / || /
+
+               # show the parse times
+               displayParsetimes = 0
+               displayLevel1Sections = 1
+               displayLevel2Sections = 0
+               displayLevelxAllTypes = 0
+               displayForbiddenRecords = 0
+               alwaysShowPageLinks = 1
+               mediaList =
+
+               rootPidList = {$plugin.tx_indexedsearch.settings.rootPidList}
+               page_links = 10
+               # @deprecated left for BC reasons, will be removed in 10
+               detectDomainRcords = 0
+               detectDomainRecords < .detectDomainRcords
+               defaultFreeIndexUidList =
+               searchSkipExtendToSubpagesChecking = 0
+               exactCount = 0
+               forwardSearchWordsInResultLink = 0
+               forwardSearchWordsInResultLink.no_cache = 1
+
+               # various crop/offset settings for single result items
+               results {
+                       titleCropAfter = 50
+                       titleCropSignifier = ...
+                       summaryCropAfter = 180
+                       summaryCropSignifier =
+                       hrefInSummaryCropAfter = 60
+                       hrefInSummaryCropSignifier = ...
+                       markupSW_summaryMax = 300
+                       markupSW_postPreLgd = 60
+                       markupSW_postPreLgd_offset = 5
+                       markupSW_divider = ...
+                       markupSW_divider.noTrimWrap = | | |
+                       pathExcludeDoktypes =
+               }
+
+               # Blinding of option-selectors / values in these (advanced search)
+               blind {
+                       searchType = 0
+                       defaultOperand = 0
+                       sections = 0
+                       freeIndexUid = 1
+                       mediaType = 0
+                       sortOrder = 0
+                       group = 0
+                       languageUid = 0
+                       desc = 0
+                       # List of available number of results. First will be used as default.
+                       numberOfResults = 10,25,50,100
+                       # defaultOperand.1 = 1
+                       # extResume=1
+               }
+/*
+               flagRendering = CASE
+               flagRendering {
+                       key.current = 1
+                       2 = TEXT
+                       2.value = German
+                       default = TEXT
+                       default.value = English
+               }
+
+               iconRendering = CASE
+               iconRendering {
+                       key.current = 1
+                       html = TEXT
+                       html.value = HtmL
+                       default = TEXT
+                       default.value = TYPO3 pages
+               }
+
+               specialConfiguration {
+                       0.pageIcon = IMAGE
+                       0.pageIcon.file = typo3/sysext/indexed_search/Resources/Public/Icons/FileTypes/pages.gif
+                       1.pageIcon = IMAGE
+                       1.pageIcon.file = typo3/sysext/indexed_search/Resources/Public/Icons/FileTypes/pdf.gif
+               }
+*/
+               defaultOptions {
+                       defaultOperand = 0
+                       sections = 0
+                       freeIndexUid = -1
+                       mediaType = -1
+                       sortOrder = rank_flag
+                       languageUid = -1
+                       sortDesc = 1
+                       searchType = 1
+                       extResume = 1
+               }
+
+       }
+
+
+       view {
+               templateRootPaths {
+                       0 = EXT:indexed_search/Resources/Private/Templates/
+                       10 = {$plugin.tx_indexedsearch.view.templateRootPath}
+               }
+               partialRootPaths {
+                       0 = EXT:indexed_search/Resources/Private/Partials/
+                       10 = {$plugin.tx_indexedsearch.view.partialRootPath}
+               }
+               layoutRootPaths {
+                       0 = EXT:indexed_search/Resources/Private/Layouts/
+                       10 = {$plugin.tx_indexedsearch.view.layoutRootPath}
+               }
+       }
+}
diff --git a/typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.tsconfig b/typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.tsconfig
new file mode 100644 (file)
index 0000000..edb3fea
--- /dev/null
@@ -0,0 +1,18 @@
+mod.linkvalidator {
+       searchFields {
+               pages = media,url
+               tt_content = bodytext,header_link,records
+               tt_news = bodytext,links
+       }
+       linktypes = db,file,external
+       checkhidden = 0
+       showCheckLinkTab = 1
+       mail {
+               fromname = Linkvalidator
+               fromemail = Linkvalidator@example.com
+               replytoname =
+               replytoemail =
+               subject = TYPO3 Linkvalidator report
+       }
+       linkhandler.reportHiddenRecords = 0
+}
\ No newline at end of file
diff --git a/typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.txt b/typo3/sysext/linkvalidator/Configuration/TsConfig/Page/pagetsconfig.txt
deleted file mode 100644 (file)
index edb3fea..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-mod.linkvalidator {
-       searchFields {
-               pages = media,url
-               tt_content = bodytext,header_link,records
-               tt_news = bodytext,links
-       }
-       linktypes = db,file,external
-       checkhidden = 0
-       showCheckLinkTab = 1
-       mail {
-               fromname = Linkvalidator
-               fromemail = Linkvalidator@example.com
-               replytoname =
-               replytoemail =
-               subject = TYPO3 Linkvalidator report
-       }
-       linkhandler.reportHiddenRecords = 0
-}
\&nb