[!!!][TASK] Remove non-tabbed view of Content Element Wizard 22/42722/5
authorBenjamin Mack <benni@typo3.org>
Tue, 18 Aug 2015 17:11:29 +0000 (19:11 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Tue, 18 Aug 2015 19:13:35 +0000 (21:13 +0200)
Resolves: #69168
Releases: master
Change-Id: I88a73fde52af453181fb0b1bc33ea325e5424765
Reviewed-on: http://review.typo3.org/42722
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-69168-Non-tabbedViewOfContentElementWizardRemoved.rst [new file with mode: 0644]
typo3/sysext/css_styled_content/Configuration/PageTS/modWizards.ts

index 011dd95..97c8e83 100644 (file)
@@ -106,11 +106,6 @@ class NewContentElementController implements \TYPO3\CMS\Core\Http\ControllerInte
        protected $elementWrapper;
 
        /**
-        * @var array
-        */
-       protected $elementWrapperForTabs;
-
-       /**
         * @var string
         */
        protected $onClickEvent;
@@ -208,11 +203,9 @@ class NewContentElementController implements \TYPO3\CMS\Core\Http\ControllerInte
                        // ***************************
                        $this->content .= $this->doc->header($lang->getLL('newContentElement'));
                        // Wizard
-                       $wizardItems = $this->getWizardItems();
+                       $wizardItems = $this->wizardArray();
                        // Wrapper for wizards
                        $this->elementWrapper['section'] = array('', '');
-                       // Copy wrapper for tabs
-                       $this->elementWrapperForTabs = $this->elementWrapper;
                        // Hook for manipulating wizardItems, wrapper, onClickEvent etc.
                        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'])) {
                                foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'] as $classData) {
@@ -223,10 +216,6 @@ class NewContentElementController implements \TYPO3\CMS\Core\Http\ControllerInte
                                        $hookObject->manipulateWizardItems($wizardItems, $this);
                                }
                        }
-                       if ($this->config['renderMode'] == 'tabs' && $this->elementWrapperForTabs != $this->elementWrapper) {
-                               // Restore wrapper for tabs if they are overwritten in hook
-                               $this->elementWrapper = $this->elementWrapperForTabs;
-                       }
                        // Add document inline javascript
                        $this->doc->JScode = $this->doc->wrapScriptTags('
                                function goToalt_doc() {        //
@@ -291,15 +280,9 @@ class NewContentElementController implements \TYPO3\CMS\Core\Http\ControllerInte
                        foreach ($menuItems as $key => $val) {
                                $menuItems[$key]['content'] .= $this->elementWrapper['section'][1];
                        }
-                       // Add the wizard table to the content, wrapped in tabs:
-                       if ($this->config['renderMode'] == 'tabs') {
-                               $code = '<p>' . $lang->getLL('sel1', 1) . '</p>' . $this->doc->getDynamicTabMenu($menuItems, 'new-content-element-wizard');
-                       } else {
-                               $code = '<p>' . $lang->getLL('sel1', 1) . '</p>';
-                               foreach ($menuItems as $section) {
-                                       $code .= '<h3 class="divider">' . $section['label'] . '</h3>' . $section['content'];
-                               }
-                       }
+                       // Add the wizard table to the content, wrapped in tabs
+                       $code = '<p>' . $lang->getLL('sel1', 1) . '</p>' . $this->doc->getDynamicTabMenu($menuItems, 'new-content-element-wizard');
+
                        $this->content .= $this->doc->section(!$this->onClickEvent ? $lang->getLL('1_selectType') : '', $code, 0, 1);
                        // If the user must also select a column:
                        if (!$this->onClickEvent) {
@@ -374,8 +357,10 @@ class NewContentElementController implements \TYPO3\CMS\Core\Http\ControllerInte
         * Returns the content of wizardArray() function...
         *
         * @return array Returns the content of wizardArray() function...
+        * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8, use "wizardArray()" directly
         */
        public function getWizardItems() {
+               GeneralUtility::logDeprecatedFunction();
                return $this->wizardArray();
        }
 
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-69168-Non-tabbedViewOfContentElementWizardRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-69168-Non-tabbedViewOfContentElementWizardRemoved.rst
new file mode 100644 (file)
index 0000000..4c56e82
--- /dev/null
@@ -0,0 +1,17 @@
+====================================================================
+Breaking: #69168 - Non-tabbed view of Content Element Wizard removed
+====================================================================
+
+Description
+===========
+
+The "New Content Element Wizard" view to show possible content elements to create now has only the view
+to show the elements in a tabbed view. The non-tabbed view variant has been removed without substitution.
+
+The TSconfig option ``mod.wizards.newContentElement.renderMode`` has been removed.
+
+
+Migration
+=========
+
+Remove the TSconfig option ``mod.wizards.newContentElement.renderMode`` from any configuration settings.
\ No newline at end of file
index caf7227..895a409 100644 (file)
@@ -1,5 +1,4 @@
 mod.wizards.newContentElement {
-       renderMode = tabs
        wizardItems {
                common.header = LLL:EXT:backend/Resources/Private/Language/locallang_db_new_content_el.xlf:common
                common.elements {