Fixed bug #7496: exclude for header_position, header_link
[Packages/TYPO3.CMS.git] / typo3 / sysext / cms / tbl_tt_content.php
index c68bf57..b8c07c4 100755 (executable)
@@ -1,22 +1,22 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
-*  (c) 1999-2003 Kasper Skaarhoj (kasper@typo3.com)
+*
+*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
-*  This script is part of the TYPO3 project. The TYPO3 project is 
+*  This script is part of the TYPO3 project. The TYPO3 project is
 *  free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation; either version 2 of the License, or
 *  (at your option) any later version.
-* 
+*
 *  The GNU General Public License can be found at
 *  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license 
+*  A copy is found in the textfile GPL.txt and important notices to the license
 *  from the author is found in LICENSE.txt distributed with these scripts.
 *
-* 
+*
 *  This script is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
-/** 
+/**
  * Dynamic configuation of the tt_content table
  * This gets it's own file because it's so huge and central to typical TYPO3 use.
  *
  * $Id$
  *
- * @author     Kasper Skaarhoj <kasper@typo3.com>
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  */
 
 
@@ -41,43 +41,51 @@ $TCA['tt_content'] = Array (
                'always_description' => 0,
                'showRecordFieldList' => 'CType,header,header_link,bodytext,image,imagewidth,imageorient,media,records,colPos,starttime,endtime,fe_group'
        ),
-       'columns' => Array (    
+       'columns' => Array (
                'CType' => Array (
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.type',
                        'config' => Array (
                                'type' => 'select',
                                'items' => Array (
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.0', 'header'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.1', 'text'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.2', 'textpic'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.3', 'image'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.4', 'bullets'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.5', 'table'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.6', 'uploads'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.7', 'multimedia'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.8', 'mailform'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.9', 'search'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.10', 'login'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.11', 'splash'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.12', 'menu'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.13', 'shortcut'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.14', 'list'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.15', 'script'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.16', 'div'),
-                                       Array('LLL:EXT:cms/locallang_ttc.php:CType.I.17', 'html')
-                               ),
-                               'default' => 'text'
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.div.standard', '--div--'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.0', 'header', 'i/tt_content_header.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.1', 'text', 'i/tt_content.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.2', 'textpic', 'i/tt_content_textpic.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.3', 'image', 'i/tt_content_image.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.div.lists', '--div--'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.4', 'bullets', 'i/tt_content_bullets.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.5', 'table', 'i/tt_content_table.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.6', 'uploads', 'i/tt_content_uploads.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.div.forms', '--div--'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.8', 'mailform', 'i/tt_content_form.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.9', 'search', 'i/tt_content_search.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.10', 'login', 'i/tt_content_login.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.div.special', '--div--'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.7', 'multimedia', 'i/tt_content_mm.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.11', 'splash', 'i/tt_content_news.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.12', 'menu', 'i/tt_content_menu.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.13', 'shortcut', 'i/tt_content_shortcut.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.14', 'list', 'i/tt_content_list.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.15', 'script', 'i/tt_content_script.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.16', 'div', 'i/tt_content_div.gif'),
+                                       array('LLL:EXT:cms/locallang_ttc.xml:CType.I.17', 'html', 'i/tt_content_html.gif')
+                               ),
+                               'default' => 'text',
+                               'authMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['explicitADmode'],
+                               'authMode_enforce' => 'strict',
+                               'iconsInOptionTags' => 1,
+                               'noIconsBelowSelect' => 1,
                        )
                ),
                'hidden' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.hidden',
                        'config' => Array (
                                'type' => 'check'
                        )
                ),
                'starttime' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.starttime',
                        'config' => Array (
                                'type' => 'input',
@@ -89,7 +97,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'endtime' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.endtime',
                        'config' => Array (
                                'type' => 'input',
@@ -100,42 +108,57 @@ $TCA['tt_content'] = Array (
                                'default' => '0',
                                'range' => Array (
                                        'upper' => mktime(0,0,0,12,31,2020),
-                                       'lower' => mktime(0,0,0,date('m')-1,date('d'),date('Y'))
                                )
                        )
                ),
                'fe_group' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.fe_group',
                        'config' => Array (
-                               'type' => 'select',     
+                               'type' => 'select',
+                               'size' => 5,
+                               'maxitems' => 20,
                                'items' => Array (
-                                       Array('', 0),
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.hide_at_login', -1),
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.any_login', -2),
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.usergroups', '--div--')
                                ),
+                               'exclusiveKeys' => '-1,-2',
                                'foreign_table' => 'fe_groups'
                        )
                ),
                'sys_language_uid' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.language',
                        'config' => Array (
                                'type' => 'select',
                                'foreign_table' => 'sys_language',
                                'foreign_table_where' => 'ORDER BY sys_language.title',
                                'items' => Array(
+                                       Array('LLL:EXT:lang/locallang_general.php:LGL.allLanguages',-1),
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value',0)
                                )
                        )
                ),
+               'l18n_parent' => Array (
+                       'displayCond' => 'FIELD:sys_language_uid:>:0',
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:lang/locallang_general.php:LGL.l18n_parent',
+                       'config' => Array (
+                               'type' => 'select',
+                               'items' => Array (
+                                       Array('', 0),
+                               ),
+                               'foreign_table' => 'tt_content',
+                               'foreign_table_where' => 'AND tt_content.pid=###CURRENT_PID### AND tt_content.sys_language_uid IN (-1,0)',
+                       )
+               ),
                'layout' => Array (
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.layout',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.normal', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:layout.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:layout.I.2', '2'),
@@ -145,11 +168,11 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'colPos' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:colPos',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:colPos.I.0', '1'),
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.normal', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:colPos.I.2', '2'),
@@ -159,7 +182,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'date' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:date',
                        'config' => Array (
                                'type' => 'input',
@@ -171,6 +194,8 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'header' => Array (
+                       'l10n_mode' => 'prefixLangTitle',
+                       'l10n_cat' => 'text',
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:header',
                        'config' => Array (
                                'type' => 'input',
@@ -179,6 +204,7 @@ $TCA['tt_content'] = Array (
                ),
                'header_position' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:header_position',
+                       'exclude' => 1,
                        'config' => Array (
                                'type' => 'select',
                                'items' => Array (
@@ -192,8 +218,9 @@ $TCA['tt_content'] = Array (
                ),
                'header_link' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:header_link',
+                       'exclude' => 1,                 
                        'config' => Array (
-                               'type' => 'input',              
+                               'type' => 'input',
                                'size' => '15',
                                'max' => '256',
                                'checkbox' => '',
@@ -207,15 +234,16 @@ $TCA['tt_content'] = Array (
                                                'script' => 'browse_links.php?mode=wizard',
                                                'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
                                        )
-                               )
+                               ),
+                               'softref' => 'typolink'
                        )
                ),
                'header_layout' => Array (
                        'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.type',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.normal', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:header_layout.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:header_layout.I.2', '2'),
@@ -228,15 +256,18 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'subheader' => Array (
-                       'exclude' => 1, 
-                       'label' => 'LLL:EXT:lang/locallang_general.php:LGL.subheader',  
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:lang/locallang_general.php:LGL.subheader',
                        'config' => Array (
                                'type' => 'input',
                                'size' => '30',
-                               'max' => '256'
+                               'max' => '256',
+                               'softref' => 'email[subst]'
                        )
                ),
                'bodytext' => Array (
+                       'l10n_mode' => 'prefixLangTitle',
+                       'l10n_cat' => 'text',
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.text',
                        'config' => Array (
                                'type' => 'text',
@@ -259,20 +290,24 @@ $TCA['tt_content'] = Array (
                                                'title' => 'Table wizard',
                                                'icon' => 'wizard_table.gif',
                                                'script' => 'wizard_table.php',
+                                               'params' => array('xmlOutput' => 0)
                                        ),
                                        'forms' => Array(
                                                'notNewRecords' => 1,
                                                'enableByTypeConfig' => 1,
                                                'type' => 'script',
+#                                              'hideParent' => array('rows' => 4),
                                                'title' => 'Forms wizard',
                                                'icon' => 'wizard_forms.gif',
                                                'script' => 'wizard_forms.php?special=formtype_mail',
+                                               'params' => array('xmlOutput' => 0)
                                        )
-                               )
+                               ),
+                               'softref' => 'typolink_tag,images,email[subst],url'
                        )
                ),
                'text_align' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:text_align',
                        'config' => Array (
                                'type' => 'select',
@@ -289,8 +324,8 @@ $TCA['tt_content'] = Array (
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:text_face',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value', '0'),
                                        Array('Times', '1'),
                                        Array('Verdana', '2'),
@@ -303,8 +338,8 @@ $TCA['tt_content'] = Array (
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:text_size',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_size.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_size.I.2', '2'),
@@ -321,8 +356,8 @@ $TCA['tt_content'] = Array (
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:text_color',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_color.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_color.I.2', '2'),
@@ -348,7 +383,7 @@ $TCA['tt_content'] = Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:text_properties',
                        'config' => Array (
                                'type' => 'check',
-                               'items' => Array (      
+                               'items' => Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_properties.I.0', ''),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_properties.I.1', ''),
                                        Array('LLL:EXT:cms/locallang_ttc.php:text_properties.I.2', ''),
@@ -358,12 +393,13 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'image' => Array (
+#                      'l10n_mode' => 'mergeIfNotBlank',
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.images',
                        'config' => Array (
                                'type' => 'group',
                                'internal_type' => 'file',
                                'allowed' => $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'],
-                               'max_size' => '1000',
+                               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
                                'uploadfolder' => 'uploads/pics',
                                'show_thumbs' => '1',
                                'size' => '3',
@@ -373,10 +409,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'imagewidth' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imagewidth',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '4',
                                'max' => '4',
                                'eval' => 'int',
@@ -389,10 +425,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'imageheight' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imageheight',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '4',
                                'max' => '4',
                                'eval' => 'int',
@@ -407,7 +443,7 @@ $TCA['tt_content'] = Array (
                'imageorient' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imageorient',
                        'config' => Array (
-                               'type' => 'select',     
+                               'type' => 'select',
                                'items' => Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:imageorient.I.0', 0, 'selicons/above_center.gif'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:imageorient.I.1', 1, 'selicons/above_right.gif'),
@@ -422,28 +458,29 @@ $TCA['tt_content'] = Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:imageorient.I.10', 26, 'selicons/intext_left_nowrap.gif')
                                ),
                                'selicon_cols' => 6,
-                               'default' => '8'
+                               'default' => '0',
+                               'iconsInOptionTags' => 1,
                        )
                ),
                'imageborder' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imageborder',
                        'config' => Array (
                                'type' => 'check'
                        )
                ),
                'image_noRows' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_noRows',
                        'config' => Array (
                                'type' => 'check'
                        )
                ),
                'image_link' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_link',
                        'config' => Array (
-                               'type' => 'input',              
+                               'type' => 'input',
                                'size' => '15',
                                'max' => '256',
                                'checkbox' => '',
@@ -457,18 +494,19 @@ $TCA['tt_content'] = Array (
                                                'script' => 'browse_links.php?mode=wizard',
                                                'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
                                        )
-                               )
+                               ),
+                               'softref' => 'typolink[linkList]'
                        )
                ),
                'image_zoom' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_zoom',
                        'config' => Array (
                                'type' => 'check'
                        )
                ),
                'image_effects' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_effects',
                        'config' => Array (
                                'type' => 'select',
@@ -487,7 +525,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'image_frames' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_frames',
                        'config' => Array (
                                'type' => 'select',
@@ -505,7 +543,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'image_compression' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:image_compression',
                        'config' => Array (
                                'type' => 'select',
@@ -536,8 +574,8 @@ $TCA['tt_content'] = Array (
                'imagecols' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imagecols',
                        'config' => Array (
-                               'type' => 'select',     
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('1', 0),
                                        Array('2', 2),
                                        Array('3', 3),
@@ -555,11 +593,12 @@ $TCA['tt_content'] = Array (
                        'config' => Array (
                                'type' => 'text',
                                'cols' => '30',
-                               'rows' => '3'
+                               'rows' => '3',
+                               'softref' => 'typolink_tag,images,email[subst],url'
                        )
                ),
                'imagecaption_position' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:imagecaption_position',
                        'config' => Array (
                                'type' => 'select',
@@ -572,11 +611,38 @@ $TCA['tt_content'] = Array (
                                'default' => ''
                        )
                ),
+               'altText' => Array (
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:cms/locallang_ttc.php:image_altText',
+                       'config' => Array (
+                               'type' => 'text',
+                               'cols' => '30',
+                               'rows' => '3'
+                       )
+               ),
+               'titleText' => Array (
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:cms/locallang_ttc.php:image_titleText',
+                       'config' => Array (
+                               'type' => 'text',
+                               'cols' => '30',
+                               'rows' => '3'
+                       )
+               ),
+               'longdescURL' => Array (
+                       'exclude' => 1,
+                       'label' => 'LLL:EXT:cms/locallang_ttc.php:image_longdescURL',
+                       'config' => Array (
+                               'type' => 'text',
+                               'cols' => '30',
+                               'rows' => '3'
+                       )
+               ),
                'cols' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:cols',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:cols.I.0', '0'),
                                        Array('1', '1'),
                                        Array('2', '2'),
@@ -604,12 +670,12 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'recursive' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.recursive',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
-                                       Array('', '0'), 
+                               'type' => 'select',
+                               'items' => Array (
+                                       Array('', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:recursive.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:recursive.I.2', '2'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:recursive.I.3', '3'),
@@ -622,8 +688,8 @@ $TCA['tt_content'] = Array (
                'menu_type' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:menu_type',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:cms/locallang_ttc.php:menu_type.I.0', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:menu_type.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:menu_type.I.2', '4'),
@@ -639,28 +705,30 @@ $TCA['tt_content'] = Array (
                'list_type' => Array (
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:list_type',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
+                                       Array('','')
                                ),
-                               'default' => '0'
+                               'default' => '',
+                               'authMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['explicitADmode'],
                        )
                ),
                'select_key' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:lang/locallang_general.php:LGL.code',
                        'config' => Array (
-                               'type' => 'input',              
+                               'type' => 'input',
                                'size' => '20',
                                'max' => '80',
                                'eval' => 'trim'
                        )
                ),
                'table_bgColor' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:table_bgColor',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:table_bgColor.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:table_bgColor.I.2', '2'),
@@ -676,10 +744,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'table_border' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:table_border',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '3',
                                'max' => '3',
                                'eval' => 'int',
@@ -692,10 +760,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'table_cellspacing' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:table_cellspacing',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '3',
                                'max' => '3',
                                'eval' => 'int',
@@ -708,10 +776,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'table_cellpadding' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:table_cellpadding',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '3',
                                'max' => '3',
                                'eval' => 'int',
@@ -730,7 +798,7 @@ $TCA['tt_content'] = Array (
                                'internal_type' => 'file',
                                'allowed' => '',        // Must be empty for disallowed to work.
                                'disallowed' => 'php,php3',
-                               'max_size' => '10000',
+                               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
                                'uploadfolder' => 'uploads/media',
                                'show_thumbs' => '1',
                                'size' => '3',
@@ -744,7 +812,7 @@ $TCA['tt_content'] = Array (
                                'type' => 'group',
                                'internal_type' => 'file',
                                'allowed' => 'txt,html,htm,class,swf,swa,dcr,wav,avi,au,mov,asf,mpg,wmv,mp3',
-                               'max_size' => '10000',
+                               'max_size' => $GLOBALS['TYPO3_CONF_VARS']['BE']['maxFileSize'],
                                'uploadfolder' => 'uploads/media',
                                'size' => '2',
                                'maxitems' => '1',
@@ -770,10 +838,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'spaceBefore' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:spaceBefore',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '3',
                                'max' => '3',
                                'eval' => 'int',
@@ -786,10 +854,10 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'spaceAfter' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:spaceAfter',
                        'config' => Array (
-                               'type' => 'input',      
+                               'type' => 'input',
                                'size' => '3',
                                'max' => '3',
                                'eval' => 'int',
@@ -802,11 +870,11 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'section_frame' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:section_frame',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:section_frame.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:section_frame.I.2', '5'),
@@ -821,11 +889,11 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'splash_layout' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:splash_layout',
                        'config' => Array (
-                               'type' => 'select',             
-                               'items' => Array (      
+                               'type' => 'select',
+                               'items' => Array (
                                        Array('LLL:EXT:lang/locallang_general.php:LGL.default_value', '0'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:splash_layout.I.1', '1'),
                                        Array('LLL:EXT:cms/locallang_ttc.php:splash_layout.I.2', '2'),
@@ -837,7 +905,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'sectionIndex' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:sectionIndex',
                        'config' => Array (
                                'type' => 'check',
@@ -845,7 +913,7 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'linkToTop' => Array (
-                       'exclude' => 1, 
+                       'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:linkToTop',
                        'config' => Array (
                                'type' => 'check'
@@ -860,10 +928,11 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'pi_flexform' => array(
+                       'l10n_display' => 'hideDiff',
                        'label' => 'LLL:EXT:cms/locallang_ttc.php:pi_flexform',
                        'config' => Array (
                                'type' => 'flex',
-                               'ds_pointerField' => 'list_type',
+                               'ds_pointerField' => 'list_type,CType',
                                'ds' => array(
                                        'default' => '
                                                <T3DataStructure>
@@ -888,44 +957,119 @@ $TCA['tt_content'] = Array (
                        )
                ),
                'tx_impexp_origuid' => Array('config'=>array('type'=>'passthrough')),
+               'l18n_diffsource' => Array('config'=>array('type'=>'passthrough')),
+               't3ver_label' => Array (
+                       'label' => 'LLL:EXT:lang/locallang_general.php:LGL.versionLabel',
+                       'config' => Array (
+                               'type' => 'input',
+                               'size' => '30',
+                               'max' => '30',
+                       )
+               ),
        ),
-       'types' => Array (      
+       'types' => Array (
                '1' =>  Array('showitem' => 'CType'),
-               'header' =>     Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, subheader;;8'),
-               'text' =>               Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, bodytext;;9;richtext[paste|bold|italic|underline|formatblock|class|left|center|right|orderedlist|unorderedlist|outdent|indent|link|image]:rte_transform[flag=rte_enabled|mode=ts];3-3-3, rte_enabled, text_properties'),
-               'textpic' =>    Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, bodytext;;9;richtext[paste|bold|italic|underline|formatblock|class|left|center|right|orderedlist|unorderedlist|outdent|indent|link|image]:rte_transform[flag=rte_enabled|mode=ts];3-3-3, rte_enabled, text_properties, --div--, image;;;;4-4-4, imageorient;;2, imagewidth;;13, 
-                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgLinks;7, 
-                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgOptions;11, 
-                       imagecaption;;5'),
-               'rte' =>                Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, bodytext;;;nowrap:richtext[*]:rte_transform[mode=ts_images-ts_reglinks];3-3-3'),
-               'image' =>              Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, image;;;;4-4-4, imageorient;;2, imagewidth;;13, 
-                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgLinks;7, 
-                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgOptions;11,
-                        imagecaption;;5'),
-               'bullets' =>    Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, layout;;;;3-3-3, bodytext;;9;nowrap, text_properties'),
-               'table' =>              Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, layout;;10;button;3-3-3, cols, bodytext;;9;nowrap:wizards[table], text_properties'),
-               'splash' =>     Array('showitem' => 'CType;;4;button;1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2, splash_layout, bodytext;;;;3-3-3, image;;6'),
-               'uploads' =>    Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, media;;;;5-5-5, 
-                       select_key;LLL:EXT:cms/locallang_ttc.php:select_key.ALT.uploads, 
-                       layout;;10;button, filelink_size, 
-                       imagecaption;LLL:EXT:cms/locallang_ttc.php:imagecaption.ALT.uploads;;nowrap'),
-               'multimedia' => Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, multimedia;;;;5-5-5, bodytext;LLL:EXT:lang/locallang_general.php:LGL.parameters;;nowrap'),
-               'script' =>             Array('showitem' => 'CType;;4;button;1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2, select_key;;;;5-5-5, pages;;12, bodytext;LLL:EXT:lang/locallang_general.php:LGL.parameters;;nowrap, 
-                       imagecaption;LLL:EXT:cms/locallang_ttc.php:imagecaption.ALT.script'),
-               'menu' =>               Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, menu_type;;;;5-5-5, pages'),
-               'mailform' =>   Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, 
-                       bodytext;LLL:EXT:cms/locallang_ttc.php:bodytext.ALT.mailform;;nowrap:wizards[forms];5-5-5, 
-                       pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.mailform, 
-                       subheader;LLL:EXT:cms/locallang_ttc.php:subheader.ALT.mailform'),
-               'search' =>     Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, 
-                       pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.search;;;5-5-5'),
-               'login' =>              Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, 
-                       pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.login;;;5-5-5'),
-               'shortcut' =>   Array('showitem' => 'CType;;4;button;1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2, records;;;;5-5-5, layout'),
+               'header' =>     Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, subheader;;8, linkToTop;;;;3-3-3,
+                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access, starttime, endtime'
+               ),
+               'text' =>               Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2,linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.1, bodytext;;9;richtext:rte_transform[flag=rte_enabled|mode=ts_css];3-3-3, rte_enabled, text_properties,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access, starttime, endtime',
+               ),
+               'textpic' =>    Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.text,bodytext;;9;richtext:rte_transform[flag=rte_enabled|mode=ts_css];3-3-3, rte_enabled, text_properties,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.media, image;;;;5-5-5, imageorient;;2,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgDimensions;13,;;;;6-6-6,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgLinks;7,
+                                                       imagecaption;;5,altText;;;;7-7-7,titleText,longdescURL,;;;;8-8-8,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgOptions;11,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access, starttime, endtime'
+               ),
+               'rte' =>                Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.text, bodytext;;;nowrap:richtext[*]:rte_transform[mode=ts_images-ts_reglinks];3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access, starttime, endtime'
+               ),
+               'image' =>              Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.media, image;;;;4-4-4, imageorient;;2,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgDimensions;13,;;;;5-5-5,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgLinks;7,
+                                                       imagecaption;;5,altText;;;;6-6-6,titleText,longdescURL,;;;;7-7-7,
+                                                       --palette--;LLL:EXT:cms/locallang_ttc.php:ALT.imgOptions;11,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'bullets' =>    Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;4-4-4,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.4, layout;;;;3-3-3, bodytext;;9;nowrap, text_properties,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'table' =>              Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;4-4-4,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.5, layout;;10;button;3-3-3, cols, bodytext;;9;nowrap:wizards[table], text_properties,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'splash' =>     Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.11, splash_layout, bodytext;;;;3-3-3, image;;6,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'uploads' =>    Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.6, media;;;;3-3-3,
+                                                       select_key;LLL:EXT:cms/locallang_ttc.php:select_key.ALT.uploads,
+                                                       layout;;10;button, filelink_size,
+                                                       imagecaption;LLL:EXT:cms/locallang_ttc.php:imagecaption.ALT.uploads;;nowrap,;;;;4-4-4,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'multimedia' => Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.7, multimedia;;;;3-3-3, bodytext;LLL:EXT:lang/locallang_general.php:LGL.parameters;;nowrap,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'script' =>             Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.15, select_key;;;;3-3-3, pages;;12, bodytext;LLL:EXT:lang/locallang_general.php:LGL.parameters;;nowrap,
+                                                       imagecaption;LLL:EXT:cms/locallang_ttc.php:imagecaption.ALT.script,;;;;4-4-4,linkToTop,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'menu' =>               Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2,  linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.12, menu_type;;;;4-4-4, pages,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'mailform' =>   Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.8, bodytext;LLL:EXT:cms/locallang_ttc.php:bodytext.ALT.mailform;;nowrap:wizards[forms];3-3-3,
+                                                       pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.mailform,
+                                                       subheader;LLL:EXT:cms/locallang_ttc.php:subheader.ALT.mailform,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'search' =>     Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.9, pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.search,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'login' =>              Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.10, pages;LLL:EXT:cms/locallang_ttc.php:pages.ALT.login,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'shortcut' =>   Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.13, records;;;;5-5-5, layout,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
                'list' =>               Array(
-                                                       'showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, --div--, list_type;;;;5-5-5, layout, select_key, pages;;12',
+                                                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.plugin, list_type;;;;3-3-3, layout, select_key, pages;;12,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime',
                                                        'subtype_value_field' => 'list_type',
                                                        'subtypes_excludelist' => Array(
+                                                               '' => 'layout,select_key,pages',        // When no plugin is selected.
                                                                '3' => 'layout',
 //                                                             '4' => 'layout',        // List type forum
                                                                '2' => 'layout',
@@ -936,31 +1080,37 @@ $TCA['tt_content'] = Array (
                                                                '7' => 'layout',
                                                                '1' => 'layout',
                                                                '8' => 'layout',
-                                                               'indexed_search' => 'layout',
                                                                '11' => 'layout',
                                                                '20' => 'layout',
                                                                '21' => 'layout'
                                                        )
                                                ),
-               'div' =>                Array('showitem' => 'CType;;14;button;1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2'),
-               'html' =>               Array('showitem' => 'CType;;4;button;1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2, 
-                       bodytext;LLL:EXT:cms/locallang_ttc.php:bodytext.ALT.html;;nowrap;3-3-3')
+               'div' =>                Array(
+                       'showitem' => 'CType;;14;button,hidden,1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2,linkToTop,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               ),
+               'html' =>               Array(
+                       'showitem' => 'CType;;4;button,hidden,1-1-1, header;LLL:EXT:lang/locallang_general.php:LGL.name;;;2-2-2, linkToTop;;;;3-3-3,
+                                                       --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.17, bodytext;LLL:EXT:cms/locallang_ttc.php:bodytext.ALT.html;;nowrap,
+                                                       --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'
+               )
        ),
        'palettes' => Array (
-               '1' => Array('showitem' => 'hidden, starttime, endtime, fe_group'),
+               '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, colPos, spaceBefore, spaceAfter, section_frame, sectionIndex, linkToTop'),
+               '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'),
+               '7' => Array('showitem' => 'image_link, image_zoom','canNotCollapse' => 1),
                '8' => Array('showitem' => 'layout'),
                '9' => Array('showitem' => 'text_align,text_face,text_size,text_color'),
                '10' => Array('showitem' => 'table_bgColor, table_border, table_cellspacing, table_cellpadding'),
-               '11' => Array('showitem' => 'image_compression, image_effects, image_frames'),
+               '11' => Array('showitem' => 'image_compression, image_effects, image_frames','canNotCollapse' => 1),
                '12' => Array('showitem' => 'recursive'),
-               '13' => Array('showitem' => 'imageheight'),
-               '14' => Array('showitem' => 'sys_language_uid, colPos')
+               '13' => Array('showitem' => 'imagewidth, imageheight','canNotCollapse' => 1),
+               '14' => Array('showitem' => 'sys_language_uid, l18n_parent, colPos'),
+               '15' => Array('showitem' => 'fe_group'),
        )
 );