[!!!][TASK] Isolate unused fields and field arrangements 53/38053/7
authorPatrick Broens <patrick@patrickbroens.nl>
Mon, 23 Mar 2015 17:26:29 +0000 (18:26 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Mon, 30 Mar 2015 22:49:41 +0000 (00:49 +0200)
In the upcoming strong defaults for "frontend" some fields and field
arrangements are not in use anymore and belong to css_styled_content.
Currently there are also some fields which are not used by
css_styled_content.
The field arrangements will also change.

This patch moves the fields and field arrangements to css_styled_content
or compatibility6, depending on the current use. impexp and some of its
functional tests have been adapted to cope with the moved fields.

Change-Id: I86fc8cd47ebda412891851eabdd3a0e9109c1ec9
Fixes: #65922
Releases: master
Reviewed-on: http://review.typo3.org/38053
Reviewed-by: Frans Saris <franssaris@gmail.com>
Tested-by: Frans Saris <franssaris@gmail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
13 files changed:
typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/compatibility6/ext_tables.sql [new file with mode: 0644]
typo3/sysext/core/Documentation/Changelog/master/Breaking-65922-MoveUnusedTt_contentTcaFieldsToCompatibility6.rst [new file with mode: 0644]
typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/css_styled_content/ext_tables.sql [new file with mode: 0644]
typo3/sysext/frontend/Configuration/TCA/tt_content.php
typo3/sysext/frontend/ext_tables.sql
typo3/sysext/impexp/Classes/ImportExport.php
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentUploads/DataSet/Assertion/importPagesAndTtContentUploads.csv
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentUploads/ImportExportXml/pages-and-ttcontent-uploads.xml
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentWithImages/DataSet/Assertion/importPagesAndRelatedTtContentWithImages.csv
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentWithImages/ImportExportXml/pages-and-ttcontent-with-images.xml
typo3/sysext/impexp/Tests/Functional/ImportFromVersionFourDotFive/PagesAndTtContentWithImages/ImportInEmptyDatabaseTest.php

index af900b0..e354a50 100644 (file)
@@ -1,6 +1,250 @@
 <?php
 defined('TYPO3_MODE') or die();
 
+//Extra fields for the tt_content table
+$extraContentColumns = array(
+       'altText' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_altText',
+               'config' => array(
+                       'type' => 'text',
+                       'cols' => '30',
+                       'rows' => '3'
+               )
+       ),
+       'imagecaption' => array(
+               'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.caption',
+               'config' => array(
+                       'type' => 'text',
+                       'cols' => '30',
+                       'rows' => '3',
+                       'softref' => 'typolink_tag,images,email[subst],url'
+               )
+       ),
+       'imagecaption_position' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                                       ''
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.1',
+                                       'center'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.2',
+                                       'right'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.3',
+                                       'left'
+                               )
+                       ),
+                       'default' => ''
+               )
+       ),
+       'image_link' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link',
+               'config' => array(
+                       'type' => 'text',
+                       'cols' => '30',
+                       'rows' => '3',
+                       'wizards' => array(
+                               'link' => array(
+                                       'type' => 'popup',
+                                       'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
+                                       'icon' => 'link_popup.gif',
+                                       'module' => array(
+                                               'name' => 'wizard_element_browser',
+                                               'urlParameters' => array(
+                                                       'mode' => 'wizard'
+                                               )
+                                       ),
+                                       'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+                               )
+                       ),
+                       'softref' => 'typolink[linkList]'
+               )
+       ),
+       'longdescURL' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_longdescURL',
+               'config' => array(
+                       'type' => 'text',
+                       'cols' => '30',
+                       'rows' => '3',
+                       'wizards' => array(
+                               'link' => array(
+                                       'type' => 'popup',
+                                       'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
+                                       'icon' => 'link_popup.gif',
+                                       'module' => array(
+                                               'name' => 'wizard_element_browser',
+                                               'urlParameters' => array(
+                                                       'mode' => 'wizard'
+                                               )
+                                       ),
+                                       'params' => array(
+                                               'blindLinkOptions' => 'folder,file,mail,spec',
+                                               'blindLinkFields' => 'target,title,class,params'
+                                       ),
+                                       'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+                               )
+                       ),
+                       'softref' => 'typolink[linkList]'
+               )
+       ),
+       'titleText' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_titleText',
+               'config' => array(
+                       'type' => 'text',
+                       'cols' => '30',
+                       'rows' => '3'
+               )
+       )
+);
+
+// Adding fields to the tt_content table definition in TCA
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('tt_content', $extraContentColumns);
+
+// Add default palettes
+$GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
+       $GLOBALS['TCA']['tt_content']['palettes'],
+       array(
+               '1' => array(
+                       'showitem' => '
+                               starttime,
+                               endtime
+                       '
+               ),
+               '2' => array(
+                       'showitem' => '
+                               imagecols,
+                               image_noRows,
+                               imageborder
+                       '
+               ),
+               '3' => array(
+                       'showitem' => '
+                               header_position,
+                               header_layout,
+                               header_link,
+                               date
+                       '
+               ),
+               '4' => array(
+                       'showitem' => '
+                               sys_language_uid,
+                               l18n_parent,
+                               colPos,
+                               spaceBefore,
+                               spaceAfter,
+                               section_frame,
+                               sectionIndex
+                       '
+               ),
+               '5' => array(
+                       'showitem' => '
+                               imagecaption_position
+                       '
+               ),
+               '6' => array(
+                       'showitem' => '
+                               imagewidth,
+                               image_link
+                       '
+               ),
+               '7' => array(
+                       'showitem' => '
+                               image_link,
+                               image_zoom
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               '8' => array(
+                       'showitem' => '
+                               layout
+                       '
+               ),
+               '10' => array(
+                       'showitem' => '
+                               table_bgColor,
+                               table_border,
+                               table_cellspacing,
+                               table_cellpadding
+                       '
+               ),
+               '11' => array(
+                       'showitem' => '
+                               image_compression,
+                               image_effects,
+                               image_frames
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               '12' => array(
+                       'showitem' => '
+                               recursive
+                       '
+               ),
+               '13' => array(
+                       'showitem' => '
+                               imagewidth,
+                               imageheight
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               '14' => array(
+                       'showitem' => '
+                               sys_language_uid,
+                               l18n_parent,
+                               colPos
+                       '
+               ),
+               'image_accessibility' => array(
+                       'showitem' => '
+                               altText;LLL:EXT:cms/locallang_ttc.xlf:altText_formlabel,
+                               titleText;LLL:EXT:cms/locallang_ttc.xlf:titleText_formlabel,
+                               --linebreak--,
+                               longdescURL;LLL:EXT:cms/locallang_ttc.xlf:longdescURL_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               )
+       )
+);
+
+// Add palettes from css_styled_content if css_styled_content is NOT loaded but needed for CE's "search" and "mailform"
+if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('css_styled_content')) {
+       $GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
+               $GLOBALS['TCA']['tt_content']['palettes'],
+               array(
+                       'visibility' => array(
+                               'showitem' => '
+                                       hidden;LLL:EXT:cms/locallang_ttc.xlf:hidden_formlabel,
+                                       sectionIndex;LLL:EXT:cms/locallang_ttc.xlf:sectionIndex_formlabel,
+                                       linkToTop;LLL:EXT:cms/locallang_ttc.xlf:linkToTop_formlabel
+                               ',
+                               'canNotCollapse' => 1
+                       ),
+                       'frames' => array(
+                               'showitem' => '
+                                       layout;LLL:EXT:cms/locallang_ttc.xlf:layout_formlabel,
+                                       spaceBefore;LLL:EXT:cms/locallang_ttc.xlf:spaceBefore_formlabel,
+                                       spaceAfter;LLL:EXT:cms/locallang_ttc.xlf:spaceAfter_formlabel,
+                                       section_frame;LLL:EXT:cms/locallang_ttc.xlf:section_frame_formlabel
+                               ',
+                               'canNotCollapse' => 1
+                       )
+               )
+       );
+}
+
 /**
  * CType "search"
  */
diff --git a/typo3/sysext/compatibility6/ext_tables.sql b/typo3/sysext/compatibility6/ext_tables.sql
new file mode 100644 (file)
index 0000000..8cbeb92
--- /dev/null
@@ -0,0 +1,11 @@
+#
+# Table structure for table 'tt_content'
+#
+CREATE TABLE tt_content (
+       altText text,
+       imagecaption text,
+       imagecaption_position varchar(6) DEFAULT '' NOT NULL,
+       image_link text,
+       longdescURL text,
+       titleText text
+);
\ No newline at end of file
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-65922-MoveUnusedTt_contentTcaFieldsToCompatibility6.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-65922-MoveUnusedTt_contentTcaFieldsToCompatibility6.rst
new file mode 100644 (file)
index 0000000..f3645f3
--- /dev/null
@@ -0,0 +1,27 @@
+======================================================================
+Breaking - #65922: Move unused tt_content TCA fields to compatibility6
+======================================================================
+
+Description
+===========
+
+There are also some fields defined in 'frontend' which are not used by `frontend` or `css_styled_content`. These fields are moved to `compatibility6`.
+
+- altText
+- imagecaption
+- imagecaption_position
+- image_link
+- longdescURL
+- titleText
+
+
+Affected Installations
+======================
+
+All installations with extensions installed depending on these fields. For instance installations still using `css_styled_content` static templates of the TYPO3 CMS 4.* versions.
+
+
+Migration
+=========
+
+Add the moved TCA and sql definitions to you own extension or install the compatibility extension `compatibility6`.
\ No newline at end of file
index 6e4b3de..fd11b16 100644 (file)
 <?php
 defined('TYPO3_MODE') or die();
 
+//Extra fields for the tt_content table
+$extraContentColumns = array(
+       'header_position' => array(
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header_position',
+               'exclude' => TRUE,
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                                       ''
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.1',
+                                       'center'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.2',
+                                       'right'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.3',
+                                       'left'
+                               )
+                       ),
+                       'default' => ''
+               )
+       ),
+       'image_compression' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_compression',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                                       0
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.1',
+                                       1
+                               ),
+                               array(
+                                       'GIF/256',
+                                       10
+                               ),
+                               array(
+                                       'GIF/128',
+                                       11
+                               ),
+                               array(
+                                       'GIF/64',
+                                       12
+                               ),
+                               array(
+                                       'GIF/32',
+                                       13
+                               ),
+                               array(
+                                       'GIF/16',
+                                       14
+                               ),
+                               array(
+                                       'GIF/8',
+                                       15
+                               ),
+                               array(
+                                       'PNG',
+                                       39
+                               ),
+                               array(
+                                       'PNG/256',
+                                       30
+                               ),
+                               array(
+                                       'PNG/128',
+                                       31
+                               ),
+                               array(
+                                       'PNG/64',
+                                       32
+                               ),
+                               array(
+                                       'PNG/32',
+                                       33
+                               ),
+                               array(
+                                       'PNG/16',
+                                       34
+                               ),
+                               array(
+                                       'PNG/8',
+                                       35
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.15',
+                                       21
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.16',
+                                       22
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.17',
+                                       24
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.18',
+                                       26
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.19',
+                                       28
+                               )
+                       )
+               )
+       ),
+       'image_effects' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_effects',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.0',
+                                       0
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.1',
+                                       1
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.2',
+                                       2
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.3',
+                                       3
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.4',
+                                       10
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.5',
+                                       11
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.6',
+                                       20
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.7',
+                                       23
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.8',
+                                       25
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.9',
+                                       26
+                               )
+                       )
+               )
+       ),
+       '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',
+               'config' => array(
+                       'type' => 'check',
+                       'items' => array(
+                               '1' => array(
+                                       '0' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows.I.0'
+                               )
+                       )
+               )
+       ),
+       'section_frame' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:section_frame',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       '',
+                                       '0'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.1',
+                                       '1'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.2',
+                                       '5'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.3',
+                                       '6'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.4',
+                                       '10'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.5',
+                                       '11'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.6',
+                                       '12'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.7',
+                                       '20'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.8',
+                                       '21'
+                               )
+                       ),
+                       'default' => '0'
+               )
+       ),
+       'spaceAfter' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceAfter',
+               'config' => array(
+                       'type' => 'input',
+                       'size' => '5',
+                       'max' => '5',
+                       'eval' => 'int',
+                       'range' => array(
+                               'lower' => '0'
+                       ),
+                       'default' => 0
+               )
+       ),
+       'spaceBefore' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceBefore',
+               'config' => array(
+                       'type' => 'input',
+                       'size' => '5',
+                       'max' => '5',
+                       'eval' => 'int',
+                       'range' => array(
+                               'lower' => '0'
+                       ),
+                       'default' => 0
+               )
+       ),
+       'table_bgColor' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor',
+               'config' => array(
+                       'type' => 'select',
+                       'items' => array(
+                               array(
+                                       'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
+                                       '0'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.1',
+                                       '1'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.2',
+                                       '2'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.3',
+                                       '200'
+                               ),
+                               array(
+                                       '-----',
+                                       '--div--'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.5',
+                                       '240'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.6',
+                                       '241'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.7',
+                                       '242'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.8',
+                                       '243'
+                               ),
+                               array(
+                                       'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.9',
+                                       '244'
+                               )
+                       ),
+                       'default' => '0'
+               )
+       ),
+       'table_border' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_border',
+               'config' => array(
+                       'type' => 'input',
+                       'size' => '3',
+                       'max' => '3',
+                       'eval' => 'int',
+                       'range' => array(
+                               'upper' => '20',
+                               'lower' => '0'
+                       ),
+                       'default' => 0
+               )
+       ),
+       'table_cellpadding' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding',
+               'config' => array(
+                       'type' => 'input',
+                       'size' => '3',
+                       'max' => '3',
+                       'eval' => 'int',
+                       'range' => array(
+                               'upper' => '200',
+                               'lower' => '0'
+                       ),
+                       'default' => 0
+               )
+       ),
+       'table_cellspacing' => array(
+               'exclude' => TRUE,
+               'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing',
+               'config' => array(
+                       'type' => 'input',
+                       'size' => '3',
+                       'max' => '3',
+                       'eval' => 'int',
+                       'range' => array(
+                               'upper' => '200',
+                               'lower' => '0'
+                       ),
+                       'default' => 0
+               )
+       )
+);
+
+// Adding fields to the tt_content table definition in TCA
+\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');
 
-$GLOBALS['TCA']['tt_content']['types']['table']['showitem'] = '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.5, layout;;10, cols, bodytext;;9;nowrap:wizards[table], pi_flexform,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.table_layout;tablelayout,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended';
+// Add content elements
+$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes'] = array_merge(
+       $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes'],
+       array(
+               'textpic' => 'mimetypes-x-content-text-picture',
+               'image' => 'mimetypes-x-content-image',
+               'text' => 'mimetypes-x-content-text'
+       )
+);
+$GLOBALS['TCA']['tt_content']['ctrl']['typeicons'] = array_merge(
+       $GLOBALS['TCA']['tt_content']['ctrl']['typeicons'],
+       array(
+               'textpic' => 'tt_content_textpic.gif',
+               'image' => 'tt_content_image.gif',
+               'text' => 'tt_content.gif'
+       )
+);
+array_splice(
+       $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'],
+       2,
+       0,
+       array(
+               array(
+                       'LLL:EXT:cms/locallang_ttc.xlf:CType.I.1',
+                       'text',
+                       'i/tt_content.gif'
+               ),
+               array(
+                       'LLL:EXT:cms/locallang_ttc.xlf:CType.I.2',
+                       'textpic',
+                       'i/tt_content_textpic.gif'
+               ),
+               array(
+                       'LLL:EXT:cms/locallang_ttc.xlf:CType.I.3',
+                       'image',
+                       'i/tt_content_image.gif'
+               )
+       )
+);
+
+// Add palettes
+$GLOBALS['TCA']['tt_content']['palettes'] = array_replace(
+       $GLOBALS['TCA']['tt_content']['palettes'],
+       array(
+               '10' => array(
+                       'showitem' => '
+                               table_bgColor,
+                               table_border,
+                               table_cellspacing,
+                               table_cellpadding
+                       '
+               ),
+               'header' => array(
+                       'showitem' => '
+                               header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel,
+                               --linebreak--,
+                               header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel,
+                               header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel,
+                               date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel,
+                               --linebreak--,
+                               header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               'headers' => array(
+                       'showitem' => '
+                               header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel,
+                               --linebreak--,
+                               header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel,
+                               header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel,
+                               date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel,
+                               --linebreak--,
+                               header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel,
+                               --linebreak--,
+                               subheader;LLL:EXT:cms/locallang_ttc.xlf:subheader_formlabel
+                       ',
+                       '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,
+                               imagecols;LLL:EXT:cms/locallang_ttc.xlf:imagecols_formlabel,
+                               --linebreak--,
+                               image_noRows;LLL:EXT:cms/locallang_ttc.xlf:image_noRows_formlabel,
+                               imagecaption_position;LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               'tablelayout' => array(
+                       'showitem' => '
+                               table_bgColor;LLL:EXT:cms/locallang_ttc.xlf:table_bgColor_formlabel,
+                               table_border;LLL:EXT:cms/locallang_ttc.xlf:table_border_formlabel,
+                               table_cellspacing;LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing_formlabel,
+                               table_cellpadding;LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               'visibility' => array(
+                       'showitem' => '
+                               hidden;LLL:EXT:cms/locallang_ttc.xlf:hidden_formlabel,
+                               sectionIndex;LLL:EXT:cms/locallang_ttc.xlf:sectionIndex_formlabel,
+                               linkToTop;LLL:EXT:cms/locallang_ttc.xlf:linkToTop_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               ),
+               'frames' => array(
+                       'showitem' => '
+                               layout;LLL:EXT:cms/locallang_ttc.xlf:layout_formlabel,
+                               spaceBefore;LLL:EXT:cms/locallang_ttc.xlf:spaceBefore_formlabel,
+                               spaceAfter;LLL:EXT:cms/locallang_ttc.xlf:spaceAfter_formlabel,
+                               section_frame;LLL:EXT:cms/locallang_ttc.xlf:section_frame_formlabel
+                       ',
+                       'canNotCollapse' => 1
+               )
+       )
+);
+
+// Field arrangement for CE "header"
+$GLOBALS['TCA']['tt_content']['types']['header']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.headers;headers,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "text"
+$GLOBALS['TCA']['tt_content']['types']['text']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+               bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
+               rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "textpic"
+$GLOBALS['TCA']['tt_content']['types']['textpic']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+               bodytext;Text;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
+               rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
+               image,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "image"
+$GLOBALS['TCA']['tt_content']['types']['image']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
+               image,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "bullets"
+$GLOBALS['TCA']['tt_content']['types']['bullets']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+               bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel;;nowrap,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "table"
+$GLOBALS['TCA']['tt_content']['types']['table']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:CType.I.5,
+               layout;;10,
+               cols,
+               bodytext;;9;nowrap:wizards[table],
+               pi_flexform,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.table_layout;tablelayout,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "uploads"
+$GLOBALS['TCA']['tt_content']['types']['uploads']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:media;uploads,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.uploads_layout;uploadslayout,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "menu"
+$GLOBALS['TCA']['tt_content']['types']['menu']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu;menu,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu_accessibility;menu_accessibility,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "shortcut"
+$GLOBALS['TCA']['tt_content']['types']['shortcut']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.shortcut_formlabel,
+               records;LLL:EXT:cms/locallang_ttc.xlf:records_formlabel,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "list"
+$GLOBALS['TCA']['tt_content']['types']['list']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.plugin,
+               list_type;LLL:EXT:cms/locallang_ttc.xlf:list_type_formlabel,
+               select_key;LLL:EXT:cms/locallang_ttc.xlf:select_key_formlabel,
+               pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.list_formlabel,
+               recursive,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "div"
+$GLOBALS['TCA']['tt_content']['types']['div']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.div_formlabel,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
+
+// Field arrangement for CE "html"
+$GLOBALS['TCA']['tt_content']['types']['html']['showitem'] = '
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
+               header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.html_formlabel,
+               bodytext,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
+               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
+       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended
+';
 
 $GLOBALS['TCA']['tt_content']['columns']['section_frame']['config']['items'][0] = array(
        'LLL:EXT:css_styled_content/locallang_db.xlf:tt_content.tx_cssstyledcontent_section_frame.I.0', '0'
diff --git a/typo3/sysext/css_styled_content/ext_tables.sql b/typo3/sysext/css_styled_content/ext_tables.sql
new file mode 100644 (file)
index 0000000..084a669
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Table structure for table 'tt_content'
+#
+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,
+       spaceBefore smallint(5) unsigned DEFAULT '0' NOT NULL,
+       table_bgColor int(11) unsigned DEFAULT '0' NOT NULL,
+       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
index be8cbf2..6ab542e 100644 (file)
@@ -30,8 +30,6 @@ return array(
                'typeicon_column' => 'CType',
                'typeicon_classes' => array(
                        'header' => 'mimetypes-x-content-header',
-                       'textpic' => 'mimetypes-x-content-text-picture',
-                       'image' => 'mimetypes-x-content-image',
                        'bullets' => 'mimetypes-x-content-list-bullets',
                        'table' => 'mimetypes-x-content-table',
                        'uploads' => 'mimetypes-x-content-list-files',
@@ -42,13 +40,10 @@ return array(
                        'script' => 'mimetypes-x-content-script',
                        'div' => 'mimetypes-x-content-divider',
                        'html' => 'mimetypes-x-content-html',
-                       'text' => 'mimetypes-x-content-text',
                        'default' => 'mimetypes-x-content-text'
                ),
                'typeicons' => array(
                        'header' => 'tt_content_header.gif',
-                       'textpic' => 'tt_content_textpic.gif',
-                       'image' => 'tt_content_image.gif',
                        'bullets' => 'tt_content_bullets.gif',
                        'table' => 'tt_content_table.gif',
                        'uploads' => 'tt_content_uploads.gif',
@@ -84,21 +79,6 @@ return array(
                                                'i/tt_content_header.gif'
                                        ),
                                        array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:CType.I.1',
-                                               'text',
-                                               'i/tt_content.gif'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:CType.I.2',
-                                               'textpic',
-                                               'i/tt_content_textpic.gif'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:CType.I.3',
-                                               'image',
-                                               'i/tt_content_image.gif'
-                                       ),
-                                       array(
                                                'LLL:EXT:cms/locallang_ttc.xlf:CType.div.lists',
                                                '--div--'
                                        ),
@@ -330,32 +310,6 @@ return array(
                                'max' => '256'
                        )
                ),
-               'header_position' => array(
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header_position',
-                       'exclude' => 1,
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
-                                               ''
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.1',
-                                               'center'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.2',
-                                               'right'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:header_position.I.3',
-                                               'left'
-                                       )
-                               ),
-                               'default' => ''
-                       )
-               ),
                'header_link' => array(
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link',
                        'exclude' => 1,
@@ -618,42 +572,6 @@ return array(
                                )
                        )
                ),
-               'image_noRows' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows',
-                       'config' => array(
-                               'type' => 'check',
-                               'items' => array(
-                                       '1' => array(
-                                               '0' => 'LLL:EXT:cms/locallang_ttc.xlf:image_noRows.I.0'
-                                       )
-                               )
-                       )
-               ),
-               'image_link' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link',
-                       'config' => array(
-                               'type' => 'text',
-                               'cols' => '30',
-                               'rows' => '3',
-                               'wizards' => array(
-                                       'link' => array(
-                                               'type' => 'popup',
-                                               'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
-                                               'icon' => 'link_popup.gif',
-                                               'module' => array(
-                                                       'name' => 'wizard_element_browser',
-                                                       'urlParameters' => array(
-                                                               'mode' => 'wizard'
-                                                       )
-                                               ),
-                                               'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                                       )
-                               ),
-                               'softref' => 'typolink[linkList]'
-                       )
-               ),
                'image_zoom' => array(
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_zoom',
@@ -666,189 +584,6 @@ return array(
                                )
                        )
                ),
-               'image_effects' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_effects',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.0',
-                                               0
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.1',
-                                               1
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.2',
-                                               2
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.3',
-                                               3
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.4',
-                                               10
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.5',
-                                               11
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.6',
-                                               20
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.7',
-                                               23
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.8',
-                                               25
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_effects.I.9',
-                                               26
-                                       )
-                               )
-                       )
-               ),
-               'image_frames' => array(
-                       'exclude' => 1,
-                       '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_compression' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_compression',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
-                                               0
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.1',
-                                               1
-                                       ),
-                                       array(
-                                               'GIF/256',
-                                               10
-                                       ),
-                                       array(
-                                               'GIF/128',
-                                               11
-                                       ),
-                                       array(
-                                               'GIF/64',
-                                               12
-                                       ),
-                                       array(
-                                               'GIF/32',
-                                               13
-                                       ),
-                                       array(
-                                               'GIF/16',
-                                               14
-                                       ),
-                                       array(
-                                               'GIF/8',
-                                               15
-                                       ),
-                                       array(
-                                               'PNG',
-                                               39
-                                       ),
-                                       array(
-                                               'PNG/256',
-                                               30
-                                       ),
-                                       array(
-                                               'PNG/128',
-                                               31
-                                       ),
-                                       array(
-                                               'PNG/64',
-                                               32
-                                       ),
-                                       array(
-                                               'PNG/32',
-                                               33
-                                       ),
-                                       array(
-                                               'PNG/16',
-                                               34
-                                       ),
-                                       array(
-                                               'PNG/8',
-                                               35
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.15',
-                                               21
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.16',
-                                               22
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.17',
-                                               24
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.18',
-                                               26
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:image_compression.I.19',
-                                               28
-                                       )
-                               )
-                       )
-               ),
                'imagecols' => array(
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagecols',
@@ -891,87 +626,6 @@ return array(
                                'default' => 2
                        )
                ),
-               'imagecaption' => array(
-                       'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.caption',
-                       'config' => array(
-                               'type' => 'text',
-                               'cols' => '30',
-                               'rows' => '3',
-                               'softref' => 'typolink_tag,images,email[subst],url'
-                       )
-               ),
-               'imagecaption_position' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
-                                               ''
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.1',
-                                               'center'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.2',
-                                               'right'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position.I.3',
-                                               'left'
-                                       )
-                               ),
-                               'default' => ''
-                       )
-               ),
-               'altText' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_altText',
-                       'config' => array(
-                               'type' => 'text',
-                               'cols' => '30',
-                               'rows' => '3'
-                       )
-               ),
-               'titleText' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_titleText',
-                       'config' => array(
-                               'type' => 'text',
-                               'cols' => '30',
-                               'rows' => '3'
-                       )
-               ),
-               'longdescURL' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:image_longdescURL',
-                       'config' => array(
-                               'type' => 'text',
-                               'cols' => '30',
-                               'rows' => '3',
-                               'wizards' => array(
-                                       'link' => array(
-                                               'type' => 'popup',
-                                               'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
-                                               'icon' => 'link_popup.gif',
-                                               'module' => array(
-                                                       'name' => 'wizard_element_browser',
-                                                       'urlParameters' => array(
-                                                               'mode' => 'wizard'
-                                                       )
-                                               ),
-                                               'params' => array(
-                                                       'blindLinkOptions' => 'folder,file,mail,spec',
-                                                       'blindLinkFields' => 'target,title,class,params'
-                                               ),
-                                               'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-                                       )
-                               ),
-                               'softref' => 'typolink[linkList]'
-                       )
-               ),
                'cols' => array(
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:cols',
                        'config' => array(
@@ -1153,101 +807,6 @@ return array(
                                'eval' => 'trim'
                        )
                ),
-               'table_bgColor' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:lang/locallang_general.xlf:LGL.default_value',
-                                               '0'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.1',
-                                               '1'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.2',
-                                               '2'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.3',
-                                               '200'
-                                       ),
-                                       array(
-                                               '-----',
-                                               '--div--'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.5',
-                                               '240'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.6',
-                                               '241'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.7',
-                                               '242'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.8',
-                                               '243'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:table_bgColor.I.9',
-                                               '244'
-                                       )
-                               ),
-                               'default' => '0'
-                       )
-               ),
-               'table_border' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_border',
-                       'config' => array(
-                               'type' => 'input',
-                               'size' => '3',
-                               'max' => '3',
-                               'eval' => 'int',
-                               'range' => array(
-                                       'upper' => '20',
-                                       'lower' => '0'
-                               ),
-                               'default' => 0
-                       )
-               ),
-               'table_cellspacing' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing',
-                       'config' => array(
-                               'type' => 'input',
-                               'size' => '3',
-                               'max' => '3',
-                               'eval' => 'int',
-                               'range' => array(
-                                       'upper' => '200',
-                                       'lower' => '0'
-                               ),
-                               'default' => 0
-                       )
-               ),
-               'table_cellpadding' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding',
-                       'config' => array(
-                               'type' => 'input',
-                               'size' => '3',
-                               'max' => '3',
-                               'eval' => 'int',
-                               'range' => array(
-                                       'upper' => '200',
-                                       'lower' => '0'
-                               ),
-                               'default' => 0
-                       )
-               ),
                'file_collections' => array(
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:file_collections',
                        'config' => array(
@@ -1328,80 +887,6 @@ return array(
                                )
                        )
                ),
-               'spaceBefore' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceBefore',
-                       'config' => array(
-                               'type' => 'input',
-                               'size' => '5',
-                               'max' => '5',
-                               'eval' => 'int',
-                               'range' => array(
-                                       'lower' => '0'
-                               ),
-                               'default' => 0
-                       )
-               ),
-               'spaceAfter' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:spaceAfter',
-                       'config' => array(
-                               'type' => 'input',
-                               'size' => '5',
-                               'max' => '5',
-                               'eval' => 'int',
-                               'range' => array(
-                                       'lower' => '0'
-                               ),
-                               'default' => 0
-                       )
-               ),
-               'section_frame' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xlf:section_frame',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               '',
-                                               '0'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.1',
-                                               '1'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.2',
-                                               '5'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.3',
-                                               '6'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.4',
-                                               '10'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.5',
-                                               '11'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.6',
-                                               '12'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.7',
-                                               '20'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xlf:section_frame.I.8',
-                                               '21'
-                                       )
-                               ),
-                               'default' => '0'
-                       )
-               ),
                'sectionIndex' => array(
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.xlf:sectionIndex',
@@ -1554,105 +1039,7 @@ return array(
                '1' => array(
                        'showitem' => 'CType'
                ),
-               'header' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.headers;headers,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'text' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext_formlabel;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
-                                       rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,
-                                       --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                               --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'textpic' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       bodytext;Text;;richtext:rte_transform[flag=rte_enabled|mode=ts_css],
-                                       rte_enabled;LLL:EXT:cms/locallang_ttc.xlf:rte_enabled_formlabel,' . '--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
-                                       image,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,' . '--div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'image' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.images,
-                                       image,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imagelinks;imagelinks,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.image_settings;image_settings,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.imageblock;imageblock,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'bullets' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.bulletlist_formlabel;;nowrap,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'table' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       bodytext;LLL:EXT:cms/locallang_ttc.xlf:bodytext.ALT.table_formlabel;;nowrap:wizards[table],
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.table_layout;tablelayout,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               // file list
-               'uploads' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:media;uploads,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.uploads_layout;uploadslayout,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
                'menu' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu;menu,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.menu_accessibility;menu_accessibility,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended',
                        'subtype_value_field' => 'menu_type',
                        'subtypes_excludelist' => array(
                                '2' => 'pages',
@@ -1664,31 +1051,7 @@ return array(
                                'categorized_content' => 'selected_categories;;menu, category_field;;menu',
                        )
                ),
-               'shortcut' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.shortcut_formlabel,
-                                       records;LLL:EXT:cms/locallang_ttc.xlf:records_formlabel,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
                'list' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.header;header,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.plugin,
-                                       list_type;LLL:EXT:cms/locallang_ttc.xlf:list_type_formlabel,
-                                       select_key;LLL:EXT:cms/locallang_ttc.xlf:select_key_formlabel,
-                                       pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.list_formlabel,
-                                       recursive,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended',
                        'subtype_value_field' => 'list_type',
                        'subtypes_excludelist' => array(
                                '3' => 'layout',
@@ -1704,126 +1067,84 @@ return array(
                                '20' => 'layout',
                                '21' => 'layout'
                        )
-               ),
-               'div' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.div_formlabel,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
-               ),
-               'html' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.general;general,
-                                       header;LLL:EXT:cms/locallang_ttc.xlf:header.ALT.html_formlabel,
-                                       bodytext,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xlf:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xlf:tabs.extended'
                )
        ),
        'palettes' => array(
-               '1' => array(
-                       'showitem' => 'starttime, endtime'
-               ),
-               '2' => array(
-                       'showitem' => 'imagecols, image_noRows, imageborder'
-               ),
-               '3' => array(
-                       'showitem' => 'header_position, header_layout, header_link, date'
-               ),
-               '4' => array(
-                       'showitem' => 'sys_language_uid, l18n_parent, colPos, spaceBefore, spaceAfter, section_frame, sectionIndex'
-               ),
-               '5' => array(
-                       'showitem' => 'imagecaption_position'
-               ),
-               '6' => array(
-                       'showitem' => 'imagewidth,image_link'
-               ),
-               '7' => array(
-                       'showitem' => 'image_link, image_zoom',
-                       'canNotCollapse' => 1
-               ),
-               '8' => array(
-                       'showitem' => 'layout'
-               ),
-               '10' => array(
-                       'showitem' => 'table_bgColor, table_border, table_cellspacing, table_cellpadding'
-               ),
-               '11' => array(
-                       'showitem' => 'image_compression, image_effects, image_frames',
-                       'canNotCollapse' => 1
-               ),
-               '12' => array(
-                       'showitem' => 'recursive'
-               ),
-               '13' => array(
-                       'showitem' => 'imagewidth, imageheight',
-                       'canNotCollapse' => 1
-               ),
-               '14' => array(
-                       'showitem' => 'sys_language_uid, l18n_parent, colPos'
-               ),
                'general' => array(
-                       'showitem' => 'CType;LLL:EXT:cms/locallang_ttc.xlf:CType_formlabel, colPos;LLL:EXT:cms/locallang_ttc.xlf:colPos_formlabel, sys_language_uid;LLL:EXT:cms/locallang_ttc.xlf:sys_language_uid_formlabel, --linebreak--, l18n_parent',
+                       'showitem' => '
+                               CType;LLL:EXT:cms/locallang_ttc.xlf:CType_formlabel,
+                               colPos;LLL:EXT:cms/locallang_ttc.xlf:colPos_formlabel,
+                               sys_language_uid;LLL:EXT:cms/locallang_ttc.xlf:sys_language_uid_formlabel,
+                               --linebreak--,
+                               l18n_parent
+                       ',
                        'canNotCollapse' => 1
                ),
                'header' => array(
-                       'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
+                       'showitem' => '
+                               header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel,
+                               --linebreak--,
+                               header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel,
+                               date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel,
+                               --linebreak--,
+                               header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'headers' => array(
-                       'showitem' => 'header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel, --linebreak--, header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel, header_position;LLL:EXT:cms/locallang_ttc.xlf:header_position_formlabel, date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel, --linebreak--, header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel, --linebreak--, subheader;LLL:EXT:cms/locallang_ttc.xlf:subheader_formlabel',
+                       'showitem' => '
+                               header;LLL:EXT:cms/locallang_ttc.xlf:header_formlabel,
+                               --linebreak--,
+                               header_layout;LLL:EXT:cms/locallang_ttc.xlf:header_layout_formlabel,
+                               date;LLL:EXT:cms/locallang_ttc.xlf:date_formlabel,
+                               --linebreak--,
+                               header_link;LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel,
+                               --linebreak--,
+                               subheader;LLL:EXT:cms/locallang_ttc.xlf:subheader_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'imagelinks' => array(
-                       'showitem' => 'image_zoom;LLL:EXT:cms/locallang_ttc.xlf:image_zoom_formlabel',
-                       'canNotCollapse' => 1
-               ),
-               'image_accessibility' => array(
-                       'showitem' => 'altText;LLL:EXT:cms/locallang_ttc.xlf:altText_formlabel, titleText;LLL:EXT:cms/locallang_ttc.xlf:titleText_formlabel, --linebreak--, longdescURL;LLL:EXT:cms/locallang_ttc.xlf:longdescURL_formlabel',
-                       '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, imagecols;LLL:EXT:cms/locallang_ttc.xlf:imagecols_formlabel, --linebreak--, image_noRows;LLL:EXT:cms/locallang_ttc.xlf:image_noRows_formlabel, imagecaption_position;LLL:EXT:cms/locallang_ttc.xlf:imagecaption_position_formlabel',
+                       'showitem' => '
+                               image_zoom;LLL:EXT:cms/locallang_ttc.xlf:image_zoom_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'uploads' => array(
-                       'showitem' => 'media;LLL:EXT:cms/locallang_ttc.xlf:media.ALT.uploads_formlabel, --linebreak--, file_collections;LLL:EXT:cms/locallang_ttc.xlf:file_collections.ALT.uploads_formlabel, --linebreak--, filelink_sorting, target',
+                       'showitem' => '
+                               media;LLL:EXT:cms/locallang_ttc.xlf:media.ALT.uploads_formlabel,
+                               --linebreak--,
+                               file_collections;LLL:EXT:cms/locallang_ttc.xlf:file_collections.ALT.uploads_formlabel,
+                               --linebreak--,
+                               filelink_sorting,
+                               target
+                       ',
                        'canNotCollapse' => 1
                ),
                'menu' => array(
-                       'showitem' => 'menu_type;LLL:EXT:cms/locallang_ttc.xlf:menu_type_formlabel, --linebreak--, pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.menu_formlabel',
+                       'showitem' => '
+                               menu_type;LLL:EXT:cms/locallang_ttc.xlf:menu_type_formlabel,
+                               --linebreak--,
+                               pages;LLL:EXT:cms/locallang_ttc.xlf:pages.ALT.menu_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'menu_accessibility' => array(
-                       'showitem' => 'accessibility_title;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_title_formlabel, --linebreak--, accessibility_bypass;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_formlabel, accessibility_bypass_text;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_text_formlabel',
-                       'canNotCollapse' => 1
-               ),
-               'visibility' => array(
-                       'showitem' => 'hidden;LLL:EXT:cms/locallang_ttc.xlf:hidden_formlabel, sectionIndex;LLL:EXT:cms/locallang_ttc.xlf:sectionIndex_formlabel, linkToTop;LLL:EXT:cms/locallang_ttc.xlf:linkToTop_formlabel',
+                       'showitem' => '
+                               accessibility_title;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_title_formlabel,
+                               --linebreak--,
+                               accessibility_bypass;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_formlabel,
+                               accessibility_bypass_text;LLL:EXT:cms/locallang_ttc.xlf:menu.ALT.accessibility_bypass_text_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'access' => array(
-                       'showitem' => 'starttime;LLL:EXT:cms/locallang_ttc.xlf:starttime_formlabel, endtime;LLL:EXT:cms/locallang_ttc.xlf:endtime_formlabel, --linebreak--, fe_group;LLL:EXT:cms/locallang_ttc.xlf:fe_group_formlabel',
-                       'canNotCollapse' => 1
-               ),
-               'frames' => array(
-                       'showitem' => 'layout;LLL:EXT:cms/locallang_ttc.xlf:layout_formlabel, spaceBefore;LLL:EXT:cms/locallang_ttc.xlf:spaceBefore_formlabel, spaceAfter;LLL:EXT:cms/locallang_ttc.xlf:spaceAfter_formlabel, section_frame;LLL:EXT:cms/locallang_ttc.xlf:section_frame_formlabel',
-                       'canNotCollapse' => 1
-               ),
-               'tablelayout' => array(
-                       'showitem' => 'table_bgColor;LLL:EXT:cms/locallang_ttc.xlf:table_bgColor_formlabel, table_border;LLL:EXT:cms/locallang_ttc.xlf:table_border_formlabel, table_cellspacing;LLL:EXT:cms/locallang_ttc.xlf:table_cellspacing_formlabel, table_cellpadding;LLL:EXT:cms/locallang_ttc.xlf:table_cellpadding_formlabel',
+                       'showitem' => '
+                               starttime;LLL:EXT:cms/locallang_ttc.xlf:starttime_formlabel,
+                               endtime;LLL:EXT:cms/locallang_ttc.xlf:endtime_formlabel,
+                               --linebreak--,
+                               fe_group;LLL:EXT:cms/locallang_ttc.xlf:fe_group_formlabel
+                       ',
                        'canNotCollapse' => 1
                ),
                'uploadslayout' => array(
index 4613d3b..36f4275 100644 (file)
@@ -250,7 +250,6 @@ CREATE TABLE tt_content (
        sorting int(11) unsigned DEFAULT '0' NOT NULL,
        CType varchar(255) DEFAULT '' NOT NULL,
        header varchar(255) DEFAULT '' NOT NULL,
-       header_position varchar(6) DEFAULT '' NOT NULL,
        bodytext mediumtext,
 
        # Even though we're using FAL and an IRRE field for images
@@ -259,7 +258,6 @@ CREATE TABLE tt_content (
 
        imagewidth mediumint(11) unsigned DEFAULT '0' NOT NULL,
        imageorient tinyint(4) unsigned DEFAULT '0' NOT NULL,
-       imagecaption text,
        imagecols tinyint(4) unsigned DEFAULT '0' NOT NULL,
        imageborder tinyint(4) unsigned DEFAULT '0' NOT NULL,
        media text,
@@ -272,26 +270,12 @@ CREATE TABLE tt_content (
        endtime int(11) unsigned DEFAULT '0' NOT NULL,
        colPos int(11) unsigned DEFAULT '0' NOT NULL,
        subheader varchar(255) DEFAULT '' NOT NULL,
-       spaceBefore smallint(5) unsigned DEFAULT '0' NOT NULL,
-       spaceAfter smallint(5) unsigned DEFAULT '0' NOT NULL,
        fe_group varchar(100) DEFAULT '0' NOT NULL,
        header_link varchar(1024) DEFAULT '' NOT NULL,
-       imagecaption_position varchar(6) DEFAULT '' NOT NULL,
-       image_link text,
        image_zoom tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       image_noRows tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       image_effects tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       image_compression tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       altText text,
-       titleText text,
-       longdescURL text,
        header_layout varchar(30) DEFAULT '0' NOT NULL,
        menu_type varchar(30) DEFAULT '0' NOT NULL,
        list_type varchar(255) DEFAULT '0' NOT NULL,
-       table_border tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       table_cellspacing tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       table_cellpadding tinyint(3) unsigned DEFAULT '0' NOT NULL,
-       table_bgColor int(11) unsigned DEFAULT '0' NOT NULL,
        select_key varchar(80) DEFAULT '' NOT NULL,
        sectionIndex tinyint(3) unsigned DEFAULT '0' NOT NULL,
        linkToTop tinyint(3) unsigned DEFAULT '0' NOT NULL,
@@ -299,9 +283,7 @@ CREATE TABLE tt_content (
        filelink_size tinyint(3) unsigned DEFAULT '0' NOT NULL,
        filelink_sorting tinytext NOT NULL,
        target varchar(30) DEFAULT '' NOT NULL,
-       section_frame int(11) unsigned DEFAULT '0' NOT NULL,
        date int(10) unsigned DEFAULT '0' NOT NULL,
-       image_frames int(11) unsigned DEFAULT '0' NOT NULL,
        recursive tinyint(3) unsigned DEFAULT '0' NOT NULL,
        imageheight mediumint(8) unsigned DEFAULT '0' NOT NULL,
        rte_enabled tinyint(4) DEFAULT '0' NOT NULL,
index e68a420..df617b0 100644 (file)
@@ -3036,7 +3036,7 @@ class ImportExport {
 
                                        if (isset($fieldConfiguration['titleTexts'])) {
                                                $titleTextField = $fieldConfiguration['titleTexts'];
-                                               if ($row[$titleTextField] !== '') {
+                                               if (isset($row[$titleTextField]) && $row[$titleTextField] !== '') {
                                                        $titleTextContents = explode(LF, $row[$titleTextField]);
                                                        $updateData[$table][$uid][$titleTextField] = '';
                                                }
@@ -3044,7 +3044,7 @@ class ImportExport {
 
                                        if (isset($fieldConfiguration['alternativeTexts'])) {
                                                $alternativeTextField = $fieldConfiguration['alternativeTexts'];
-                                               if ($row[$alternativeTextField] !== '') {
+                                               if (isset($row[$alternativeTextField]) && $row[$alternativeTextField] !== '') {
                                                        $alternativeTextContents = explode(LF, $row[$alternativeTextField]);
                                                        $updateData[$table][$uid][$alternativeTextField] = '';
                                                }
index c8f16ab..5e6020d 100644 (file)
@@ -2,16 +2,16 @@
 ,"uid","pid","sorting","deleted","title"
 ,1,0,256,0,"Content Uploads"
 "tt_content"
-,"uid","pid","sorting","deleted","header","media","imagecaption"
-,1,1,256,0,"Uploads",2,
+,"uid","pid","sorting","deleted","header","media"
+,1,1,256,0,"Uploads",2
 "sys_file"
 ,"uid","pid","storage","type","identifier","identifier_hash","folder_hash","extension","mime_type","name","sha1","size"
 ,1,0,1,2,"/user_upload/_imported/typo3_image2.jpg","7fd3cc09da3cca1114cb9d2864a37f0085973c2c","d62c2c9935d7b7e4f3ed493282bf8287abd80f93","jpg","image/jpeg","typo3_image2.jpg","da9acdf1e105784a57bbffec9520969578287797","7958"
 ,2,0,1,2,"/user_upload/_imported/typo3_image3.jpg","6fe0d531fb52945d0b943b54aa20116e5533284a","d62c2c9935d7b7e4f3ed493282bf8287abd80f93","jpg","image/jpeg","typo3_image3.jpg","e873c1e2ffd0f191e183a1057de3eef4d62e782d","5565"
 "sys_file_reference"
-,"uid","pid","uid_local","uid_foreign","tablenames","fieldname","table_local","title","description","alternative","link"
-,1,1,1,1,"tt_content","media","sys_file",\NULL,"Description text one",\NULL,""
-,2,1,2,1,"tt_content","media","sys_file",\NULL,"Description text two",\NULL,""
+,"uid","pid","uid_local","uid_foreign","tablenames","fieldname","table_local","title"
+,1,1,1,1,"tt_content","media","sys_file",\NULL
+,2,1,2,1,"tt_content","media","sys_file",\NULL
 "sys_file_metadata"
 ,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent"
 ,1,0,1,\NULL,400,300,\NULL,\NULL,0,0
index a4d3378..0b37c93 100644 (file)
@@ -90,8 +90,6 @@
                                <field index="hidden">0</field>
                                <field index="CType">uploads</field>
                                <field index="header">Uploads</field>
-                               <field index="imagecaption">Description text one
-Description text two</field>
                                <field index="media">typo3_image2.jpg,typo3_image3.jpg</field>
                        </fieldlist>
                        <related index="rels" type="array">
index 56e9663..79bf0fb 100644 (file)
@@ -2,22 +2,20 @@
 ,"uid","pid","sorting","deleted","title"
 ,1,0,256,0,"Content Image"
 "tt_content"
-,"uid","pid","sorting","deleted","header","header_link","image",image_link,imagecaption
-,1,1,256,0,"Test content","file:3",2,,
+,"uid","pid","sorting","deleted","header","header_link","image"
+,1,1,256,0,"Test content","file:3",2
 "sys_file"
 ,"uid","pid","storage","type","identifier","identifier_hash","folder_hash","extension","mime_type","name","sha1","size"
 ,1,0,1,2,"/user_upload/_imported/typo3_image2.jpg","7fd3cc09da3cca1114cb9d2864a37f0085973c2c","d62c2c9935d7b7e4f3ed493282bf8287abd80f93","jpg","image/jpeg","typo3_image2.jpg","da9acdf1e105784a57bbffec9520969578287797","7958"
 ,2,0,1,2,"/user_upload/_imported/typo3_image3.jpg","6fe0d531fb52945d0b943b54aa20116e5533284a","d62c2c9935d7b7e4f3ed493282bf8287abd80f93","jpg","image/jpeg","typo3_image3.jpg","e873c1e2ffd0f191e183a1057de3eef4d62e782d","5565"
 ,3,0,1,2,"/user_upload/_imported/fileadmin/user_upload/typo3_image5.jpg","b631fe3476a47d2cfc3082de20a8dfc691343e59","eb6df7c76ff158aabb50b417535512ad0cc83569","jpg","image/jpeg","typo3_image5.jpg","c3511df85d21bc578faf71c6a19eeb3ff44af370","7425"
-,4,0,1,2,"/user_upload/_imported/fileadmin/user_upload/typo3_image4.jpg","a330d6b04ff223d1a7ac8536eff3f0af97cf663f","eb6df7c76ff158aabb50b417535512ad0cc83569","jpg","image/jpeg","typo3_image4.jpg","c5671a5b7df16f677f5dff2a142867767bf4978e","6758"
 "sys_file_reference"
-,"uid","pid","uid_local","uid_foreign","tablenames","fieldname","table_local","title","description","alternative","link"
-,1,1,1,1,"tt_content","image","sys_file",\NULL,"Description 1","Alternative text one",1
-,2,1,2,1,"tt_content","image","sys_file",\NULL,"Description 2","Alternative text two","file:4"
+,"uid","pid","uid_local","uid_foreign","tablenames","fieldname","table_local"
+,1,1,1,1,"tt_content","image","sys_file"
+,2,1,2,1,"tt_content","image","sys_file"
 "sys_file_metadata"
 ,"uid","pid","file","title","width","height","description","alternative","sys_language_uid","l10n_parent"
 ,1,0,1,\NULL,400,300,\NULL,\NULL,0,0
 ,2,0,2,\NULL,400,267,\NULL,\NULL,0,0
 ,3,0,3,\NULL,300,200,\NULL,\NULL,0,0
-,4,0,4,\NULL,400,267,\NULL,\NULL,0,0
 
index 55c78bb..1904c61 100644 (file)
                                                        </subst>
                                                        <file_ID>9a976a7be0bb14d2b664e47bc4159585</file_ID>
                                                </softref_element>
-                                               <softref_element index="image_link:typolink:1e28238ce96b162761f0beb380c231e3:0" type="array">
-                                                       <field>image_link</field>
-                                                       <spKey>typolink</spKey>
-                                                       <matchString>4
-                                                       </matchString>
-                                                       <subst type="array">
-                                                               <type>db</type>
-                                                               <recordRef>pages:4</recordRef>
-                                                               <tokenID>1e28238ce96b162761f0beb380c231e3</tokenID>
-                                                               <tokenValue>4</tokenValue>
-                                                       </subst>
-                                               </softref_element>
-                                               <softref_element index="image_link:typolink:7b83a356e1b29ba26d999533c4acebd1:1" type="array">
-                                                       <field>image_link</field>
-                                                       <spKey>typolink</spKey>
-                                                       <matchString>fileadmin/user_upload/typo3_image4.jpg</matchString>
-                                                       <subst type="array">
-                                                               <type>file</type>
-                                                               <relFileName>fileadmin/user_upload/typo3_image4.jpg</relFileName>
-                                                               <tokenID>7b83a356e1b29ba26d999533c4acebd1</tokenID>
-                                                               <tokenValue>fileadmin/user_upload/typo3_image4.jpg</tokenValue>
-                                                       </subst>
-                                                       <file_ID>fff6aee1d1b43f738006669e6e3c5498</file_ID>
-                                               </softref_element>
                                        </softrefs>
                                        <filerefs type="array">
                                                <file index="0">af981c9c34d2c0a3640fb059e7a7d615</file>
                                <record_ref>_SOFTREF_/</record_ref>
                                <relFileName>fileadmin/user_upload/typo3_image5.jpg</relFileName>
                        </file>
-                       <file index="fff6aee1d1b43f738006669e6e3c5498" type="array">
-                               <filesize>6758</filesize>
-                               <filename>typo3_image4.jpg</filename>
-                               <filemtime>1395066986</filemtime>
-                               <relFileRef>fileadmin/user_upload/typo3_image4.jpg</relFileRef>
-                               <record_ref>_SOFTREF_/</record_ref>
-                               <relFileName>fileadmin/user_upload/typo3_image4.jpg</relFileName>
-                       </file>
                </files>
        </header>
        <records type="array">
                                <field index="image">typo3_image2.jpg,typo3_image3.jpg</field>
                                <field index="imagewidth">0</field>
                                <field index="imageorient">17</field>
-                               <field index="imagecaption">Description 1
-Description 2</field>
                                <field index="imagecols">1</field>
                                <field index="header_link">fileadmin/user_upload/typo3_image5.jpg</field>
-                               <field index="image_link">4
-fileadmin/user_upload/typo3_image4.jpg</field>
                                <field index="image_zoom">0</field>
                                <field index="image_noRows">0</field>
                                <field index="image_effects">0</field>
                                <field index="image_compression">0</field>
-                               <field index="altText">Alternative text one
-Alternative text two</field>
-                               <field index="titleText"></field>
                        </fieldlist>
                        <related index="rels" type="array">
                                <field index="image" type="array">
@@ -211,16 +172,6 @@ Alternative text two</field>
                                                                                <tokenValue>4</tokenValue>
                                                                        </subst>
                                                                </softref_element>
-                                                               <softref_element index="7b83a356e1b29ba26d999533c4acebd1:1" type="array">
-                                                                       <matchString>fileadmin/user_upload/typo3_image4.jpg</matchString>
-                                                                       <subst type="array">
-                                                                               <type>file</type>
-                                                                               <relFileName>fileadmin/user_upload/typo3_image4.jpg</relFileName>
-                                                                               <tokenID>7b83a356e1b29ba26d999533c4acebd1</tokenID>
-                                                                               <tokenValue>fileadmin/user_upload/typo3_image4.jpg</tokenValue>
-                                                                       </subst>
-                                                                       <file_ID>fff6aee1d1b43f738006669e6e3c5498</file_ID>
-                                                               </softref_element>
                                                        </softref_key>
                                                </keys>
                                                <tokenizedContent>{softref:1e28238ce96b162761f0beb380c231e3}
@@ -631,135 +582,5 @@ oDglIOy49+o2eaEKg//Z
 </content>
                        <content_md5>ce676e17e36144fae906fb1c2d4c3a10</content_md5>
                </file>
-               <file index="fff6aee1d1b43f738006669e6e3c5498" type="array">
-                       <filesize>6758</filesize>
-                       <filename>typo3_image4.jpg</filename>
-                       <filemtime>1395066986</filemtime>
-                       <relFileRef>fileadmin/user_upload/typo3_image4.jpg</relFileRef>
-                       <record_ref>_SOFTREF_/</record_ref>
-                       <relFileName>fileadmin/user_upload/typo3_image4.jpg</relFileName>
-                       <content base64="1">
-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
-bum/HHoj7VbS/qPUTat1yjHHkSpXcl8VZpcorUdVPb3V/lnBd5XddMnwv07D151nm6cm+mL5ryzf
-nk4Rcu8dzLFnT92KXXFr2t/p+KMZpzVW07TvzuTldp9VrlNvUU79PpTe2yLmxuOFzUK22TVfuZrJ
-HDU5Rc+rjwmvP9TKWraVq3N8t8L8Itjjfguvloz4Xi0M47dS9ylf3I4sDShKK233R1zySybTk2nz
-8nDjdTbfdlrjcZ26vxMpc+mTjbafBsMMmytGSkZvRx6umXqVB43Lpi938mjPc4UlSXfuYau1CLXZ
-mGOU5e3my0jj5+TKZeGLp0zUPbbal/k6DVh0/pU3Pqa42Np1YSydvL5cpb0EpP7lZQXs2zlsu449
-RF4cs01cmvZXBobtL57HpSdR6n+lbfBojjV9TVt9zmzni7+DjvP20R6kqlzVGWBb14ZNQ0si3q0Y
-6eT9yvZ870Ze3XuYZSV2fBslJzUW2nsla+DQ76qava7N+LInpvSUY1GVqS+expxdVh+blMpJPhiC
-g6nloCgCAoAgKKtgQGUoyg6kmn4ZiAAAEBQBAUgAAAZgFJVQFAEBQBAUBKFtRabk1XZAyhFStNX4
-RnyTeNWw/puyTjLH0yjN7cpU0acE4QXqNN3s21v4M4427U16a7X/APv+RigvcvUUk+V2RxOlax45
-rJj2jL7klt+TOU1t3vhBN449MY9T7JFjDpu3cny1/ggY50nC1scx05fsa+TnOzh/lhyew4Mk16sm
-tk2d55+qxrFN1w90OWdN/wAXLVrbjyJrpkVxcXa4OPGr5bOic5RS36uxz2PQw/JlnbdJRa91V8mK
-njivY0+3tNM+qeFpfvXc6tDjwegpSg0097lV7duxPirn+V/1jZBycE5Kn4Mish1zqPJztyytoACV
-WGT/AG38swVnoYPp09RFTnL08fN1uzp1mjw4dJKWCG6fub3dfucvL3Xqfi8uPHhq+6+d1mKbljfR
-Lpa5o6dFoHlyJKLaT3lXCPY+mzcsUovlPh7nS4Y+hwUVBS39qoy8k5Z7tuu3z+t1HWp6eGOMIQk1
-t3p8/wBjHS2oyT5+D0830jE3/DySj+dzmh9Py4XJ+2d+Ga4ZTblzlsawZyxzh90HH8oxOpyaQhkA
-IDdg02XUSrHG13b4R6Wn0Wn08l6s4zyvhSdL+hXLORbHC15+HR5Mq6muiHl9/wAHXj00MNUt33fJ
-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
-</content>
-                       <content_md5>e1c5c4e1e34e19e2facb438752e06c3f</content_md5>
-               </file>
        </files>
 </T3RecordDocument>
\ No newline at end of file
index 5547286..6cd0293 100644 (file)
@@ -35,7 +35,6 @@ class ImportInEmptyDatabaseTest extends \TYPO3\CMS\Impexp\Tests\Functional\Impor
                $this->assertFileEquals(__DIR__ . '/../../Fixtures/Folders/fileadmin/user_upload/typo3_image2.jpg', PATH_site . 'fileadmin/user_upload/_imported/typo3_image2.jpg');
                $this->assertFileEquals(__DIR__ . '/../../Fixtures/Folders/fileadmin/user_upload/typo3_image3.jpg', PATH_site . 'fileadmin/user_upload/_imported/typo3_image3.jpg');
                $this->assertFileEquals(__DIR__ . '/../../Fixtures/Folders/fileadmin/user_upload/typo3_image5.jpg', PATH_site . 'fileadmin/user_upload/_imported/fileadmin/user_upload/typo3_image5.jpg');
-               $this->assertFileEquals(__DIR__ . '/../../Fixtures/Folders/uploads/tx_impexpgroupfiles/typo3_image4.jpg', PATH_site . 'fileadmin/user_upload/_imported/fileadmin/user_upload/typo3_image4.jpg');
 
        }