From 37760977fb5750802fc2b3430d0966f467524466 Mon Sep 17 00:00:00 2001 From: Stanislas Rolland Date: Wed, 8 Oct 2008 23:50:23 +0000 Subject: [PATCH] Added feature #7875: Coloured text is created using font-tag instead of span in IE Added feature #8847: Custom colors in TYPO3Color like old SelectColor extension git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4300 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 2 + typo3/sysext/rtehtmlarea/ChangeLog | 2 + typo3/sysext/rtehtmlarea/doc/manual.sxw | Bin 84751 -> 84737 bytes .../sysext/rtehtmlarea/ext_conf_template.txt | 7 +- typo3/sysext/rtehtmlarea/ext_localconf.php | 318 +++++++++--------- .../class.tx_rtehtmlarea_typo3color.php | 4 +- .../plugins/BlockElements/block-elements.js | 11 + .../plugins/DefaultColor/default-color.js | 49 ++- .../htmlarea/plugins/TYPO3Color/typo3color.js | 212 +++++++----- .../htmlarea/skins/default/htmlarea.css | 2 +- .../rtehtmlarea/res/style/pageTSConfig.txt | 52 +++ typo3/sysext/t3skin/rtehtmlarea/htmlarea.css | 2 +- 12 files changed, 405 insertions(+), 256 deletions(-) create mode 100644 typo3/sysext/rtehtmlarea/res/style/pageTSConfig.txt diff --git a/ChangeLog b/ChangeLog index 3603001ad03..2e63a3107be 100755 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * Fixed bug #9516: htmlARea RTE: Move link tags to head * Added feature #9521: htmlArea RTE: factor out some functions dealing with inline elements + * Added feature #7875: Coloured text is created using font-tag instead of span in IE + * Added feature #8847: Custom colors in TYPO3Color like old SelectColor extension 2008-10-05 Stanislas Rolland diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog index 33725780612..36ed893ec88 100644 --- a/typo3/sysext/rtehtmlarea/ChangeLog +++ b/typo3/sysext/rtehtmlarea/ChangeLog @@ -2,6 +2,8 @@ * Fixed bug #9516: htmlARea RTE: Move link tags to head * Added feature #9521: htmlArea RTE: factor out some functions dealing with inline elements + * Added feature #7875: Coloured text is created using font-tag instead of span in IE + * Added feature #8847: Custom colors in TYPO3Color like old SelectColor extension 2008-10-05 Stanislas Rolland diff --git a/typo3/sysext/rtehtmlarea/doc/manual.sxw b/typo3/sysext/rtehtmlarea/doc/manual.sxw index c38ba02b31080f09375ca202b612d33452dcc925..93be9956e45f13b2b3747f994992dc70e6e76a98 100644 GIT binary patch delta 7487 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 jK#IRcI 'EXT:'.$_EXTKEY.'/class.tx_rtehtmlarea_base.php:&tx_rtehtmlarea_base'); -// Make the extension version number available to the extension scripts + // Make the extension version number available to the extension scripts require_once(t3lib_extMgm::extPath($_EXTKEY) . 'ext_emconf.php'); $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['version'] = $EM_CONF[$_EXTKEY]['version']; -// Set compatibility warnings in the Update Wizard of the Install Tool -$TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_rtehtmlarea_indent'] = array( - 'title' => 'htmlArea RTE: Using CSS classes for indentation and alignment', - 'version' => 4002000, - 'description' => '
    -
  • Indentation is produced by a CSS class instead of the blockquote element.
    You will need to specify in Page TSConfig the class to be used for indentation using property buttons.indent.useClass (default is "indent"). You will need to define this class in your stylesheets and ensure that it is allowed by the RTE transformation (RTE.default.proc). Alternatively, you may continue using the blockquote element by setting property buttons.indent.useBlockquote. You may also want to add the new blockquote button to the RTE toolbar.
    • -
  • Text alignment is produced by CSS classes instead of deprecated align attribute.
    You will need to specify in Page TSConfig the class to be used for each text alignment button using property buttons.[left, center, right or justifyfull].useClass (defaults are "align-left", "align-center", "align-right", "align-justify"). You will need to define these classes in your stylesheets, and ensure that they are allowed by the RTE transformation (RTE.default.proc). Alternatively, you may continue using deprecated align attribute by setting property buttons.[left, center, right or justifyfull].useAlignAttribute.
    • -
' -); + // Unserializing the configuration so we can use it here +$_EXTCONF = unserialize($_EXTCONF); -// Initialize plugin registration array -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins'] = array(); - -// Registering plugin from "inner" extensions: -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultInline'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultInline']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultInline/class.tx_rtehtmlarea_defaultinline.php:&tx_rtehtmlarea_defaultinline'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultInline']['addIconsToSkin'] = 1; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['BlockElements'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['BlockElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php:&tx_rtehtmlarea_blockelements'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['BlockElements']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefinitionList'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefinitionList']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefinitionList/class.tx_rtehtmlarea_definitionlist.php:&tx_rtehtmlarea_definitionlist'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefinitionList']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['BlockStyle'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['BlockStyle']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/BlockStyle/class.tx_rtehtmlarea_blockstyle.php:&tx_rtehtmlarea_blockstyle'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CharacterMap'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CharacterMap']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/CharacterMap/class.tx_rtehtmlarea_charactermap.php:&tx_rtehtmlarea_charactermap'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CharacterMap']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Acronym'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Acronym']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/Acronym/class.tx_rtehtmlarea_acronym.php:&tx_rtehtmlarea_acronym'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Acronym']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Acronym']['disableInFE'] = 1; -$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']['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(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultImage']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultImage/class.tx_rtehtmlarea_defaultimage.php:&tx_rtehtmlarea_defaultimage'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultImage']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Image'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Image']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Image/class.tx_rtehtmlarea_typo3image.php:&tx_rtehtmlarea_typo3image'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Image']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Image']['disableInFE'] = 1; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultLink'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultLink']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultLink/class.tx_rtehtmlarea_defaultlink.php:&tx_rtehtmlarea_defaultlink'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultLink']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Link'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Link']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php:&tx_rtehtmlarea_typo3link'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Link']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Link']['disableInFE'] = 1; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultColor'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultColor']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultColor/class.tx_rtehtmlarea_defaultcolor.php:&tx_rtehtmlarea_defaultcolor'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultColor']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultColor']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Color'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Color']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php:&tx_rtehtmlarea_typo3color'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Color']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3Color']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultFont'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultFont']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultFont/class.tx_rtehtmlarea_defaultfont.php:&tx_rtehtmlarea_defaultfont'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultFont']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultFont']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertSmiley'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertSmiley']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/InsertSmiley/class.tx_rtehtmlarea_insertsmiley.php:&tx_rtehtmlarea_insertsmiley'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertSmiley']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertSmiley']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Language'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Language']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/Language/class.tx_rtehtmlarea_language.php:&tx_rtehtmlarea_language'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Language']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['Language']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['SpellChecker'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['SpellChecker']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/SpellChecker/class.tx_rtehtmlarea_spellchecker.php:&tx_rtehtmlarea_spellchecker'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['SpellChecker']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['SpellChecker']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['FindReplace'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['FindReplace']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/FindReplace/class.tx_rtehtmlarea_findreplace.php:&tx_rtehtmlarea_findreplace'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['FindReplace']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['FindReplace']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['RemoveFormat'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['RemoveFormat']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/RemoveFormat/class.tx_rtehtmlarea_removeformat.php:&tx_rtehtmlarea_removeformat'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['RemoveFormat']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['RemoveFormat']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultClean'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['DefaultClean']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php:&tx_rtehtmlarea_defaultclean'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3HtmlParser'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3HtmlParser']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php:&tx_rtehtmlarea_typo3htmlparser'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TYPO3HtmlParser']['disableInFE'] = 1; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['QuickTag'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['QuickTag']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php:&tx_rtehtmlarea_quicktag'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['QuickTag']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['QuickTag']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TableOperations'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TableOperations']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php:&tx_rtehtmlarea_tableoperations'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TableOperations']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['TableOperations']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['AboutEditor'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['AboutEditor']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/AboutEditor/class.tx_rtehtmlarea_abouteditor.php:&tx_rtehtmlarea_abouteditor'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['AboutEditor']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['AboutEditor']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['ContextMenu'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['ContextMenu']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/ContextMenu/class.tx_rtehtmlarea_contextmenu.php:&tx_rtehtmlarea_contextmenu'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['ContextMenu']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['ContextMenu']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UndoRedo'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UndoRedo']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php:&tx_rtehtmlarea_undoredo'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UndoRedo']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['UndoRedo']['disableInFE'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CopyPaste'] = array(); -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CopyPaste']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/CopyPaste/class.tx_rtehtmlarea_copypaste.php:&tx_rtehtmlarea_copypaste'; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CopyPaste']['addIconsToSkin'] = 0; -$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['CopyPaste']['disableInFE'] = 0; - -$_EXTCONF = unserialize($_EXTCONF); // unserializing the configuration so we can use it here: + // Add default RTE transformation configuration +t3lib_extMgm::addPageTSConfig(''); + // Add default Page TSonfig RTE configuration if (strstr($_EXTCONF['defaultConfiguration'],'Minimal')) { $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultConfiguration'] = 'Advanced'; } elseif (strstr($_EXTCONF['defaultConfiguration'],'Demo')) { @@ -166,22 +57,17 @@ if (strstr($_EXTCONF['defaultConfiguration'],'Minimal')) { } else { $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultConfiguration'] = 'Typical'; } -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages'] = $_EXTCONF['enableImages'] ? $_EXTCONF['enableImages'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser'] = $_EXTCONF['enableDAMBrowser'] ? $_EXTCONF['enableDAMBrowser'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableAccessibilityIcons'] = $_EXTCONF['enableAccessibilityIcons'] ? $_EXTCONF['enableAccessibilityIcons'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableClickEnlarge'] = $_EXTCONF['enableClickEnlarge'] ? $_EXTCONF['enableClickEnlarge'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableMozillaExtension'] = $_EXTCONF['enableMozillaExtension'] ? $_EXTCONF['enableMozillaExtension'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['mozAllowClipboardURL'] = $_EXTCONF['mozAllowClipboardURL'] ? $_EXTCONF['mozAllowClipboardURL'] : 'http://typo3.org/fileadmin/dl/allowclipboard_helper/allowclipboard_helper-0.5.5-fx_mz_zm_deLabelFix.xpi'; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['forceCommandMode'] = $_EXTCONF["forceCommandMode"] ? $_EXTCONF["forceCommandMode"] : 0; +t3lib_extMgm::addPageTSConfig(''); + + // Add default User TSonfig RTE configuration +t3lib_extMgm::addUserTSConfig(''); + + // Troubleshooting and experimentation $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDebugMode'] = $_EXTCONF['enableDebugMode'] ? $_EXTCONF['enableDebugMode'] : 0; $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableCompressedScripts'] = $_EXTCONF['enableCompressedScripts'] ? $_EXTCONF['enableCompressedScripts'] : 0; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['dictionaryList'] = $_EXTCONF["dictionaryList"] ? $_EXTCONF["dictionaryList"] : 'en'; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultDictionary'] = $_EXTCONF["defaultDictionary"] ? $_EXTCONF["defaultDictionary"] : 'en'; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['AspellDirectory'] = $_EXTCONF["AspellDirectory"] ? $_EXTCONF["AspellDirectory"] : '/usr/bin/aspell'; -$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['noSpellCheckLanguages'] = $_EXTCONF["noSpellCheckLanguages"] ? $_EXTCONF["noSpellCheckLanguages"] : 'ja,km,ko,lo,th,zh,b5,gb'; - $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableInOpera9'] = $_EXTCONF['enableInOpera9'] ? $_EXTCONF['enableInOpera9'] : 0; + // Integrating with DAM // DAM browser may be enabled here only for DAM version lower than 1.1 // If DAM 1.1+ is installed, the setting must be unset, DAM own EM setting should be used $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser'] = 0; @@ -191,50 +77,170 @@ if (t3lib_extMgm::isLoaded('dam')) { require(t3lib_extMgm::extPath('dam') . 'ext_emconf.php'); $_EXTKEY = $saveExtKey; if (t3lib_div::int_from_ver($EM_CONF['dam']['version']) < 1001000) { + // Register DAM element browser rendering $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser'] = $_EXTCONF['enableDAMBrowser'] ? $_EXTCONF['enableDAMBrowser'] : 0; + if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser']) { + $TYPO3_CONF_VARS['SC_OPTIONS']['typo3/browse_links.php']['browserRendering'][] = 'EXT:'.$_EXTKEY.'/mod4/class.tx_rtehtmlarea_dam_browse_media.php:&tx_rtehtmlarea_dam_browse_media'; + $TYPO3_CONF_VARS['SC_OPTIONS']['typo3/browse_links.php']['browserRendering'][] = 'EXT:'.$_EXTKEY.'/mod3/class.tx_rtehtmlarea_dam_browse_links.php:&tx_rtehtmlarea_dam_browse_links'; + } } } - // Add default RTE transformation configuration -t3lib_extMgm::addPageTSConfig(''); + // Configure Lorem Ipsum hook to insert nonsense in wysiwyg mode +if (t3lib_extMgm::isLoaded('lorem_ipsum') && (TYPO3_MODE == 'BE')) { + $TYPO3_CONF_VARS['EXTCONF']['lorem_ipsum']['RTE_insert'][] = 'tx_rtehtmlarea_base->loremIpsumInsert'; +} - // Add default Page TSonfig RTE configuration -t3lib_extMgm::addPageTSConfig(''); + // Initialize plugin registration array +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins'] = array(); - // Add default Page TSonfig RTE configuration for enabling images with the Minimal and Typical default configuration -if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages']) { - t3lib_extMgm::addPageTSConfig(''); + // Inline Elements configuration +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultInline'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultInline']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultInline/class.tx_rtehtmlarea_defaultinline.php:&tx_rtehtmlarea_defaultinline'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultInline']['addIconsToSkin'] = 1; +if ($_EXTCONF['enableInlineElements']) { + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InlineElements'] = array(); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InlineElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php:&tx_rtehtmlarea_inlineelements'; + t3lib_extMgm::addPageTSConfig(''); } - + // Block Elements configuration + // Set compatibility warnings in the Update Wizard of the Install Tool +$TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version']['tx_rtehtmlarea_indent'] = array( + 'title' => 'htmlArea RTE: Using CSS classes for indentation and alignment', + 'version' => 4002000, + 'description' => '
    +
  • Indentation is produced by a CSS class instead of the blockquote element.
    You will need to specify in Page TSConfig the class to be used for indentation using property buttons.indent.useClass (default is "indent"). You will need to define this class in your stylesheets and ensure that it is allowed by the RTE transformation (RTE.default.proc). Alternatively, you may continue using the blockquote element by setting property buttons.indent.useBlockquote. You may also want to add the new blockquote button to the RTE toolbar.
    • +
  • Text alignment is produced by CSS classes instead of deprecated align attribute.
    You will need to specify in Page TSConfig the class to be used for each text alignment button using property buttons.[left, center, right or justifyfull].useClass (defaults are "align-left", "align-center", "align-right", "align-justify"). You will need to define these classes in your stylesheets, and ensure that they are allowed by the RTE transformation (RTE.default.proc). Alternatively, you may continue using deprecated align attribute by setting property buttons.[left, center, right or justifyfull].useAlignAttribute.
    • +
' +); // Add compatibility Page TSConfig for indentation and alignment if (!t3lib_div::compat_version('4.2.0')) { t3lib_extMgm::addPageTSConfig(''); } - - // 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(''); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php:&tx_rtehtmlarea_blockelements'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockElements']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefinitionList/class.tx_rtehtmlarea_definitionlist.php:&tx_rtehtmlarea_definitionlist'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefinitionList']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockStyle'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['BlockStyle']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/BlockStyle/class.tx_rtehtmlarea_blockstyle.php:&tx_rtehtmlarea_blockstyle'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CharacterMap'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CharacterMap']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/CharacterMap/class.tx_rtehtmlarea_charactermap.php:&tx_rtehtmlarea_charactermap'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CharacterMap']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Acronym'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Acronym']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/Acronym/class.tx_rtehtmlarea_acronym.php:&tx_rtehtmlarea_acronym'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Acronym']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Acronym']['disableInFE'] = 1; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UserElements'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UserElements']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/UserElements/class.tx_rtehtmlarea_userelements.php:&tx_rtehtmlarea_userelements'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UserElements']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UserElements']['disableInFE'] = 1; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TextStyle'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TextStyle']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TextStyle/class.tx_rtehtmlarea_textstyle.php:&tx_rtehtmlarea_textstyle'; + + // Enable images and add default Page TSonfig RTE configuration for enabling images with the Minimal and Typical default configuration +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages'] = $_EXTCONF['enableImages'] ? $_EXTCONF['enableImages'] : 0; +if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages']) { + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultImage'] = array(); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultImage']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultImage/class.tx_rtehtmlarea_defaultimage.php:&tx_rtehtmlarea_defaultimage'; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultImage']['addIconsToSkin'] = 0; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image'] = array(); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Image/class.tx_rtehtmlarea_typo3image.php:&tx_rtehtmlarea_typo3image'; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image']['addIconsToSkin'] = 0; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image']['disableInFE'] = 1; + t3lib_extMgm::addPageTSConfig(''); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableClickEnlarge'] = $_EXTCONF['enableClickEnlarge'] ? $_EXTCONF['enableClickEnlarge'] : 0; } - +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultLink'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultLink']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultLink/class.tx_rtehtmlarea_defaultlink.php:&tx_rtehtmlarea_defaultlink'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultLink']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Link'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Link']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php:&tx_rtehtmlarea_typo3link'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Link']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Link']['disableInFE'] = 1; // Add default Page TSonfig RTE configuration for enabling links accessibility icons +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableAccessibilityIcons'] = $_EXTCONF['enableAccessibilityIcons'] ? $_EXTCONF['enableAccessibilityIcons'] : 0; if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableAccessibilityIcons']) { t3lib_extMgm::addPageTSConfig(''); } - - // Register DAM element browser rendering -if (t3lib_extMgm::isLoaded('dam') && $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableDAMBrowser']) { - $TYPO3_CONF_VARS['SC_OPTIONS']['typo3/browse_links.php']['browserRendering'][] = 'EXT:'.$_EXTKEY.'/mod4/class.tx_rtehtmlarea_dam_browse_media.php:&tx_rtehtmlarea_dam_browse_media'; - $TYPO3_CONF_VARS['SC_OPTIONS']['typo3/browse_links.php']['browserRendering'][] = 'EXT:'.$_EXTKEY.'/mod3/class.tx_rtehtmlarea_dam_browse_links.php:&tx_rtehtmlarea_dam_browse_links'; -} - - // Add default User TSonfig RTE configuration -t3lib_extMgm::addUserTSConfig(''); - - // Configure Lorem Ipsum hook to insert nonsense in wysiwyg mode -if (t3lib_extMgm::isLoaded('lorem_ipsum') && (TYPO3_MODE == 'BE')) { - $TYPO3_CONF_VARS['EXTCONF']['lorem_ipsum']['RTE_insert'][] = 'tx_rtehtmlarea_base->loremIpsumInsert'; + // Register features that use the style attribute +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['allowStyleAttribute'] = $_EXTCONF['allowStyleAttribute'] ? $_EXTCONF['allowStyleAttribute'] : 0; +if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['allowStyleAttribute']) { + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultColor'] = array(); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultColor']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultColor/class.tx_rtehtmlarea_defaultcolor.php:&tx_rtehtmlarea_defaultcolor'; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultColor']['addIconsToSkin'] = 0; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultColor']['disableInFE'] = 0; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Color'] = array(); + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Color']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php:&tx_rtehtmlarea_typo3color'; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Color']['addIconsToSkin'] = 0; + $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Color']['disableInFE'] = 0; + t3lib_extMgm::addPageTSConfig(''); } +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultFont'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultFont']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultFont/class.tx_rtehtmlarea_defaultfont.php:&tx_rtehtmlarea_defaultfont'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultFont']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultFont']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InsertSmiley'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InsertSmiley']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/InsertSmiley/class.tx_rtehtmlarea_insertsmiley.php:&tx_rtehtmlarea_insertsmiley'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InsertSmiley']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['InsertSmiley']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/Language/class.tx_rtehtmlarea_language.php:&tx_rtehtmlarea_language'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['Language']['disableInFE'] = 0; + + // Spell checking configuration +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['dictionaryList'] = $_EXTCONF['dictionaryList'] ? $_EXTCONF['dictionaryList'] : 'en'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultDictionary'] = $_EXTCONF['defaultDictionary'] ? $_EXTCONF['defaultDictionary'] : 'en'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['AspellDirectory'] = $_EXTCONF['AspellDirectory'] ? $_EXTCONF['AspellDirectory'] : '/usr/bin/aspell'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['noSpellCheckLanguages'] = $_EXTCONF['noSpellCheckLanguages'] ? $_EXTCONF['noSpellCheckLanguages'] : 'ja,km,ko,lo,th,zh,b5,gb'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['forceCommandMode'] = $_EXTCONF['forceCommandMode'] ? $_EXTCONF['forceCommandMode'] : 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/SpellChecker/class.tx_rtehtmlarea_spellchecker.php:&tx_rtehtmlarea_spellchecker'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['SpellChecker']['disableInFE'] = 0; + +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/FindReplace/class.tx_rtehtmlarea_findreplace.php:&tx_rtehtmlarea_findreplace'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['FindReplace']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['RemoveFormat'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['RemoveFormat']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/RemoveFormat/class.tx_rtehtmlarea_removeformat.php:&tx_rtehtmlarea_removeformat'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['RemoveFormat']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['RemoveFormat']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultClean'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultClean']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php:&tx_rtehtmlarea_defaultclean'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3HtmlParser'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3HtmlParser']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php:&tx_rtehtmlarea_typo3htmlparser'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3HtmlParser']['disableInFE'] = 1; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['QuickTag'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['QuickTag']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php:&tx_rtehtmlarea_quicktag'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['QuickTag']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['QuickTag']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TableOperations'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TableOperations']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php:&tx_rtehtmlarea_tableoperations'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TableOperations']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TableOperations']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['AboutEditor'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['AboutEditor']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/AboutEditor/class.tx_rtehtmlarea_abouteditor.php:&tx_rtehtmlarea_abouteditor'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['AboutEditor']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['AboutEditor']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['ContextMenu'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['ContextMenu']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/ContextMenu/class.tx_rtehtmlarea_contextmenu.php:&tx_rtehtmlarea_contextmenu'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['ContextMenu']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['ContextMenu']['disableInFE'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UndoRedo'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UndoRedo']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php:&tx_rtehtmlarea_undoredo'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UndoRedo']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['UndoRedo']['disableInFE'] = 0; + + // Copy & Paste configuration +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableMozillaExtension'] = $_EXTCONF['enableMozillaExtension'] ? $_EXTCONF['enableMozillaExtension'] : 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['mozAllowClipboardURL'] = $_EXTCONF['mozAllowClipboardURL'] ? $_EXTCONF['mozAllowClipboardURL'] : 'http://typo3.org/fileadmin/dl/allowclipboard_helper/allowclipboard_helper-0.5.5-fx_mz_zm_deLabelFix.xpi'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CopyPaste'] = array(); +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CopyPaste']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/CopyPaste/class.tx_rtehtmlarea_copypaste.php:&tx_rtehtmlarea_copypaste'; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CopyPaste']['addIconsToSkin'] = 0; +$TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['CopyPaste']['disableInFE'] = 0; ?> \ No newline at end of file diff --git a/typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php b/typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php index 6fad0c20f85..0fb0e0ad0e0 100644 --- a/typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php +++ b/typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php @@ -2,7 +2,7 @@ /*************************************************************** * Copyright notice * -* (c) 2008 Stanislas Rolland +* (c) 2008 Stanislas Rolland * All rights reserved * * This script is part of the Typo3 project. The Typo3 project is @@ -50,7 +50,7 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi { ); public function main($parentObject) { - return parent::main($parentObject) && (!$this->thisConfig['disableSelectColor'] || $this->htmlAreaRTE->client['BROWSER'] == 'gecko'); + return parent::main($parentObject) && !$this->thisConfig['disableSelectColor']; } /** diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js index babc5c18fb2..efba1c9f41e 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js +++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js @@ -190,6 +190,17 @@ BlockElements = HTMLArea.Plugin.extend({ return this.allowedBlockElements.test(blockName); }, + /* + * This function adds an attribute to the array of allowed attributes on inline elements + * + * @param string attribute: the name of the attribute to be added to the array + * + * @return void + */ + addAllowedAttribute : function (attribute) { + this.allowedAttributes.push(attribute); + }, + /* * This function gets called when some block element was selected in the drop-down list */ diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultColor/default-color.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultColor/default-color.js index 39ba7315a6f..7f55b1e099f 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultColor/default-color.js +++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/DefaultColor/default-color.js @@ -85,6 +85,14 @@ DefaultColor = HTMLArea.Plugin.extend({ ["ForeColor", "textcolor"], ["HiliteColor", "bgcolor"] ], + + /* + * Conversion object: button name or command name to corresponding style property name + */ + styleProperty : { + ForeColor : "color", + HiliteColor : "backgroundColor" + }, /* * This function gets called when the button was pressed. @@ -99,15 +107,12 @@ DefaultColor = HTMLArea.Plugin.extend({ // Could be a button or its hotkey var buttonId = this.translateHotKey(id); buttonId = buttonId ? buttonId : id; - this.commandId = buttonId; - switch (buttonId) { - case "HiliteColor" : - if (HTMLArea.is_ie || HTMLArea.is_safari) { - this.commandId = "BackColor"; - } - case "ForeColor" : + case "HiliteColor": + this.dialog = this.openDialog(buttonId, this.makeUrlFromPopupName("select_color"), "setColor", HTMLArea._colorToRgb(this.editor._doc.queryCommandValue(HTMLArea.is_ie ? "BackColor" : this.commandId)), {width:300, height:210}); + break; + case "ForeColor": this.dialog = this.openDialog(buttonId, this.makeUrlFromPopupName("select_color"), "setColor", HTMLArea._colorToRgb(this.editor._doc.queryCommandValue(this.commandId)), {width:300, height:210}); break; default: @@ -125,9 +130,16 @@ DefaultColor = HTMLArea.Plugin.extend({ * @return boolean false */ setColor : function(color) { - this.editor.focusEditor(); - if (color) { - this.editor._doc.execCommand(this.commandId, false, "#" + color); + var editor = this.editor; + if (color && editor.endPointsInSameBlock()) { + var selection = editor._getSelection(); + var range = editor._createRange(selection); + var element = editor._doc.createElement("span"); + element.style[this.styleProperty[this.commandId]] = "#" + color; + editor.wrapWithInlineElement(element, selection, range); + if (HTMLArea.is_gecko) { + range.detach(); + } } return false; }, @@ -147,6 +159,23 @@ DefaultColor = HTMLArea.Plugin.extend({ this.editor.plugins[this.commandId].instance.dialog.dialogWindow.insertColor("#" + color); } return false; + }, + + /* + * This function gets called when the toolbar is updated + */ + onUpdateToolbar : function () { + var editor = this.editor; + if (editor.getMode() === "wysiwyg" && editor.isEditable()) { + var buttonId; + for (var i = 0, n = this.buttonList.length; i < n; ++i) { + buttonId = this.buttonList[i][0]; + var obj = editor._toolbarObjects[buttonId]; + if ((typeof(obj) !== "undefined")) { + obj.state("enabled", editor.endPointsInSameBlock()); + } + } + } } }); diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js index faa097cdbd7..cabcc85047f 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js +++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js @@ -43,12 +43,30 @@ TYPO3Color = HTMLArea.Plugin.extend({ this.buttonsConfiguration = this.editorConfiguration.buttons; this.colorsConfiguration = this.editorConfiguration.colors; this.disableColorPicker = this.editorConfiguration.disableColorPicker; - + + // Coloring will use the style attribute + if (this.editor.plugins.TextStyle && this.editor.plugins.TextStyle.instance) { + this.editor.plugins.TextStyle.instance.addAllowedAttribute("style"); + this.allowedAttributes = this.editor.plugins.TextStyle.instance.allowedAttributes; + } + if (this.editor.plugins.InlineElements && this.editor.plugins.InlineElements.instance) { + this.editor.plugins.InlineElements.instance.addAllowedAttribute("style"); + if (!this.allowedAllowedAttributes) { + this.allowedAttributes = this.editor.plugins.InlineElements.instance.allowedAttributes; + } + } + if (this.editor.plugins.BlockElements && this.editor.plugins.BlockElements.instance) { + this.editor.plugins.BlockElements.instance.addAllowedAttribute("style"); + } + if (!this.allowedAttributes) { + this.allowedAttributes = new Array("id", "title", "lang", "xml:lang", "dir", (HTMLArea.is_gecko?"class":"className"), "style"); + } + /* * Registering plugin "About" information */ var pluginInformation = { - version : "2.1", + version : "3.0", developer : "Stanislas Rolland", developerUrl : "http://www.sjbr.ca/", copyrightOwner : "Stanislas Rolland", @@ -57,7 +75,7 @@ TYPO3Color = HTMLArea.Plugin.extend({ license : "GPL" }; this.registerPluginInformation(pluginInformation); - + /* * Registering the buttons */ @@ -77,7 +95,7 @@ TYPO3Color = HTMLArea.Plugin.extend({ return true; }, - + /* * The list of buttons added by this plugin */ @@ -86,6 +104,14 @@ TYPO3Color = HTMLArea.Plugin.extend({ ["HiliteColor", "bgcolor"] ], + /* + * Conversion object: button name to corresponding style property name + */ + styleProperty : { + ForeColor : "color", + HiliteColor : "backgroundColor" + }, + /* * This function gets called when the button was pressed. * @@ -95,25 +121,17 @@ TYPO3Color = HTMLArea.Plugin.extend({ * * @return boolean false if action is completed */ - onButtonPress : function(editor, id, target) { + onButtonPress : function (editor, id, target) { // Could be a button or its hotkey var buttonId = this.translateHotKey(id); buttonId = buttonId ? buttonId : id; - - switch (buttonId) { - case "ForeColor" : - case "HiliteColor" : - this.dialogSelectColor(buttonId,"",""); - break; - default: - break; - } + this.dialogSelectColor(buttonId,"",""); }, - + dialogSelectColor : function (buttonId, element, field, dialogOpener) { var dimensions = { - width : 500, - height : 245 + width : 440, + height : 300 }; var arguments = { title : buttonId + "_title", @@ -150,19 +168,8 @@ TYPO3Color = HTMLArea.Plugin.extend({ var doc = editor._doc; var buttonId = dialog.arguments.buttonId; var initialValue; - switch (buttonId) { - case "ForeColor" : - initialValue = HTMLArea._colorToRgb(doc.queryCommandValue("ForeColor")); - break; - case "HiliteColor" : - initialValue = doc.queryCommandValue(((HTMLArea.is_ie || HTMLArea.is_safari) ? "BackColor" : "HiliteColor")); - if (/transparent/i.test(initialValue)) { - // Mozilla - initialValue = doc.queryCommandValue("BackColor"); - } - initialValue = HTMLArea._colorToRgb(initialValue); - break; - } + var parentElement = editor.getParentElement(); + initialValue = HTMLArea._colorToRgb(parentElement.style[this.styleProperty[buttonId]]); dialog.content.innerHTML = this.renderPopupSelectColor(buttonId, dialog, dialog.arguments.title, initialValue); var colorTable = dialog.document.getElementById("colorTable"); colorTable.onclick = function(e) { @@ -180,29 +187,53 @@ TYPO3Color = HTMLArea.Plugin.extend({ dialog.callFormInputHandler(); return false; }; - try { - with (dialog.document.getElementById(buttonId+"Current").style) { - switch (buttonId) { - case "ForeColor": - backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("ForeColor")); - break; - case "HiliteColor": - backgroundColor = HTMLArea._makeColor(doc.queryCommandValue(((HTMLArea.is_ie || HTMLArea.is_safari) ? "BackColor" : "HiliteColor"))); - if (/transparent/i.test(backgroundColor)) { - // Mozilla - backgroundColor = HTMLArea._makeColor(doc.queryCommandValue("BackColor")); - } - break; - } - } - } catch (e) { } + dialog.document.getElementById(buttonId+"Current").style.backgroundColor = initialValue; + dialog.addButtons("ok", "cancel"); }, /* * Set the color and close the ForeColor and the HiliteColor select color dialogues */ setColor : function(dialog, params) { - this.processStyle(dialog, params, dialog.arguments.element, dialog.arguments.field); + var editor = this.editor, element; + switch (dialog.arguments.buttonId) { + case "ForeColor": + case "HiliteColor": + var selection = editor._getSelection(); + var range = editor._createRange(selection); + if (editor._selectionEmpty(selection)) { + element = editor.getParentElement(selection, range); + // Set the color in the style attribute + this.processStyle(dialog, params, element, dialog.arguments.field); + // Remove the span tag if it has no more attribute + if ((element.nodeName.toLowerCase() === "span") && !HTMLArea.hasAllowedAttributes(element, this.allowedAttributes)) { + editor.removeMarkup(element); + } + } else if (editor._statusBarTree.selected) { + element = editor._statusBarTree.selected; + // Set the color in the style attribute + this.processStyle(dialog, params, element, dialog.arguments.field); + // Remove the span tag if it has no more attribute + if ((element.nodeName.toLowerCase() === "span") && !HTMLArea.hasAllowedAttributes(element, this.allowedAttributes)) { + editor.removeMarkup(element); + } + } else if (editor.endPointsInSameBlock()) { + element = editor._doc.createElement("span"); + // Set the color in the style attribute + this.processStyle(dialog, params, element, dialog.arguments.field); + editor.wrapWithInlineElement(element, selection, range); + if (HTMLArea.is_gecko) { + range.detach(); + } + } + break; + case "color": + default: + element = dialog.arguments.element; + // Set the color in the style attribute + this.processStyle(dialog, params, element, dialog.arguments.field); + break; + } dialog.close(); }, @@ -213,7 +244,7 @@ TYPO3Color = HTMLArea.Plugin.extend({ selectColorCodeInit : function(dialog) { var buttonId = dialog.arguments.buttonId; var field = dialog.arguments.field; - dialog.content.innerHTML = this.renderPopupSelectColor(buttonId, dialog, this.localize(dialog.arguments.title), field.value); + dialog.content.innerHTML = this.renderPopupSelectColor(buttonId, dialog, this.localize(dialog.arguments.title), (field.value ? field.value : "")); var colorTable = dialog.document.getElementById("colorTable"); colorTable.onclick = function(e) { if(!e) var e = dialog.dialogWindow.event; @@ -239,6 +270,7 @@ TYPO3Color = HTMLArea.Plugin.extend({ } else if (buttonId === "tag"){ dialog.document.getElementById(buttonId+"Current").style.backgroundColor = ""; } + dialog.addButtons("ok", "cancel"); }, /* @@ -253,31 +285,22 @@ TYPO3Color = HTMLArea.Plugin.extend({ * Applies the style found in "params" to the given element */ processStyle : function (dialog, params, element, field) { - var editor = this.editor; - for (var i in params) { - var val = params[i]; - switch (i) { - case "ForeColor": - if(val) { - editor._doc.execCommand("ForeColor", false, val); - } else { - var parentElement = editor.getParentElement(); - parentElement.style.color = ""; - } - break; - case "HiliteColor": - if(val) { - if(HTMLArea.is_ie || HTMLArea.is_safari) editor._doc.execCommand("BackColor", false, val); - else editor._doc.execCommand("HiliteColor", false, val); - } else { - var parentElement = editor.getParentElement(); - parentElement.style.backgroundColor = ""; - } - break; - case "color": - element.style.backgroundColor = val; - field.value = val; - break; + if (element) { + for (var i in params) { + var val = params[i]; + if (val && val.charAt(0) != "#") { + val = "#" + val; + } + switch (i) { + case "ForeColor": + case "HiliteColor": + element.style[this.styleProperty[i]] = val; + break; + case "color": + element.style.backgroundColor = val; + field.value = val; + break; + } } } }, @@ -298,15 +321,6 @@ TYPO3Color = HTMLArea.Plugin.extend({ sz = '
' + title + '
'; sz += '
'; - sz += ''; - sz += '
'; - sz += '  '; - sz += ' Color:'; + sz += '
'; + sz += '  '; + sz += ' '; sz += '
'; return sz; + }, + + /* + * This function gets called when the toolbar is updated + */ + onUpdateToolbar : function () { + var editor = this.editor; + if (editor.getMode() === "wysiwyg" && editor.isEditable()) { + var buttonId; + var parentElement = editor._statusBarTree.selected ? editor._statusBarTree.selected : editor.getParentElement(); + var enabled = editor.endPointsInSameBlock() && !(editor._selectionEmpty(editor._getSelection()) && parentElement.nodeName.toLowerCase() == "body"); + for (var i = 0, n = this.buttonList.length; i < n; ++i) { + buttonId = this.buttonList[i][0]; + var obj = editor._toolbarObjects[buttonId]; + if ((typeof(obj) !== "undefined")) { + obj.state("active", parentElement.style[this.styleProperty[buttonId]]); + obj.state("enabled", enabled); + } + } + } } }); diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css index ecc76bcb236..19f8f6b2c5c 100644 --- a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css +++ b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css @@ -388,7 +388,7 @@ .popupwin .buttonColor { cursor:default; border-style:solid;border-width:1px;border-color:ButtonHighlight ButtonShadow ButtonHighlight ButtonHighlight; - padding:1px;margin:46px 10px 0 0; + padding:1px;margin:2px 10px 0 0; height:1em; white-space:nowrap; } diff --git a/typo3/sysext/rtehtmlarea/res/style/pageTSConfig.txt b/typo3/sysext/rtehtmlarea/res/style/pageTSConfig.txt new file mode 100644 index 00000000000..d533752f396 --- /dev/null +++ b/typo3/sysext/rtehtmlarea/res/style/pageTSConfig.txt @@ -0,0 +1,52 @@ +# *************************************************************************************** +# Default proc options in Page TSconfig for htmlArea RTE formatting with style attribute +# +# @author Stanislas Rolland +# +# TYPO3 SVN ID: $Id: pageTSConfig.txt $ +# *************************************************************************************** + + ## Default RTE processing rules +RTE.default.proc { + + ## ALLOWED P & DIV ATTRIBUTES + keepPDIVattribs := addToList(style) + + ## CONTENT TO DATABASE + entryHTMLparser_db { + tags { + ## CLEAN ATTRIBUTES ON THE FOLLOWING TAGS + span.fixAttrib.style.unset > + span.allowedAttribs = id, title, dir, lang, xml:lang, class, style + p.allowedAttribs := addToList(style) + div < .p + hr.allowedAttribs := addToList(style) + b.allowedAttribs := addToList(style) + bdo.allowedAttribs := addToList(style) + big.allowedAttribs := addToList(style) + blockquote.allowedAttribs := addToList(style) + cite.allowedAttribs := addToList(style) + code.allowedAttribs := addToList(style) + del.allowedAttribs := addToList(style) + dfn.allowedAttribs := addToList(style) + em.allowedAttribs := addToList(style) + i.allowedAttribs := addToList(style) + ins.allowedAttribs := addToList(style) + kbd.allowedAttribs := addToList(style) + label.allowedAttribs := addToList(style) + q.allowedAttribs := addToList(style) + samp.allowedAttribs := addToList(style) + small.allowedAttribs := addToList(style) + strike.allowedAttribs := addToList(style) + strong.allowedAttribs := addToList(style) + sub.allowedAttribs := addToList(style) + sup.allowedAttribs := addToList(style) + tt.allowedAttribs := addToList(style) + u.allowedAttribs := addToList(style) + var.allowedAttribs := addToList(style) + } + } +} + + ## Use same RTE processing rules in FE +RTE.default.FE.proc < RTE.default.proc diff --git a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css index 91e756a0ac2..f1e5d13c687 100644 --- a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css +++ b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css @@ -397,7 +397,7 @@ .popupwin .buttonColor { cursor:default; border-style:solid;border-width:1px;border-color:ButtonHighlight ButtonShadow ButtonHighlight ButtonHighlight; - padding:1px;margin:46px 10px 0 0; + padding:1px;margin:2px 10px 0 0; height:1em; white-space:nowrap; } -- 2.20.1