[TASK] Clean up unused t3skin variables in ext_tables.php 14/40314/2
authorBenjamin Mack <benni@typo3.org>
Tue, 16 Jun 2015 16:10:47 +0000 (18:10 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 16 Jun 2015 16:26:20 +0000 (18:26 +0200)
There are several options and references within
EXT:t3skin/ext_tables.php which are not in use anymore
and can simple be removed.

Resolves: #67518
Releases: master
Change-Id: I6aafadc558a3ee8108964928464038ccf4b828c5
Reviewed-on: http://review.typo3.org/40314
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/core/ext_tables.php
typo3/sysext/t3editor/res/jslib/parse_typoscript/tokenizetyposcript.js
typo3/sysext/t3skin/ext_tables.php
typo3/sysext/workspaces/Classes/Controller/PreviewController.php

index 9e3af2e..c2c2843 100644 (file)
@@ -600,7 +600,6 @@ class BackendController {
                this.PATH_typo3_enc = TYPO3.configuration.PATH_typo3_enc;
                this.username = TYPO3.configuration.username;
                this.uniqueID = TYPO3.configuration.uniqueID;
-               this.navFrameWidth = 0;
                this.securityLevel = TYPO3.configuration.securityLevel;
                this.veriCode = TYPO3.configuration.veriCode;
                this.denyFileTypes = TYPO3.configuration.denyFileTypes;
index 461e0cb..523baca 100644 (file)
@@ -301,7 +301,6 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                'titleLen' => 50,
                'edit_RTE' => '1',
                'edit_docModuleUpload' => '1',
-               'navFrameWidth' => '',
                // Default is 245 pixels
                'navFrameResizable' => 0,
                'resizeTextareas' => 1,
index f9a1b3f..cecc04f 100644 (file)
@@ -143,7 +143,8 @@ $GLOBALS['TBE_STYLES'] = array(
        ),
        'borderschemes' => array(
                '0' => array('border:solid 1px black;', 5)
-       )
+       ),
+       'skinImg' => array()
 );
 
 
index efc6cfb..cc5443b 100644 (file)
@@ -597,7 +597,6 @@ var typoscriptWords = {
        'MP_mapRootPoints': 'reserved',
        'name': 'reserved',
        'navFrameResizable': 'reserved',
-       'navFrameWidth': 'reserved',
        'nesting': 'reserved',
        'netprintApplicationLink': 'reserved',
        'neverHideAtCopy': 'reserved',
@@ -1917,7 +1916,6 @@ var typoscriptWords = {
        'MP_mapRootPoints': 'reserved',
        'name': 'reserved',
        'navFrameResizable': 'reserved',
-       'navFrameWidth': 'reserved',
        'nesting': 'reserved',
        'netprintApplicationLink': 'reserved',
        'neverHideAtCopy': 'reserved',
index 494f6a6..394126d 100644 (file)
@@ -5,12 +5,14 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
 
        // Register as a skin
        $GLOBALS['TBE_STYLES']['skins']['t3skin'] = array(
-               'name' => 't3skin'
+               'name' => 't3skin',
+               'stylesheetDirectories' => array(
+                       'sprites' => 'EXT:t3skin/stylesheets/sprites/'
+               )
        );
 
-       // Support for other extensions to add own icons...
-       $presetSkinImgs = is_array($GLOBALS['TBE_STYLES']['skinImg']) ? $GLOBALS['TBE_STYLES']['skinImg'] : array();
-       $GLOBALS['TBE_STYLES']['skins']['t3skin']['stylesheetDirectories']['sprites'] = 'EXT:t3skin/stylesheets/sprites/';
+       // Manual setting up of alternative icons.
+       $GLOBALS['TBE_STYLES']['skinImg']['gfx/ol/blank.gif'] = array('clear.gif', 'width="18" height="16"');
 
        // Alternative dimensions for frameset sizes:
        // Left menu frame width
@@ -19,9 +21,6 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
        // Top frame height
        $GLOBALS['TBE_STYLES']['dims']['topFrameH'] = 45;
 
-       // Default navigation frame width
-       $GLOBALS['TBE_STYLES']['dims']['navFrameWidth'] = 280;
-
        // Setting up auto detection of alternative icons:
        $GLOBALS['TBE_STYLES']['skinImgAutoCfg'] = array(
                'absDir' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('t3skin') . 'icons/',
@@ -37,30 +36,7 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
 
        $GLOBALS['TCA']['pages']['columns']['module']['config']['items'][1][2] = 'EXT:t3skin/images/icons/status/user-frontend.png';
 
-
-       // Setting the relative path to the extension in temp. variable:
-       $relativePathToExtension = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin');
-
-       // Manual setting up of alternative icons. This is mainly for module icons which has a special prefix:
-       $GLOBALS['TBE_STYLES']['skinImg'] = array_merge($presetSkinImgs, array(
-               'gfx/ol/blank.gif' => array('clear.gif', 'width="18" height="16"'),
-               'MOD:web/website.gif' => array($relativePathToExtension . 'icons/module_web.gif', 'width="24" height="24"'),
-               'MOD:web_ts/ts1.gif' => array($relativePathToExtension . 'icons/module_web_ts.gif', 'width="24" height="24"'),
-               'MOD:web_modules/modules.gif' => array($relativePathToExtension . 'icons/module_web_modules.gif', 'width="24" height="24"'),
-               'MOD:web_txversionM1/cm_icon.gif' => array($relativePathToExtension . 'icons/module_web_version.gif', 'width="24" height="24"'),
-               'MOD:file/file.gif' => array($relativePathToExtension . 'icons/module_file.gif', 'width="22" height="24"'),
-               'MOD:file_images/images.gif' => array($relativePathToExtension . 'icons/module_file_images.gif', 'width="22" height="22"'),
-               'MOD:user/user.gif' => array($relativePathToExtension . 'icons/module_user.gif', 'width="22" height="22"'),
-               'MOD:user_doc/document.gif' => array($relativePathToExtension . 'icons/module_doc.gif', 'width="22" height="22"'),
-               'MOD:tools/tool.gif' => array($relativePathToExtension . 'icons/module_tools.gif', 'width="25" height="24"'),
-               'MOD:tools_txphpmyadmin/thirdparty_db.gif' => array($relativePathToExtension . 'icons/module_tools_phpmyadmin.gif', 'width="24" height="24"'),
-               'MOD:help/help.gif' => array($relativePathToExtension . 'icons/module_help.gif', 'width="23" height="24"'),
-               'MOD:help_txtsconfighelpM1/moduleicon.gif' => array($relativePathToExtension . 'icons/module_help_ts.gif', 'width="25" height="24"')
-       ));
-
        // extJS theme
-       $GLOBALS['TBE_STYLES']['extJS']['theme'] = $relativePathToExtension . 'extjs/xtheme-t3skin.css';
+       $GLOBALS['TBE_STYLES']['extJS']['theme'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'extjs/xtheme-t3skin.css';
        $GLOBALS['TBE_STYLES']['stylesheets']['admPanel'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('t3skin') . 'stylesheets/standalone/admin_panel.css';
-
-       unset($relativePathToExtension);
 }
index 05f6a1b..c5dd753 100644 (file)
@@ -264,7 +264,6 @@ class PreviewController extends AbstractController {
                        this.PATH_typo3_enc = TYPO3.configuration.PATH_typo3_enc;
                        this.username = TYPO3.configuration.username;
                        this.uniqueID = TYPO3.configuration.uniqueID;
-                       this.navFrameWidth = 0;
                        this.securityLevel = TYPO3.configuration.securityLevel;
                        this.veriCode = TYPO3.configuration.veriCode;
                        this.denyFileTypes = TYPO3.configuration.denyFileTypes;