[TASK] Clean up RTE docs and TSconfig 56/49756/2
authorBenni Mack <benni@typo3.org>
Fri, 2 Sep 2016 13:00:34 +0000 (15:00 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Sat, 3 Sep 2016 08:34:52 +0000 (10:34 +0200)
There are several options that are included
in the RTE configuratoin which are not
related to RTE, or which are set by default.

Also, the documentation is updated to reflect
the options available in the RTE.

Resolves: #77784
Releases: master
Change-Id: Iabfbcad51afe822bbe18779d9239cbbdb8d49d6b
Reviewed-on: https://review.typo3.org/49756
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Advanced/userTSConfig.txt [deleted file]
typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo.txt [new file with mode: 0644]
typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo/userTSConfig.txt [deleted file]
typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Typical/userTSConfig.txt [deleted file]
typo3/sysext/rtehtmlarea/Documentation/Configuration/UserTsconfig/Index.rst
typo3/sysext/rtehtmlarea/Documentation/DefaultConfigurations/Default/Index.rst
typo3/sysext/rtehtmlarea/Documentation/DefaultConfigurations/Demo/Index.rst
typo3/sysext/rtehtmlarea/Documentation/DefaultConfigurations/Minimal/Index.rst
typo3/sysext/rtehtmlarea/Documentation/DefaultConfigurations/Typical/Index.rst
typo3/sysext/rtehtmlarea/ext_localconf.php

diff --git a/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Advanced/userTSConfig.txt b/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Advanced/userTSConfig.txt
deleted file mode 100644 (file)
index ece994f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# ***************************************************************************************
-# "Advanced" User TSconfig for htmlArea RTE
-#
-# Sets default User TSConfig with minimal features for advanced admin users.
-# ***************************************************************************************
-
-       ## Enable the RTE by default for all users
-setup.default.edit_RTE = 1
diff --git a/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo.txt b/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo.txt
new file mode 100644 (file)
index 0000000..3bedf07
--- /dev/null
@@ -0,0 +1,11 @@
+# ***************************************************************************************
+# "Demo" User TSconfig for htmlArea RTE
+#
+# Sets default User TSConfig with maximal features for users who want to explore the features of the RTE.
+# ***************************************************************************************
+
+       ## Set the default spelling ability of the check speller for all users
+options.HTMLAreaPspellMode = bad-spellers
+
+       ## Enable the personal dictionary feature of the check speller by default for all users
+options.enablePersonalDicts = 1
diff --git a/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo/userTSConfig.txt b/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Demo/userTSConfig.txt
deleted file mode 100644 (file)
index 36568ac..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# ***************************************************************************************
-# "Demo" User TSconfig for htmlArea RTE
-#
-# Sets default User TSConfig with maximal features for users who want to explore the features of the RTE.
-# ***************************************************************************************
-
-       ## Enable the RTE by default for all users
-setup.default.edit_RTE = 1
-
-       ## Enable the file upload feature of the element browser by default for all users
-options.uploadFieldsInTopOfEB = 1
-
-       ## Set the default spelling ability of the check speller for all users
-options.HTMLAreaPspellMode = bad-spellers
-
-       ## Enable the personal dictionary feature of the check speller by default for all users
-options.enablePersonalDicts = 1
diff --git a/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Typical/userTSConfig.txt b/typo3/sysext/rtehtmlarea/Configuration/UserTSconfig/Typical/userTSConfig.txt
deleted file mode 100644 (file)
index b40b058..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-# ***************************************************************************************
-# "Typical" User TSconfig for htmlArea RTE
-#
-# Sets User TSConfig with most commonly used features representing a good start for typical sites.
-# ***************************************************************************************
-## Default User TSConfig for the Usual default RTE configuration
-
-       ## Enable the RTE by default for all users
-setup.default.edit_RTE = 1
index 4e4ab17..49b3f4c 100644 (file)
@@ -23,43 +23,6 @@ group, with the TYPO3 User Admin Tool. Properties of User TSconfig are
 documented in the :ref:`TSconfig reference <t3tsconfig:usertsconfig>`.
 
 
-.. _setup-default-edit-rte:
-
-setup.default.edit\_RTE
-^^^^^^^^^^^^^^^^^^^^^^^
-
-.. container:: table-row
-
-   Property
-         setup.default.edit\_RTE
-
-   Data type
-         boolean
-
-   Description
-         Specifies that RTE editing should be enabled or disabled by default.
-
-
-
-.. _setup-override-edit-rte:
-
-setup.override.edit\_RTE
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. container:: table-row
-
-   Property
-         setup.override.edit\_RTE
-
-   Data type
-         boolean
-
-   Description
-         Specifies that RTE editing should be enabled or disabled, the user not
-         being allowed to change the setting.
-
-
-
 .. _setup-default-rtewidth:
 
 setup.default.rteWidth
@@ -338,57 +301,6 @@ options.enablePersonalDicts
          Note: The feature must also be enabled in Page TSconfig.
 
 
-
-.. _options-uploadfieldsintopofeb:
-
-options.uploadFieldsInTopOfEB
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. container:: table-row
-
-   Property
-         options.uploadFieldsInTopOfEB
-
-   Data type
-         boolean
-
-   Description
-         Inserts a file uploader on the 'file' tab of the Insert/Modify link
-         dialogue as well as on the magic, plain and dragdrop tabs of the
-         Insert/modify image dialogue.
-
-         Note: This applies only when buttons.link.TYPO3Browser.disabled and/or
-         buttons.image.TYPO3Browser.disabled is not set.
-
-         Default: 0
-
-
-
-.. _options-createfoldersineb:
-
-options.createFoldersInEB
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. container:: table-row
-
-   Property
-         options.createFoldersInEB
-
-   Data type
-         boolean
-
-   Description
-         If set, a create folders option appears in the TYPO3 file browser.
-
-         Note: This applies only when buttons.link.TYPO3Browser.disabled and/or
-         buttons.image.TYPO3Browser.disabled is not set.
-
-         Note: For admin-users this is always enabled.
-
-         Default: 0
-
-
-
 .. _options-nothumbsinrteimageselect:
 
 options.noThumbsInRTEimageSelect
index ee819c1..37a7865 100644 (file)
@@ -60,12 +60,6 @@ br tags in the content are assumed to be intentional.
 
    dontConvBRtoParagraph = 1
 
-PRESERVE DIV SECTIONS - DO NOT REMAP TO P
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-::
-
-   preserveDIVSections = 1
 
 TAGS ALLOWED OUTSIDE P & DIV
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
index 41a8bf7..12755d2 100644 (file)
@@ -302,18 +302,6 @@ Let use all the space available for more comfort.
 The following is inserted in User TSconfig:
 """""""""""""""""""""""""""""""""""""""""""
 
-Enable the RTE by default for all users
-
-::
-
-   setup.default.edit_RTE = 1
-
-Enable the file upload feature of the element browser by default for all users
-
-::
-
-   options.uploadFieldsInTopOfEB = 1
-
 Set the default spelling ability of the check speller for all users
 
 ::
index 36e5541..af517ff 100644 (file)
@@ -42,13 +42,3 @@ front end RTE configuration for the general public
    RTE.default.FE < RTE.default
 
 
-.. _minimal-user-tsconfig:
-
-The following is inserted in User TSconfig:
-"""""""""""""""""""""""""""""""""""""""""""
-
-Enable the RTE by default for all users
-
-::
-
-   setup.default.edit_RTE = 1
index 7f876c3..8e9c1ea 100644 (file)
@@ -255,13 +255,3 @@ Let use all the space available for more comfort.
    TCEFORM.tt_content.bodytext.RTEfullScreenWidth = 100%
 
 
-.. _typical-user-tsconfig:
-
-The following is inserted in User TSconfig:
-"""""""""""""""""""""""""""""""""""""""""""
-
-Enable the RTE by default for all users
-
-::
-
-   setup.default.edit_RTE = 1
index b0b1503..ebc74d5 100644 (file)
@@ -19,13 +19,13 @@ if (strpos($_EXTCONF['defaultConfiguration'], 'Minimal') !== false) {
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] = 'Advanced';
 } elseif (strpos($_EXTCONF['defaultConfiguration'], 'Demo') !== false) {
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] = 'Demo';
+    // Add default User TS Config RTE configuration
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:rtehtmlarea/Configuration/UserTSconfig/Demo.txt">');
 } else {
     $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] = 'Typical';
 }
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:rtehtmlarea/Configuration/PageTSconfig/' . $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] . '/pageTSConfig.txt">');
-// Add default User TS Config RTE configuration
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:rtehtmlarea/Configuration/UserTSconfig/' . $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['defaultConfiguration'] . '/userTSConfig.txt">');
 
 // Registering soft reference parser for image tags in RTE content
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['softRefParser']['rtehtmlarea_images'] = \TYPO3\CMS\Rtehtmlarea\Hook\SoftReferenceHook::class;