[TASK] Move tt_content.image_frames to compatibility6 89/40489/3
authorBenjamin Mack <benni@typo3.org>
Sat, 20 Jun 2015 13:41:34 +0000 (15:41 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Tue, 23 Jun 2015 19:03:18 +0000 (21:03 +0200)
The field "image_frames" which was disabled by
css_styled_content since TYPO3 4.x by default is
moved to EXT:compatibility6 - but also disabled
by default.

Resolves: #67648
Releases: master
Change-Id: I48310873499f5d5fd647a7d729d0ecc7247efde7
Reviewed-on: http://review.typo3.org/40489
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/compatibility6/Resources/Private/Language/extensionmanager.xlf [new file with mode: 0644]
typo3/sysext/compatibility6/ext_conf_template.txt [new file with mode: 0644]
typo3/sysext/compatibility6/ext_localconf.php
typo3/sysext/compatibility6/ext_tables.sql
typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/css_styled_content/ext_conf_template.txt
typo3/sysext/css_styled_content/ext_localconf.php
typo3/sysext/css_styled_content/ext_tables.sql

index 620823e..589dc2e 100644 (file)
@@ -71,6 +71,51 @@ $extraContentColumns = array(
                        'softref' => 'typolink[linkList]'
                )
        ),
+       'image_frames' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_frames',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.0',
+                                       0
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.1',
+                                       1
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.2',
+                                       2
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.3',
+                                       3
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.4',
+                                       4
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.5',
+                                       5
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.6',
+                                       6
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.7',
+                                       7
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.8',
+                                       8
+                               )
+                       )
+               )
+       ),
        'longdescURL' => array(
                'exclude' => TRUE,
                'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_longdescURL',
@@ -245,6 +290,8 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('css_styled_co
        );
 }
 
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette('tt_content', 'image_settings', 'image_frames;LLL:EXT:cms/locallang_ttc.xlf:image_frames_formlabel');
+
 /**
  * CType "search"
  */
diff --git a/typo3/sysext/compatibility6/Resources/Private/Language/extensionmanager.xlf b/typo3/sysext/compatibility6/Resources/Private/Language/extensionmanager.xlf
new file mode 100644 (file)
index 0000000..b8dd903
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415224810" source-language="en" datatype="plaintext" original="messages" date="2015-06-20T14:22:32Z" product-name="compatibility6">
+               <header/>
+               <body>
+                       <trans-unit id="setPageTSconfig">
+                               <source>Set PageTSconfig by default: If you are going to use this extension by default in this database then set this flag. In that case you don't need to set specific PageTSconfig for each page, which you have to do otherwise!</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/compatibility6/ext_conf_template.txt b/typo3/sysext/compatibility6/ext_conf_template.txt
new file mode 100644 (file)
index 0000000..50486b9
--- /dev/null
@@ -0,0 +1,2 @@
+  # cat=basic/enable; type=boolean; label=LLL:EXT:compatibility6/Resources/Private/Language/extensionmanager.xlf:setPageTSconfig
+setPageTSconfig = 1
index 9f4a4a1..e8630fc 100644 (file)
@@ -1,6 +1,15 @@
 <?php
 defined('TYPO3_MODE') or die();
 
+// unserializing the configuration so we can use it here:
+$_EXTCONF = unserialize($_EXTCONF);
+if (!$_EXTCONF || $_EXTCONF['setPageTSconfig']) {
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
+               # Removes obsolete type values and fields from "Content Element" table "tt_content"
+               TCEFORM.tt_content.image_frames.disabled = 1
+       ');
+}
+
 // TCA migration if TCA registration still happened in ext_tables.php
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'])) {
        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'] = array();
index 8cbeb92..3b87c4f 100644 (file)
@@ -6,6 +6,7 @@ CREATE TABLE tt_content (
        imagecaption text,
        imagecaption_position varchar(6) DEFAULT '' NOT NULL,
        image_link text,
+       image_frames int(11) unsigned DEFAULT '0' NOT NULL,
        longdescURL text,
        titleText text
-);
\ No newline at end of file
+);
index 80d2ef5..f16a0c4 100644 (file)
@@ -167,51 +167,6 @@ $extraContentColumns = array(
                        )
                )
        ),
-       'image_frames' => array(
-               'exclude' => TRUE,
-               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_frames',
-               'config' => array(
-                       'type' => 'select',
-                       'items' => array(
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.0',
-                                       0
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.1',
-                                       1
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.2',
-                                       2
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.3',
-                                       3
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.4',
-                                       4
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.5',
-                                       5
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.6',
-                                       6
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.7',
-                                       7
-                               ),
-                               array(
-                                       'LLL:EXT:cms/locallang_ttc.xlf:image_frames.I.8',
-                                       8
-                               )
-                       )
-               )
-       ),
        'image_noRows' => array(
                'exclude' => TRUE,
                'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows',
@@ -479,18 +434,6 @@ $GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
                        ',
                        'canNotCollapse' => 1
                ),
-               'image_settings' => array(
-                       'showitem' => '
-                               imagewidth;LLL:EXT:cms/locallang_ttc.xlf:imagewidth_formlabel,
-                               imageheight;LLL:EXT:cms/locallang_ttc.xlf:imageheight_formlabel,
-                               imageborder;LLL:EXT:cms/locallang_ttc.xlf:imageborder_formlabel,
-                               --linebreak--,
-                               image_compression;LLL:EXT:cms/locallang_ttc.xlf:image_compression_formlabel,
-                               image_effects;LLL:EXT:cms/locallang_ttc.xlf:image_effects_formlabel,
-                               image_frames;LLL:EXT:cms/locallang_ttc.xlf:image_frames_formlabel
-                       ',
-                       'canNotCollapse' => 1
-               ),
                'imageblock' => array(
                        'showitem' => '
                                imageorient;LLL:EXT:cms/locallang_ttc.xlf:imageorient_formlabel,
@@ -530,6 +473,18 @@ $GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
        )
 );
 
+$GLOBALS['TCA']['tt_content']['palettes']['image_settings']['canNotCollapse'] = 1;
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addFieldsToPalette(
+       'tt_content',
+       'image_settings',
+       'imagewidth;LLL:EXT:cms/locallang_ttc.xlf:imagewidth_formlabel,
+               imageheight;LLL:EXT:cms/locallang_ttc.xlf:imageheight_formlabel,
+               imageborder;LLL:EXT:cms/locallang_ttc.xlf:imageborder_formlabel,
+               --linebreak--,
+               image_compression;LLL:EXT:cms/locallang_ttc.xlf:image_compression_formlabel,
+               image_effects;LLL:EXT:cms/locallang_ttc.xlf:image_effects_formlabel,'
+);
+
 // Field arrangement for CE "header"
 $GLOBALS['TCA']['tt_content']['types']['header']['showitem'] = '
                --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
index 439c527..0658049 100644 (file)
@@ -1,5 +1,2 @@
-  # cat=basic/enable; type=boolean; label=LLL:EXT:css_styled_content/Resources/Private/Language/locallang_em.xlf:cssstyledcontent.config.setPageTSconfig
-setPageTSconfig = 1
-
   # cat=basic/enable; type=boolean; label=LLL:EXT:css_styled_content/Resources/Private/Language/locallang_em.xlf:cssstyledcontent.config.removePositionTypes
-removePositionTypes = 1
\ No newline at end of file
+removePositionTypes = 1
index f3e7e34..5156bff 100644 (file)
@@ -3,12 +3,6 @@ defined('TYPO3_MODE') or die();
 
 // unserializing the configuration so we can use it here:
 $_EXTCONF = unserialize($_EXTCONF);
-if (!$_EXTCONF || $_EXTCONF['setPageTSconfig']) {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
-               # Removes obsolete type values and fields from "Content Element" table "tt_content"
-               TCEFORM.tt_content.image_frames.disabled = 1
-       ');
-}
 if (!$_EXTCONF || $_EXTCONF['removePositionTypes']) {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
                TCEFORM.tt_content.imageorient.types.image.removeItems = 8,9,10,17,18,25,26
index 084a669..5ba438b 100644 (file)
@@ -5,7 +5,6 @@ CREATE TABLE tt_content (
        header_position varchar(6) DEFAULT '' NOT NULL,
        image_compression tinyint(3) unsigned DEFAULT '0' NOT NULL,
        image_effects tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       image_frames int(11) unsigned DEFAULT '0' NOT NULL,
        image_noRows tinyint(3) unsigned DEFAULT '0' NOT NULL,
        section_frame int(11) unsigned DEFAULT '0' NOT NULL,
        spaceAfter smallint(5) unsigned DEFAULT '0' NOT NULL,
@@ -14,4 +13,4 @@ CREATE TABLE tt_content (
        table_border tinyint(3) unsigned DEFAULT '0' NOT NULL,
        table_cellpadding tinyint(3) unsigned DEFAULT '0' NOT NULL,
        table_cellspacing tinyint(3) unsigned DEFAULT '0' NOT NULL
-);
\ No newline at end of file
+);