* Feature #3633: Individual height of inline RTE. Thanks to Ralf Hettinger.

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

diff --git a/ChangeLog b/ChangeLog
index 1f43b96..380158a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Feature/cleanup: Restructure plugins QuickTag, TableOperations, UserElements
        * Feature/cleanup: Move colors, fonts, text direction, word cleaning and lists to extensions/plugins.
+       * Feature #3633: Individual height of inline RTE. Thanks to Ralf Hettinger.
 
 2008-01-28  Kasper Sk\8crh¿j <kasper2008@typo3.com>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 8bbc99c..a130c4b 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -2,6 +2,7 @@
 
        * Feature/cleanup: Restructure plugins QuickTag, TableOperations, UserElements
        * Feature/cleanup: Move colors, fonts, text direction, word cleaning and lists to extensions/plugins.
+       * Feature #3633: Individual height of inline RTE. Thanks to Ralf Hettinger.
 
 2008-01-26  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
index ed36c4c..feb51f5 100644 (file)
--- a/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
+++ b/typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
@@ -372,6 +372,8 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $RTEWidth  = $RTEWidth + ($this->TCEform->docLarge ? (isset($BE_USER->userTS['options.']['RTELargeWidthIncrement']) ? $BE_USER->userTS['options.']['RTELargeWidthIncrement'] : '150') : 0);
                        $RTEWidth -= ($inline->getStructureDepth() > 0 ? ($inline->getStructureDepth()+1)*$inline->getLevelMargin() : 0);
                        $RTEHeight = $RTEHeight + ($this->TCEform->docLarge ?  (isset($BE_USER->userTS['options.']['RTELargeHeightIncrement']) ? $BE_USER->userTS['options.']['RTELargeHeightIncrement'] : 0) : 0);
+                       $RTEHeightOverride = intval($this->thisConfig['RTEHeightOverride']);
+                       $RTEHeight = ($RTEHeightOverride > 0) ? $RTEHeightOverride : $RTEHeight;
                        $editorWrapWidth = $RTEWidth . 'px';
                        $editorWrapHeight = $RTEHeight . 'px';
                        $this->RTEdivStyle = 'position:relative; left:0px; top:0px; height:' . $RTEHeight . 'px; width:'.$RTEWidth.'px; border: 1px solid black; padding: 2px 0px 2px 2px;';

diff --git a/typo3/sysext/rtehtmlarea/doc/manual.sxw b/typo3/sysext/rtehtmlarea/doc/manual.sxw
index 73534db..2730075 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/pi2/class.tx_rtehtmlarea_pi2.php b/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
index 6685ecd..0010b44 100644 (file)
--- a/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
+++ b/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
@@ -213,6 +213,8 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                 
                $RTEWidth = 460+($this->TCEform->docLarge ? 150 : 0);
                $RTEHeight = 380;
+               $RTEHeightOverride = intval($this->thisConfig['RTEHeightOverride']);
+               $RTEHeight = ($RTEHeightOverride > 0) ? $RTEHeightOverride : $RTEHeight;
                $editorWrapWidth = $RTEWidth . 'px';
                $editorWrapHeight = $RTEHeight . 'px';
                $this->RTEWrapStyle = $this->RTEWrapStyle ? $this->RTEWrapStyle : ($this->RTEdivStyle ? $this->RTEdivStyle : ('height:' . ($RTEHeight+2) . 'px; width:'. ($RTEWidth+2) . 'px;'));