[CLEANUP] Remove dividers2tabs functionality 58/33958/3
authorBenjamin Mack <benni@typo3.org>
Mon, 10 Nov 2014 16:48:32 +0000 (17:48 +0100)
committerBenjamin Mack <benni@typo3.org>
Mon, 10 Nov 2014 18:16:45 +0000 (19:16 +0100)
The default for any installation and the whole
core is to use dividers2tabs enabled by default.

Disabling "dividers2tabs" results in a long list
of input fields, which is not usable today
anymore.

The patch removes the option completely
in FormEngine, and removes the option in
ctrl section of the core tables, meaning
that tabs will also be shown in FormEngine.

Releases: master
Resolves: #62833
Change-Id: I2e59fc4a4619a2611859751985da46dd73a9ca0b
Reviewed-on: http://review.typo3.org/33958
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Tested-by: Xavier Perseguers <xavier@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Xavier Perseguers <xavier@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Benjamin Mack <benni@typo3.org>
28 files changed:
typo3/sysext/backend/Classes/Form/Element/FlexElement.php
typo3/sysext/backend/Classes/Form/FormEngine.php
typo3/sysext/backend/Classes/Template/DocumentTemplate.php
typo3/sysext/core/Configuration/TCA/be_groups.php
typo3/sysext/core/Configuration/TCA/be_users.php
typo3/sysext/core/Configuration/TCA/pages.php
typo3/sysext/core/Configuration/TCA/sys_category.php
typo3/sysext/core/Configuration/TCA/sys_file.php
typo3/sysext/core/Configuration/TCA/sys_file_metadata.php
typo3/sysext/core/Configuration/TCA/sys_file_storage.php
typo3/sysext/core/Configuration/TCA/sys_news.php
typo3/sysext/core/Documentation/Changelog/master/Deprecation-62833-Dividers2Tabs.rst [new file with mode: 0644]
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.1ncsv.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.1nff.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.mnasym.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.mnattr.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.mnmmasym.php
typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Configuration/ExtTables/ext_tables.mnsym.php
typo3/sysext/frontend/Configuration/TCA/fe_groups.php
typo3/sysext/frontend/Configuration/TCA/fe_users.php
typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
typo3/sysext/frontend/Configuration/TCA/sys_template.php
typo3/sysext/frontend/Configuration/TCA/tt_content.php
typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/setup/ext_tables.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php

index 9960829..af32030 100644 (file)
@@ -189,8 +189,7 @@ class FlexElement extends AbstractFormElement {
                                        );
                                }
                                if (is_array($dataStructArray['sheets'])) {
-                                       $dividersToTabsBehaviour = isset($GLOBALS['TCA'][$table]['ctrl']['dividers2tabs']) ? $GLOBALS['TCA'][$table]['ctrl']['dividers2tabs'] : 1;
-                                       $item .= $this->formEngine->getDynTabMenu($tabParts, 'TCEFORMS:flexform:' . $additionalInformation['itemFormElName'] . $additionalInformation['_lang'], $dividersToTabsBehaviour);
+                                       $item .= $this->formEngine->getDynTabMenu($tabParts, 'TCEFORMS:flexform:' . $additionalInformation['itemFormElName'] . $additionalInformation['_lang']);
                                } else {
                                        $item .= $sheetContent;
                                }
index 7b6081e..daa7129 100644 (file)
@@ -782,8 +782,6 @@ class FormEngine {
                $tabIdentString = '';
                $tabIdentStringMD5 = '';
                if ($GLOBALS['TCA'][$table]) {
-                       // Get dividers2tabs setting from TCA of the current table:
-                       $dividers2tabs = &$GLOBALS['TCA'][$table]['ctrl']['dividers2tabs'];
                        // Load the description content for the table.
                        if ($this->edit_showFieldHelp || $this->doLoadTableDescr($table)) {
                                $this->getLanguageService()->loadSingleTableDescription($table);
@@ -807,7 +805,7 @@ class FormEngine {
                                        $excludeElements = ($this->excludeElements = $this->getExcludeElements($table, $row, $typeNum));
                                        $fields = $this->mergeFieldsWithAddedFields($fields, $this->getFieldsToAdd($table, $row, $typeNum), $table);
                                        // If TCEforms will render a tab menu in the next step, push the name to the tab stack:
-                                       if (strstr($itemList, '--div--') !== FALSE && $this->enableTabMenu && $dividers2tabs) {
+                                       if (strstr($itemList, '--div--') !== FALSE && $this->enableTabMenu) {
                                                $tabIdentString = 'TCEforms:' . $table . ':' . $row['uid'];
                                                $tabIdentStringMD5 = $this->getDocumentTemplate()->getDynTabMenuId($tabIdentString);
                                                // Remember that were currently working on the general tab:
@@ -841,8 +839,7 @@ class FormEngine {
                                                                $out_array[$out_sheet][$out_pointer] .= $sField;
                                                        } elseif ($theField == '--div--') {
                                                                if ($cc > 0) {
-                                                                       $out_array[$out_sheet][$out_pointer] .= $this->getDivider();
-                                                                       if ($this->enableTabMenu && $dividers2tabs) {
+                                                                       if ($this->enableTabMenu) {
                                                                                // Remove last tab entry from the dynNestedStack:
                                                                                $out_sheet++;
                                                                                // Remove the previous sheet from stack (if any):
@@ -924,8 +921,7 @@ class FormEngine {
                        if (count($parts) > 1) {
                                // Unset the current level of tab menus:
                                $this->popFromDynNestedStack('tab', $tabIdentStringMD5 . '-' . ($out_sheet + 1));
-                               $dividersToTabsBehaviour = isset($GLOBALS['TCA'][$table]['ctrl']['dividers2tabs']) ? $GLOBALS['TCA'][$table]['ctrl']['dividers2tabs'] : 1;
-                               $output = $this->getDynTabMenu($parts, $tabIdentString, $dividersToTabsBehaviour);
+                               $output = $this->getDynTabMenu($parts, $tabIdentString);
                        } else {
                                // If there is only one tab/part there is no need to wrap it into the dynTab code
                                $output = isset($parts[0]) ? trim($parts[0]['content']) : '';
@@ -971,8 +967,6 @@ class FormEngine {
                                // Don't sent palette pointer - there are no options anyways for a field-list.
                                $sField = $this->getSingleField($table, $theField, $row, $parts[1], 0, $parts[3], 0);
                                $out .= $sField;
-                       } elseif ($theField == '--div--') {
-                               $out .= $this->getDivider();
                        }
                        if ($palFields) {
                                $out .= $this->getPaletteFields($table, $row, '', '', implode(',', GeneralUtility::trimExplode('|', $palFields, TRUE)));
@@ -3084,14 +3078,18 @@ class FormEngine {
         *
         * @param array $parts Parts for the tab menu, fed to template::getDynTabMenu()
         * @param string $idString ID string for the tab menu
-        * @param int $dividersToTabsBehaviour If set to '1' empty tabs will be removed, If set to '2' empty tabs will be disabled
+        * @param int $dividersToTabsBehaviour If set to '1' empty tabs will be removed, If set to '2' empty tabs will be disabled, deprecated, and not in use anymore since TYPO3 CMS 7
         * @return string HTML for the menu
         */
-       public function getDynTabMenu($parts, $idString, $dividersToTabsBehaviour = 1) {
+       public function getDynTabMenu($parts, $idString, $dividersToTabsBehaviour = -1) {
+               // if the third (obsolete) parameter is used, throw a deprecation warning
+               if ($dividersToTabsBehaviour !== -1) {
+                       GeneralUtility::deprecationLog('The parameter $dividersToTabsBehaviour in FormEngine::getDynTabMenu is deprecated. Please remove this option from your code');
+               }
                $docTemplate = $this->getDocumentTemplate();
                if (is_object($docTemplate)) {
                        $docTemplate->backPath = $this->backPath;
-                       return $docTemplate->getDynTabMenu($parts, $idString, 0, FALSE, 1, FALSE, 1, $dividersToTabsBehaviour);
+                       return $docTemplate->getDynTabMenu($parts, $idString, 0, FALSE, 1, FALSE, 1);
                } else {
                        $output = '';
                        foreach ($parts as $singlePad) {
@@ -3713,8 +3711,10 @@ class FormEngine {
         * Currently not implemented and returns only blank value.
         *
         * @return string Empty string
+        * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
         */
        public function getDivider() {
+               GeneralUtility::logDeprecatedFunction();
                return '';
        }
 
index afebc4e..9a84427 100644 (file)
@@ -1564,10 +1564,10 @@ function jumpToUrl(URL) {
         * @param bool $noWrap Deprecated - delivered by CSS
         * @param bool $fullWidth If set, the tabs will span the full width of their position
         * @param int $defaultTabIndex Default tab to open (for toggle <=0). Value corresponds to integer-array index + 1 (index zero is "1", index "1" is 2 etc.). A value of zero (or something non-existing) will result in no default tab open.
-        * @param int $dividers2tabs If set to '1' empty tabs will be remove, If set to '2' empty tabs will be disabled
+        * @param int $tabBehaviour If set to '1' empty tabs will be remove, If set to '2' empty tabs will be disabled
         * @return string JavaScript section for the HTML header.
         */
-       public function getDynTabMenu($menuItems, $identString, $toggle = 0, $foldout = FALSE, $noWrap = TRUE, $fullWidth = FALSE, $defaultTabIndex = 1, $dividers2tabs = 2) {
+       public function getDynTabMenu($menuItems, $identString, $toggle = 0, $foldout = FALSE, $noWrap = TRUE, $fullWidth = FALSE, $defaultTabIndex = 1, $tabBehaviour = 2) {
                // Load the static code, if not already done with the function below
                $this->loadJavascriptLib('sysext/backend/Resources/Public/JavaScript/tabmenu.js');
                $content = '';
@@ -1599,7 +1599,7 @@ function jumpToUrl(URL) {
                                }
                                $isEmpty = trim($def['content']) === '' && trim($def['icon']) === '';
                                // "Removes" empty tabs
-                               if ($isEmpty && $dividers2tabs == 1) {
+                               if ($isEmpty && $tabBehaviour == 1) {
                                        continue;
                                }
                                $requiredIcon = '<img name="' . $id . '-' . $index . '-REQ" src="' . $GLOBALS['BACK_PATH'] . 'gfx/clear.gif" class="t3-TCEforms-reqTabImg" alt="" />';
index 53faa1b..31e9990 100644 (file)
@@ -18,7 +18,6 @@ return array(
                ),
                'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_groups',
                'useColumnsForDefaultValues' => 'lockToDomain, file_permissions',
-               'dividers2tabs' => TRUE,
                'versioningWS_alwaysAllowLiveEdit' => TRUE,
                'searchFields' => 'title'
        ),
index 1206946..35e76f8 100644 (file)
@@ -28,7 +28,6 @@ return array(
                ),
                'mainpalette' => '1',
                'useColumnsForDefaultValues' => 'usergroup,lockToDomain,options,db_mountpoints,file_mountpoints,file_permissions,userMods',
-               'dividers2tabs' => TRUE,
                'versioningWS_alwaysAllowLiveEdit' => TRUE,
                'searchFields' => 'username,email,realName'
        ),
index 4bfbfdc..1bb566f 100644 (file)
@@ -15,7 +15,6 @@ return array(
                'cruser_id' => 'cruser_id',
                'editlock' => 'editlock',
                'useColumnsForDefaultValues' => 'doktype,fe_group,hidden',
-               'dividers2tabs' => 1,
                'enablecolumns' => array(
                        'disabled' => 'hidden',
                        'starttime' => 'starttime',
index e2c4c73..534bf44 100644 (file)
@@ -8,7 +8,6 @@ return array(
                'cruser_id' => 'cruser_id',
                'delete' => 'deleted',
                'sortby' => 'sorting',
-               'dividers2tabs' => TRUE,
                'versioningWS' => 2,
                'rootLevel' => -1,
                'versioning_followPages' => TRUE,
index 8f9d49e..cdc673a 100644 (file)
@@ -8,7 +8,6 @@ return array(
                'hideTable' => TRUE,
                'rootLevel' => TRUE,
                'default_sortby' => 'ORDER BY name ASC',
-               'dividers2tabs' => TRUE,
                'typeicon_column' => 'type',
                'typeicon_classes' => array(
                        '1' => 'mimetypes-text-text',
index 4a4e663..3ee6982 100644 (file)
@@ -15,7 +15,6 @@ return array(
                'versioningWS' => TRUE,
                'origUid' => 't3_origuid',
                'default_sortby' => 'ORDER BY crdate DESC',
-               'dividers2tabs' => TRUE,
                'typeicon_classes' => array(
                        'default' => 'mimetypes-other-other'
                ),
index 9db74bc..8c7f5ee 100644 (file)
@@ -13,7 +13,6 @@ return array(
                'enablecolumns' => array(
                        'disabled' => 'hidden'
                ),
-               'dividers2tabs' => TRUE,
                'requestUpdate' => 'driver',
                'iconfile' => '_icon_ftp.gif',
                'searchFields' => 'name,description'
index bd747a4..659541e 100644 (file)
@@ -17,8 +17,7 @@ return array(
                'default_sortby' => 'crdate DESC',
                'typeicon_classes' => array(
                        'default' => 'mimetypes-x-sys_news'
-               ),
-               'dividers2tabs' => TRUE
+               )
        ),
        'interface' => array(
                'showRecordFieldList' => 'hidden,title,content,starttime,endtime'
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-62833-Dividers2Tabs.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-62833-Dividers2Tabs.rst
new file mode 100644 (file)
index 0000000..dc85bef
--- /dev/null
@@ -0,0 +1,25 @@
+======================================================
+Breaking: #62833 - Removed dividers2tabs functionality
+======================================================
+
+Description
+===========
+
+The "dividers2tabs" option in the ctrl section of TCA allows to show tabs in FormEngine while editing records,
+instead of showing all fields in one long column. This behaviour is the default since some TYPO3 versions.
+
+This option has no effect anymore, as "dividers2tabs" is removed for TYPO3 CMS Core. The option can also be
+safely removed from any extension that adds TCA data.
+
+
+Impact
+======
+
+A third-party extension that overrides the dividers2tabs option for an existing table or that adds a TCA table
+with this option disabled will have a record editing with tabs from now on.
+
+
+Affected installations
+======================
+
+Installations with 3rd-party extensions with TCA tables that have "dividers2tabs" disabled.
\ No newline at end of file
index c6bdbdc..12dc88a 100644 (file)
@@ -24,7 +24,6 @@ $TCA['tx_irretutorial_1ncsv_hotel'] = array(
                'origUid' => 't3_origuid',
                'shadowColumnsForNewPlaceholders' => 'offers',
                'shadowColumnsForMovePlaceholders' => 'offers',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, offers',
@@ -55,7 +54,6 @@ $TCA['tx_irretutorial_1ncsv_offer'] = array(
                'origUid' => 't3_origuid',
                'shadowColumnsForNewPlaceholders' => 'prices',
                'shadowColumnsForMovePlaceholders' => 'prices',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, prices',
@@ -84,7 +82,6 @@ $TCA['tx_irretutorial_1ncsv_price'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_price.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, price',
index 0efae08..3e0ec01 100644 (file)
@@ -25,7 +25,6 @@ $TCA['tx_irretutorial_1nff_hotel'] = array(
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'parentid,parenttable',
                'shadowColumnsForMovePlaceholders' => 'parentid,parenttable',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, offers',
@@ -57,7 +56,6 @@ $TCA['tx_irretutorial_1nff_offer'] = array(
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'parentid,parenttable',
                'shadowColumnsForMovePlaceholders' => 'parentid,parenttable',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid, parenttable, title, prices',
@@ -89,7 +87,6 @@ $TCA['tx_irretutorial_1nff_price'] = array(
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'parentid,parenttable',
                'shadowColumnsForMovePlaceholders' => 'parentid,parenttable',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, parentid, title, price',
index 02b16cd..c675d98 100644 (file)
@@ -22,7 +22,6 @@ $TCA['tx_irretutorial_mnasym_hotel'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_hotel.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, offers',
@@ -52,7 +51,6 @@ $TCA['tx_irretutorial_mnasym_hotel_offer_rel'] = array(
                'origUid' => 't3_origuid',
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'hotelid,offerid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, hotelid, offerid, prices, hotelsort, offersort',
@@ -81,7 +79,6 @@ $TCA['tx_irretutorial_mnasym_offer'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_offer.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, hotels',
@@ -112,7 +109,6 @@ $TCA['tx_irretutorial_mnasym_price'] = array(
                'origUid' => 't3_origuid',
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'parentid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'hidden, title, parentid, price',
index e73ab87..1c27293 100644 (file)
@@ -22,7 +22,6 @@ $TCA['tx_irretutorial_mnattr_hotel'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_hotel.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, offers',
@@ -52,7 +51,6 @@ $TCA['tx_irretutorial_mnattr_hotel_offer_rel'] = array(
                'origUid' => 't3_origuid',
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'hotelid,offerid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, hotelid, offerid, quality, allincl',
@@ -81,7 +79,6 @@ $TCA['tx_irretutorial_mnattr_offer'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_offer.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, hotels',
index ccb9a43..9b0acda 100644 (file)
@@ -22,7 +22,6 @@ $TCA['tx_irretutorial_mnmmasym_hotel'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_hotel.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, offers',
@@ -51,7 +50,6 @@ $TCA['tx_irretutorial_mnmmasym_offer'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_offer.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, hotels, prices',
@@ -80,7 +78,6 @@ $TCA['tx_irretutorial_mnmmasym_price'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_price.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'hidden, title, price, offers',
index ed2e328..e4612df 100644 (file)
@@ -22,7 +22,6 @@ $TCA['tx_irretutorial_mnsym_hotel'] = array(
                'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'Resources/Public/Icons/icon_tx_irretutorial_hotel.gif',
                'versioningWS' => 2,
                'origUid' => 't3_origuid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, title, branches',
@@ -52,7 +51,6 @@ $TCA['tx_irretutorial_mnsym_hotel_rel'] = array(
                'origUid' => 't3_origuid',
                // @see http://forge.typo3.org/issues/29278 which solves it implicitly in the Core
                // 'shadowColumnsForNewPlaceholders' => 'hotelid',
-               'dividers2tabs' => TRUE,
        ),
        'feInterface' => array(
                'fe_admin_fieldList' => 'sys_language_uid, l18n_parent, l18n_diffsource, hidden, hotelid, branchid',
index 4ce8bac..eb8cf45 100644 (file)
@@ -15,7 +15,6 @@ return array(
                        'default' => 'status-user-group-frontend'
                ),
                'useColumnsForDefaultValues' => 'lockToDomain',
-               'dividers2tabs' => 1,
                'searchFields' => 'title,description'
        ),
        'interface' => array(
index 61ac8be..16ceebd 100644 (file)
@@ -18,7 +18,6 @@ return array(
                        'default' => 'status-user-frontend'
                ),
                'useColumnsForDefaultValues' => 'usergroup,lockToDomain,disable,starttime,endtime',
-               'dividers2tabs' => 1,
                'searchFields' => 'username,name,first_name,last_name,middle_name,address,telephone,fax,email,title,zip,city,country,company'
        ),
        'interface' => array(
index 1d0a7b3..546b1da 100644 (file)
@@ -25,7 +25,6 @@ return array(
                'typeicon_classes' => array(
                        'default' => 'mimetypes-x-content-page-language-overlay'
                ),
-               'dividers2tabs' => TRUE,
                'searchFields' => 'title,subtitle,nav_title,keywords,description,abstract,author,author_email,url'
        ),
        'interface' => array(
index 97cda69..2611c73 100644 (file)
@@ -27,7 +27,6 @@ return array(
                'typeicons' => array(
                        '0' => 'template_add.gif'
                ),
-               'dividers2tabs' => 1,
                'searchFields' => 'title,constants,config'
        ),
        'interface' => array(
index c57751d..0281b80 100644 (file)
@@ -70,7 +70,6 @@ return array(
                ),
                'thumbnail' => 'image',
                'requestUpdate' => 'list_type,rte_enabled,menu_type',
-               'dividers2tabs' => 1,
                'searchFields' => 'header,header_link,subheader,bodytext,pi_flexform'
        ),
        'interface' => array(
index 7a52f30..3c5732e 100644 (file)
@@ -8,7 +8,6 @@ return array(
                'tstamp' => 'tstamp',
                'crdate' => 'crdate',
                'cruser_id' => 'cruser_id',
-               'dividers2tabs' => TRUE,
                'sortby' => 'sorting',
 
                'versioningWS' => 2,
index 39b210b..45409c9 100644 (file)
@@ -77,11 +77,6 @@ class SetupModuleController {
        protected $isAdmin;
 
        /**
-        * @var int
-        */
-       protected $dividers2tabs;
-
-       /**
         * @var array
         */
        protected $tsFieldConf;
@@ -383,7 +378,7 @@ class SetupModuleController {
 
                // Render the menu items
                $menuItems = $this->renderUserSetup();
-               $this->content .= $this->doc->getDynTabMenu($menuItems, 'user-setup', FALSE, FALSE, 1, FALSE, 1, $this->dividers2tabs);
+               $this->content .= $this->doc->getDynTabMenu($menuItems, 'user-setup', FALSE, FALSE, 1, FALSE, 1, 1);
                $formToken = $this->formProtection->generateToken('BE user setup', 'edit');
                $this->content .= $this->doc->section('', '<input type="hidden" name="simUser" value="' . $this->simUser . '" />
                        <input type="hidden" name="formToken" value="' . $formToken . '" />
@@ -448,7 +443,6 @@ class SetupModuleController {
                $code = array();
                $i = 0;
                $fieldArray = $this->getFieldsFromShowItem();
-               $this->dividers2tabs = isset($GLOBALS['TYPO3_USER_SETTINGS']['ctrl']['dividers2tabs']) ? (int)$GLOBALS['TYPO3_USER_SETTINGS']['ctrl']['dividers2tabs'] : 0;
                $tabLabel = '';
                foreach ($fieldArray as $fieldName) {
                        $more = '';
@@ -458,15 +452,13 @@ class SetupModuleController {
                                        $tabLabel = $this->getLabel(substr($fieldName, 8), '', FALSE);
                                        $firstTabLabel = $tabLabel;
                                } else {
-                                       if ($this->dividers2tabs) {
-                                               $result[] = array(
-                                                       'label' => $tabLabel,
-                                                       'content' => count($code) ? implode(LF, $code) : ''
-                                               );
-                                               $tabLabel = $this->getLabel(substr($fieldName, 8), '', FALSE);
-                                               $i = 0;
-                                               $code = array();
-                                       }
+                                       $result[] = array(
+                                               'label' => $tabLabel,
+                                               'content' => count($code) ? implode(LF, $code) : ''
+                                       );
+                                       $tabLabel = $this->getLabel(substr($fieldName, 8), '', FALSE);
+                                       $i = 0;
+                                       $code = array();
                                }
                                continue;
                        }
@@ -574,10 +566,6 @@ class SetupModuleController {
                                '</div>';
                }
 
-               if ($this->dividers2tabs == 0) {
-                       $tabLabel = $firstTabLabel;
-               }
-
                $result[] = array(
                        'label' => $tabLabel,
                        'content' => count($code) ? implode(LF, $code) : ''
index a2bbf0c..0a69357 100644 (file)
@@ -14,9 +14,6 @@ if (TYPO3_MODE === 'BE') {
        );
 
        $GLOBALS['TYPO3_USER_SETTINGS'] = array(
-               'ctrl' => array(
-                       'dividers2tabs' => 1
-               ),
                'columns' => array(
                        'realName' => array(
                                'type' => 'text',
index ae0b966..63fb7a7 100644 (file)
@@ -11,8 +11,7 @@ return array(
                'typeicon_classes' => array(
                        'default' => 'mimetypes-x-sys_workspace'
                ),
-               'versioningWS_alwaysAllowLiveEdit' => TRUE,
-               'dividers2tabs' => TRUE
+               'versioningWS_alwaysAllowLiveEdit' => TRUE
        ),
        'columns' => array(
                'title' => array(
index 3b44518..00603cc 100644 (file)
@@ -13,8 +13,7 @@ return array(
                'typeicon_classes' => array(
                        'default' => 'mimetypes-x-sys_workspace'
                ),
-               'versioningWS_alwaysAllowLiveEdit' => TRUE,
-               'dividers2tabs' => TRUE
+               'versioningWS_alwaysAllowLiveEdit' => TRUE
        ),
        'columns' => array(
                'title' => array(