From a7dcf96cb168940cd8c6c0a2975e55fe1d1ccb8c Mon Sep 17 00:00:00 2001 From: Ingo Renner Date: Fri, 22 Feb 2008 20:09:54 +0000 Subject: [PATCH] added feature #6846: enable Tabs in tt_content, credits Steffen Kamper git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3258 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + typo3/sysext/cms/ext_tables.php | 5 +- typo3/sysext/cms/locallang_ttc.xml | 4 + typo3/sysext/cms/tbl_tt_content.php | 157 +++++++++++++----- .../sysext/css_styled_content/ext_tables.php | 8 +- typo3/sysext/felogin/ext_tables.php | 4 +- 6 files changed, 129 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 022e71a678c6..4e0f0c20245b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * fixed bug #7587: Accesscheck for Workspaceselector, credits Steffen Kamper * fixed bug #7588: Accesscheck for clearCache * added feature #7592: Enable tabs for be_users, credits Francois Suter + * added feature #6846: enable Tabs in tt_content, credits Steffen Kamper 2008-02-22 Benjamin Mack diff --git a/typo3/sysext/cms/ext_tables.php b/typo3/sysext/cms/ext_tables.php index d30f859d5811..80051646cd09 100755 --- a/typo3/sysext/cms/ext_tables.php +++ b/typo3/sysext/cms/ext_tables.php @@ -666,10 +666,11 @@ $TCA['tt_content'] = array ( 'div' => 'tt_content_div.gif', 'html' => 'tt_content_html.gif' ), - 'mainpalette' => '1,15', + 'mainpalette' => '15', 'thumbnail' => 'image', 'requestUpdate' => 'list_type,rte_enabled', - 'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_tt_content.php' + 'dynamicConfigFile' => t3lib_extMgm::extPath($_EXTKEY).'tbl_tt_content.php', + 'dividers2tabs' => true ) ); diff --git a/typo3/sysext/cms/locallang_ttc.xml b/typo3/sysext/cms/locallang_ttc.xml index 6f59603966f2..892ee5c93c19 100755 --- a/typo3/sysext/cms/locallang_ttc.xml +++ b/typo3/sysext/cms/locallang_ttc.xml @@ -192,6 +192,7 @@ + @@ -201,6 +202,9 @@ + + + diff --git a/typo3/sysext/cms/tbl_tt_content.php b/typo3/sysext/cms/tbl_tt_content.php index 2ca6ef0c0499..541e31a16d6f 100755 --- a/typo3/sysext/cms/tbl_tt_content.php +++ b/typo3/sysext/cms/tbl_tt_content.php @@ -967,41 +967,104 @@ $TCA['tt_content'] = 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:rte_transform[flag=rte_enabled|mode=ts_css];3-3-3, rte_enabled, text_properties'), - 'textpic' => Array('showitem' => 'CType;;4;button;1-1-1, header;;3;;2-2-2, bodytext;;9;richtext:rte_transform[flag=rte_enabled|mode=ts_css];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, - altText;;;;1-1-1,titleText,longdescURL'), - '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, - altText;;;;1-1-1,titleText,longdescURL'), - '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. @@ -1020,26 +1083,32 @@ $TCA['tt_content'] = Array ( '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'), - '15' => Array('showitem' => '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, l18n_parent, 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, l18n_parent, colPos') + '13' => Array('showitem' => 'imagewidth, imageheight','canNotCollapse' => 1), + '14' => Array('showitem' => 'sys_language_uid, l18n_parent, colPos'), + '15' => Array('showitem' => 'fe_group'), ) ); diff --git a/typo3/sysext/css_styled_content/ext_tables.php b/typo3/sysext/css_styled_content/ext_tables.php index 7d17b8dfcac7..93d3a41e3ac7 100755 --- a/typo3/sysext/css_styled_content/ext_tables.php +++ b/typo3/sysext/css_styled_content/ext_tables.php @@ -4,7 +4,9 @@ if (!defined ('TYPO3_MODE')) die ('Access denied.'); // add flexform t3lib_extMgm::addPiFlexFormValue('*', 'FILE:EXT:css_styled_content/flexform_ds.xml','table'); -t3lib_extMgm::addToAllTCAtypes('tt_content','pi_flexform;;;;1-1-1','table'); - +$TCA['tt_content']['types']['table']['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, pi_flexform, + --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,starttime, endtime'; + t3lib_extMgm::addStaticFile($_EXTKEY,'static/','CSS Styled Content'); -?> \ No newline at end of file +?> diff --git a/typo3/sysext/felogin/ext_tables.php b/typo3/sysext/felogin/ext_tables.php index c9f0592802f2..1b5786e0f882 100644 --- a/typo3/sysext/felogin/ext_tables.php +++ b/typo3/sysext/felogin/ext_tables.php @@ -12,7 +12,9 @@ else #replace login -$TCA['tt_content']['types']['login']['showitem']='CType;;4;button;1-1-1, header;;3;;2-2-2,pi_flexform'; +$TCA['tt_content']['types']['login']['showitem']='CType;;4;button,hidden;;1;;1-1-1, header;;3;;2-2-2, linkToTop;;;;3-3-3, + --div--;LLL:EXT:cms/locallang_ttc.xml:CType.I.14, pi_flexform;;;;1-1-1, + --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access,,starttime, endtime'; // Adds the redirect-field to the fe_group- and fe_users-table $tempColumns = Array ( -- 2.20.1