* Fixed bug #7602: htmlArea RTE: Make the use of extended inline elements configurable

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3237 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 12e1113..3a63f78 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-20  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug #7602: htmlArea RTE: Make the use of extended inline elements configurable
 
 2008-02-19  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 47241d7..9aaed06 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-20  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
+
+       * Fixed bug #7602: htmlArea RTE: Make the use of extended inline elements configurable
+
 2008-02-19  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
        * Fixed bug #7583: htmlArea RTE should allow to markup text in absence of any block element

diff --git a/typo3/sysext/rtehtmlarea/doc/manual.sxw b/typo3/sysext/rtehtmlarea/doc/manual.sxw
index 4d877bc..e2dc52b 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ

diff --git a/typo3/sysext/rtehtmlarea/ext_conf_template.txt b/typo3/sysext/rtehtmlarea/ext_conf_template.txt
index d3716dc..c4eeebb 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ext_conf_template.txt
+++ b/typo3/sysext/rtehtmlarea/ext_conf_template.txt
@@ -22,6 +22,9 @@ defaultConfiguration = Typical (Most commonly used features are enabled. Select
   # cat=basic/enable/110; type=boolean; label=Enable images in the RTE: If set, the use of images will be enabled in the default configuration of the RTE.
 enableImages = 0
 
+  # cat=basic/enable/115; type=boolean; label=Enable additional inline elements: If set, the potential use of additional inline elements will be enabled in the default configuration of the RTE.
+enableInlineElements = 0
+
   # cat=basic/enable/140; type=boolean; label=Enable links accessibility icons: If set, accessibility icons will be added in front of links.
 enableAccessibilityIcons = 0
 

diff --git a/typo3/sysext/rtehtmlarea/ext_localconf.php b/typo3/sysext/rtehtmlarea/ext_localconf.php
index aa0d73b..4739eaf 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ext_localconf.php
+++ b/typo3/sysext/rtehtmlarea/ext_localconf.php
@@ -70,8 +70,6 @@ $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UserElements'] = array();
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UserElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/UserElements/class.tx_rtehtmlarea_userelements.php:&tx_rtehtmlarea_userelements';
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UserElements']['addIconsToSkin'] = 0;
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UserElements']['disableInFE'] = 1;
-$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InlineElements'] = array();
-$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InlineElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php:&tx_rtehtmlarea_inlineelements';
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TextStyle'] = array();
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TextStyle']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TextStyle/class.tx_rtehtmlarea_textstyle.php:&tx_rtehtmlarea_textstyle';
 $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultImage'] = array();
@@ -176,6 +174,13 @@ if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages']) {
        t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/res/image/pageTSConfig.txt">');
 }
 
+       // Configure extended Inline Elements
+if ($_EXTCONF['enableInlineElements']) {
+       $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InlineElements'] = array();
+       $TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InlineElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php:&tx_rtehtmlarea_inlineelements';
+       t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/extensions/InlineElements/res/proc/pageTSConfig.txt">');
+}
+
        // Add default Page TSonfig RTE configuration for enabling links accessibility icons
 if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableAccessibilityIcons']) {
        t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/res/accessibilityicons/pageTSConfig.txt">');

diff --git a/typo3/sysext/rtehtmlarea/extensions/InlineElements/res/pageTSConfig.txt b/typo3/sysext/rtehtmlarea/extensions/InlineElements/res/pageTSConfig.txt
new file mode 100644 (file)
index 0000000..466cf63
--- /dev/null
+++ b/typo3/sysext/rtehtmlarea/extensions/InlineElements/res/pageTSConfig.txt
@@ -0,0 +1,15 @@
+# ***************************************************************************************
+# Additonal proc options in Page TSconfig for Inline Elements extension
+#
+# @author      Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+#
+# TYPO3 SVN ID: $Id: pageTSConfig.txt $
+# ***************************************************************************************
+
+       ## Default RTE processing rules
+RTE.default.proc {
+       
+               ## DO NOT REMAP BOLD AND ITALIC TO STRONG AND EMPHASIS AND VICE VERSA
+       transformBoldAndItalicTags = 0
+       
+}

diff --git a/typo3/sysext/rtehtmlarea/res/proc/pageTSConfig.txt b/typo3/sysext/rtehtmlarea/res/proc/pageTSConfig.txt
index 1245c07..e9c2775 100644 (file)
--- a/typo3/sysext/rtehtmlarea/res/proc/pageTSConfig.txt
+++ b/typo3/sysext/rtehtmlarea/res/proc/pageTSConfig.txt
@@ -55,8 +55,8 @@ RTE.default.proc {
                ## This is a list of additional attributes to keep
        keepPDIVattribs = id, title, dir, lang, xml:lang
        
-               ## DO NOT REMAP BOLD AND ITALIC TO STRONG AND EMPHASIS AND VICE VERSA
-       transformBoldAndItalicTags = 0
+               ## REMAP BOLD AND ITALIC TO STRONG AND EMPHASIS AND VICE VERSA
+       transformBoldAndItalicTags = 1
        
                ## ALLOW TO WRITE ABOUT HTML
        dontUndoHSC_db = 1