[CLEANUP] Remove option "edit_wideDocument" 69/28769/4
authorBenjamin Mack <benni@typo3.org>
Tue, 25 Mar 2014 14:54:47 +0000 (15:54 +0100)
committerGeorg Ringer <georg.ringer@gmail.com>
Wed, 2 Apr 2014 09:18:59 +0000 (11:18 +0200)
The historical option "wide document" can
be safely removed, as the wide screen options
from 10 years ago are default by now.

Resolves: #57295
Releases: 6.2
Change-Id: I0e5c81046733f4ddd10cc7d084f0ef7b952c3cb0
Reviewed-on: https://review.typo3.org/28769
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
Reviewed-by: Simon Schaufelberger
Tested-by: Simon Schaufelberger
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/backend/Classes/Form/FormEngine.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/feedit/Classes/FrontendEditPanel.php
typo3/sysext/setup/ext_tables.php
typo3/sysext/t3editor/res/jslib/parse_typoscript/tokenizetyposcript.js

index b45e0fd..3072d06 100644 (file)
@@ -343,12 +343,6 @@ class FormEngine {
         */
        public $edit_docModuleUpload = FALSE;
 
-       // If set, the forms will be rendered a little wider, more precisely with a factor of $this->form_largeComp.
-       /**
-        * @todo Define visibility
-        */
-       public $docLarge = 0;
-
        // Loaded with info about the browser when class is instantiated.
        /**
         * @todo Define visibility
@@ -656,7 +650,6 @@ class FormEngine {
                $this->prependFormFieldNames = 'data';
                $this->formName = 'editform';
                $this->setNewBEDesign();
-               $this->docLarge = $GLOBALS['BE_USER']->uc['edit_wideDocument'] ? 1 : 0;
                $this->edit_showFieldHelp = $GLOBALS['BE_USER']->uc['edit_showFieldHelp'];
                $this->edit_docModuleUpload = (bool)$GLOBALS['BE_USER']->uc['edit_docModuleUpload'];
                $this->inline->init($this);
@@ -2708,9 +2701,8 @@ TBE_EDITOR.customEvalFunctions[\'' . $evalData . '\'] = function(value) {
                                        }
                                }
                        }
-                       if ($this->docLarge) {
-                               $cols = round($cols * $this->form_largeComp);
-                       }
+
+                       $cols = round($cols * $this->form_largeComp);
                        $width = ceil($cols * $this->form_rowsToStylewidth);
                        // Hardcoded: 12 is the height of the font
                        $height = $rows * 12;
@@ -2721,9 +2713,7 @@ TBE_EDITOR.customEvalFunctions[\'' . $evalData . '\'] = function(value) {
                                $itemValue = htmlspecialchars($itemValue);
                        }
                        $cols = $config['cols'] ? $config['cols'] : ($config['size'] ? $config['size'] : $this->maxInputWidth);
-                       if ($this->docLarge) {
-                               $cols = round($cols * $this->form_largeComp);
-                       }
+                       $cols = round($cols * $this->form_largeComp);
                        $width = ceil($cols * $this->form_rowsToStylewidth);
                        // Overflow:auto crashes mozilla here. Title tag is useful when text is longer than the div box (overflow:hidden).
                        $item = '
@@ -4618,9 +4608,7 @@ TBE_EDITOR.customEvalFunctions[\'' . $evalData . '\'] = function(value) {
         */
        protected function formWidthAsArray($size = 48, $textarea = FALSE) {
                $fieldWidthAndStyle = array('style' => '', 'class' => '', 'width' => '');
-               if ($this->docLarge) {
-                       $size = round($size * $this->form_largeComp);
-               }
+               $size = round($size * $this->form_largeComp);
 
                // Setting width by style-attribute. 'cols' MUST be avoided with NN6+
                $widthInPixels = ceil($size * $this->form_rowsToStylewidth);
index 9bff0ca..38286c8 100644 (file)
@@ -312,7 +312,6 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                'hideSubmoduleIcons' => 0,
                'helpText' => 1,
                'titleLen' => 50,
-               'edit_wideDocument' => '0',
                'edit_showFieldHelp' => 'icon',
                'edit_RTE' => '1',
                'edit_docModuleUpload' => '1',
index 9ded0ff..b271509 100644 (file)
@@ -253,7 +253,7 @@ class FrontendEditPanel {
         * @see    editPanelLinkWrap()
         */
        protected function editPanelLinkWrap_doWrap($string, $url) {
-               $onclick = 'vHWin=window.open(\'' . $url . '&returnUrl=close.html\',\'FEquickEditWindow\',\'' . ($GLOBALS['BE_USER']->uc['edit_wideDocument'] ? 'width=690,height=500' : 'width=540,height=400') . ',status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
+               $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
                return '<a href="#" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
        }
 
index 4d4c841..5373360 100644 (file)
@@ -67,11 +67,6 @@ if (TYPO3_MODE === 'BE') {
                                'label' => 'LLL:EXT:setup/mod/locallang.xlf:showThumbs',
                                'csh' => 'showThumbs'
                        ),
-                       'edit_wideDocument' => array(
-                               'type' => 'check',
-                               'label' => 'LLL:EXT:setup/mod/locallang.xlf:edit_wideDocument',
-                               'csh' => 'edit_wideDocument'
-                       ),
                        'titleLen' => array(
                                'type' => 'text',
                                'label' => 'LLL:EXT:setup/mod/locallang.xlf:maxTitleLen',
@@ -152,7 +147,7 @@ if (TYPO3_MODE === 'BE') {
                ),
                'showitem' => '--div--;LLL:EXT:setup/mod/locallang.xlf:personal_data,realName,email,emailMeAtLogin,password,password2,lang,
                                --div--;LLL:EXT:setup/mod/locallang.xlf:opening,startModule,thumbnailsByDefault,titleLen,
-                               --div--;LLL:EXT:setup/mod/locallang.xlf:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,showHiddenFilesAndFolders,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
+                               --div--;LLL:EXT:setup/mod/locallang.xlf:editFunctionsTab,edit_RTE,edit_docModuleUpload,showHiddenFilesAndFolders,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
                                --div--;LLL:EXT:setup/mod/locallang.xlf:adminFunctions,simulate,debugInWindow'
        );
 }
\ No newline at end of file
index 2cec88a..96c64cc 100644 (file)
@@ -336,7 +336,6 @@ var typoscriptWords = {
        'edit_docModuleUplaod': 'reserved',
        'edit_docModuleUpload': 'reserved',
        'edit_RTE': 'reserved',
-       'edit_wideDocument': 'reserved',
        'editFieldsAtATime': 'reserved',
        'editFormsOnPage': 'reserved',
        'editIcons': 'reserved',
@@ -1662,7 +1661,6 @@ var typoscriptWords = {
        'edit_docModuleUplaod': 'reserved',
        'edit_docModuleUpload': 'reserved',
        'edit_RTE': 'reserved',
-       'edit_wideDocument': 'reserved',
        'editFieldsAtATime': 'reserved',
        'editFormsOnPage': 'reserved',
        'editIcons': 'reserved',