[TASK] Move CSS Styled Content FlexForm to correct location 01/46101/2
authorBenni Mack <benni@typo3.org>
Wed, 20 Jan 2016 08:20:36 +0000 (09:20 +0100)
committerAndreas Fernandez <typo3@scripting-base.de>
Wed, 20 Jan 2016 18:49:31 +0000 (19:49 +0100)
Resolves: #72823
Releases: master
Change-Id: Id636e30eda177265c62031459f256f2a2203b47e
Reviewed-on: https://review.typo3.org/46101
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml [new file with mode: 0644]
typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/css_styled_content/flexform_ds.xml [deleted file]

diff --git a/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml b/typo3/sysext/css_styled_content/Configuration/FlexForms/table.xml
new file mode 100644 (file)
index 0000000..7e8d741
--- /dev/null
@@ -0,0 +1,162 @@
+<T3DataStructure>
+       <sheets>
+               <sDEF>
+                       <ROOT>
+                               <TCEforms>
+                                       <sheetTitle>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables</sheetTitle>
+                               </TCEforms>
+                               <type>array</type>
+                               <el>
+                                       <acctables_caption>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_caption</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>33</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_caption>
+
+                                       <acctables_summary>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_summary</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>33</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_summary>
+
+                                       <acctables_tfoot>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_tfoot</label>
+                                                       <config>
+                                                               <type>check</type>
+                                                               <items type="array">
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
+                                                                               <numIndex index="1">1</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_tfoot>
+
+                                       <acctables_headerpos>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos</label>
+                                                       <config>
+                                                               <type>select</type>
+                                                               <items type="array">
+                                                                       <numIndex index="0" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.0</numIndex>
+                                                                               <numIndex index="1"></numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.1</numIndex>
+                                                                               <numIndex index="1">top</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="2" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.2</numIndex>
+                                                                               <numIndex index="1">left</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                               <minitems>0</minitems>
+                                                               <maxitems>1</maxitems>
+                                                               <size>1</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_headerpos>
+                                       <acctables_nostyles>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_nostyles</label>
+                                                       <config>
+                                                               <type>check</type>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_nostyles>
+
+                                       <acctables_tableclass>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_tableclass</label>
+                                                       <config>
+                                                               <type>input</type>
+                                                               <size>33</size>
+                                                               <eval>trim</eval>
+                                                       </config>
+                                               </TCEforms>
+                                       </acctables_tableclass>
+                               </el>
+                       </ROOT>
+               </sDEF>
+               <s_parsing>
+                       <ROOT>
+                               <TCEforms>
+                                       <sheetTitle>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing</sheetTitle>
+                               </TCEforms>
+                               <type>array</type>
+                               <el>
+                                       <tableparsing_quote>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote</label>
+                                                       <config>
+                                                               <type>select</type>
+                                                               <items type="array">
+                                                                       <numIndex index="0" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_none</numIndex>
+                                                                               <numIndex index="1"></numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_single</numIndex>
+                                                                               <numIndex index="1">39</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="2" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_double</numIndex>
+                                                                               <numIndex index="1">34</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                               <minitems>0</minitems>
+                                                               <maxitems>1</maxitems>
+                                                               <size>1</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </tableparsing_quote>
+
+                                       <tableparsing_delimiter>
+                                               <TCEforms>
+                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter</label>
+                                                       <config>
+                                                               <type>select</type>
+                                                               <items type="array">
+                                                                       <numIndex index="0" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_pipe</numIndex>
+                                                                               <numIndex index="1">124</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="1" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_semicolon</numIndex>
+                                                                               <numIndex index="1">59</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="2" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_comma</numIndex>
+                                                                               <numIndex index="1">44</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="3" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_colon</numIndex>
+                                                                               <numIndex index="1">58</numIndex>
+                                                                       </numIndex>
+                                                                       <numIndex index="4" type="array">
+                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_tab</numIndex>
+                                                                               <numIndex index="1">9</numIndex>
+                                                                       </numIndex>
+                                                               </items>
+                                                               <minitems>0</minitems>
+                                                               <maxitems>1</maxitems>
+                                                               <size>1</size>
+                                                       </config>
+                                               </TCEforms>
+                                       </tableparsing_delimiter>
+                               </el>
+                       </ROOT>
+               </s_parsing>
+       </sheets>
+</T3DataStructure>
index 28e3724..2e2f01f 100644 (file)
@@ -359,7 +359,7 @@ $extraContentColumns = array(
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', $extraContentColumns);
 
 // Add flexform
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:css_styled_content/flexform_ds.xml', 'table');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('*', 'FILE:EXT:css_styled_content/Configuration/FlexForms/table.xml', 'table');
 
 // Add content elements
 $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes'] = array_merge(
diff --git a/typo3/sysext/css_styled_content/flexform_ds.xml b/typo3/sysext/css_styled_content/flexform_ds.xml
deleted file mode 100644 (file)
index 7e8d741..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-<T3DataStructure>
-       <sheets>
-               <sDEF>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <acctables_caption>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_caption</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>33</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_caption>
-
-                                       <acctables_summary>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_summary</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>33</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_summary>
-
-                                       <acctables_tfoot>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_tfoot</label>
-                                                       <config>
-                                                               <type>check</type>
-                                                               <items type="array">
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:lang/locallang_core.xlf:labels.enabled</numIndex>
-                                                                               <numIndex index="1">1</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_tfoot>
-
-                                       <acctables_headerpos>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items type="array">
-                                                                       <numIndex index="0" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.0</numIndex>
-                                                                               <numIndex index="1"></numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.1</numIndex>
-                                                                               <numIndex index="1">top</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="2" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_headerpos.I.2</numIndex>
-                                                                               <numIndex index="1">left</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <minitems>0</minitems>
-                                                               <maxitems>1</maxitems>
-                                                               <size>1</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_headerpos>
-                                       <acctables_nostyles>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_nostyles</label>
-                                                       <config>
-                                                               <type>check</type>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_nostyles>
-
-                                       <acctables_tableclass>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_acctables_tableclass</label>
-                                                       <config>
-                                                               <type>input</type>
-                                                               <size>33</size>
-                                                               <eval>trim</eval>
-                                                       </config>
-                                               </TCEforms>
-                                       </acctables_tableclass>
-                               </el>
-                       </ROOT>
-               </sDEF>
-               <s_parsing>
-                       <ROOT>
-                               <TCEforms>
-                                       <sheetTitle>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing</sheetTitle>
-                               </TCEforms>
-                               <type>array</type>
-                               <el>
-                                       <tableparsing_quote>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items type="array">
-                                                                       <numIndex index="0" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_none</numIndex>
-                                                                               <numIndex index="1"></numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_single</numIndex>
-                                                                               <numIndex index="1">39</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="2" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_quote_double</numIndex>
-                                                                               <numIndex index="1">34</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <minitems>0</minitems>
-                                                               <maxitems>1</maxitems>
-                                                               <size>1</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </tableparsing_quote>
-
-                                       <tableparsing_delimiter>
-                                               <TCEforms>
-                                                       <label>LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter</label>
-                                                       <config>
-                                                               <type>select</type>
-                                                               <items type="array">
-                                                                       <numIndex index="0" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_pipe</numIndex>
-                                                                               <numIndex index="1">124</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="1" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_semicolon</numIndex>
-                                                                               <numIndex index="1">59</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="2" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_comma</numIndex>
-                                                                               <numIndex index="1">44</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="3" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_colon</numIndex>
-                                                                               <numIndex index="1">58</numIndex>
-                                                                       </numIndex>
-                                                                       <numIndex index="4" type="array">
-                                                                               <numIndex index="0">LLL:EXT:css_styled_content/Resources/Private/Language/locallang_db.xlf:tt_content.tx_cssstyledcontent_tableparsing_delimiter_tab</numIndex>
-                                                                               <numIndex index="1">9</numIndex>
-                                                                       </numIndex>
-                                                               </items>
-                                                               <minitems>0</minitems>
-                                                               <maxitems>1</maxitems>
-                                                               <size>1</size>
-                                                       </config>
-                                               </TCEforms>
-                                       </tableparsing_delimiter>
-                               </el>
-                       </ROOT>
-               </s_parsing>
-       </sheets>
-</T3DataStructure>