Index: typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
===================================================================
--- typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (révision 9325)
+++ typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (copie de travail)
@@ -330,18 +330,19 @@
$RTEHeight = isset($BE_USER->userTS['options.']['RTESmallHeight']) ? $BE_USER->userTS['options.']['RTESmallHeight'] : '380';
$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);
- if (isset($this->thisConfig['RTEWidthOverride'])) {
- if (strstr($this->thisConfig['RTEWidthOverride'], '%')) {
+ $RTEWidthOverride = (is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteWidth']) && trim($GLOBALS['BE_USER']->uc['rteWidth'])) ? trim($GLOBALS['BE_USER']->uc['rteWidth']) : trim($this->thisConfig['RTEWidthOverride']);
+ if ($RTEWidthOverride) {
+ if (strstr($RTEWidthOverride, '%')) {
if ($this->client['browser'] != 'msie') {
- $RTEWidth = (intval($this->thisConfig['RTEWidthOverride']) > 0) ? $this->thisConfig['RTEWidthOverride'] : '100%';
+ $RTEWidth = (intval($RTEWidthOverride) > 0) ? $RTEWidthOverride : '100%';
}
} else {
- $RTEWidth = (intval($this->thisConfig['RTEWidthOverride']) > 0) ? intval($this->thisConfig['RTEWidthOverride']) : $RTEWidth;
+ $RTEWidth = (intval($RTEWidthOverride) > 0) ? intval($RTEWidthOverride) : $RTEWidth;
}
}
$RTEWidth = strstr($RTEWidth, '%') ? $RTEWidth : $RTEWidth . 'px';
$RTEHeight = $RTEHeight + ($this->TCEform->docLarge ? (isset($BE_USER->userTS['options.']['RTELargeHeightIncrement']) ? $BE_USER->userTS['options.']['RTELargeHeightIncrement'] : 0) : 0);
- $RTEHeightOverride = intval($this->thisConfig['RTEHeightOverride']);
+ $RTEHeightOverride = (is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteHeight']) && intval($GLOBALS['BE_USER']->uc['rteHeight'])) ? intval($GLOBALS['BE_USER']->uc['rteHeight']) : intval($this->thisConfig['RTEHeightOverride']);
$RTEHeight = ($RTEHeightOverride > 0) ? $RTEHeightOverride : $RTEHeight;
$editorWrapWidth = '99%';
$editorWrapHeight = '100%';
@@ -803,8 +804,10 @@
RTEarea[editornumber].deleted = false;
RTEarea[editornumber].textAreaId = "' . $textAreaId . '";
RTEarea[editornumber].id = "RTEarea" + editornumber;
- RTEarea[editornumber].RTEWidthOverride = "' . trim($this->thisConfig['RTEWidthOverride']) . '";
- RTEarea[editornumber].RTEHeightOverride = "' . trim($this->thisConfig['RTEHeightOverride']) . '";
+ RTEarea[editornumber].RTEWidthOverride = "' . ((is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteWidth']) && trim($GLOBALS['BE_USER']->uc['rteWidth'])) ? trim($GLOBALS['BE_USER']->uc['rteWidth']) : trim($this->thisConfig['RTEWidthOverride'])) . '";
+ RTEarea[editornumber].RTEHeightOverride = "' . ((is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteHeight']) && intval($GLOBALS['BE_USER']->uc['rteHeight'])) ? intval($GLOBALS['BE_USER']->uc['rteHeight']) : intval($this->thisConfig['RTEHeightOverride'])) . '";
+ RTEarea[editornumber].resizable = ' . ((is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteResize']) && $GLOBALS['BE_USER']->uc['rteResize']) ? 'true' : (trim($this->thisConfig['rteResize']) ? 'true' : 'false')) . ';
+ RTEarea[editornumber].maxHeight = "' . ((is_object($GLOBALS['BE_USER']) && isset($GLOBALS['BE_USER']->uc['rteMaxHeight']) && intval($GLOBALS['BE_USER']->uc['rteMaxHeight'])) ? trim($GLOBALS['BE_USER']->uc['rteMaxHeight']) : (intval($this->thisConfig['rteMaxHeight']) ? intval($this->thisConfig['rteMaxHeight']) : '2000')) . '";
RTEarea[editornumber].fullScreen = ' . ($this->fullScreen ? 'true' : 'false') . ';
RTEarea[editornumber].showStatusBar = ' . (trim($this->thisConfig['showStatusBar'])?'true':'false') . ';
RTEarea[editornumber].enableWordClean = ' . (trim($this->thisConfig['enableWordClean'])?'true':'false') . ';
Index: typo3/sysext/rtehtmlarea/ext_tables.php
===================================================================
--- typo3/sysext/rtehtmlarea/ext_tables.php (révision 9325)
+++ typo3/sysext/rtehtmlarea/ext_tables.php (copie de travail)
@@ -24,6 +24,7 @@
t3lib_extMgm::allowTableOnStandardPages('tx_rtehtmlarea_acronym');
// Add contextual help files
+ t3lib_extMgm::addLLrefForTCAdescr('xEXT_' . $_EXTKEY . '_General', 'EXT:' . $_EXTKEY . '/locallang_csh.xml');
foreach ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins'] as $pluginName => $config) {
if ($config['contextHelpFile']) {
t3lib_extMgm::addLLrefForTCAdescr('xEXT_' . $_EXTKEY . '_' . $pluginName, $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins'][$pluginName]['contextHelpFile']);
@@ -35,6 +36,26 @@
$GLOBALS['TYPO3_USER_SETTINGS']['columns'] = array_merge(
$GLOBALS['TYPO3_USER_SETTINGS']['columns'],
array(
+ 'rteWidth' => array(
+ 'type' => 'text',
+ 'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteWidth',
+ 'csh' => 'xEXT_rtehtmlarea_General:rteWidth',
+ ),
+ 'rteHeight' => array(
+ 'type' => 'text',
+ 'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteHeight',
+ 'csh' => 'xEXT_rtehtmlarea_General:rteHeight',
+ ),
+ 'rteResize' => array(
+ 'type' => 'check',
+ 'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteResize',
+ 'csh' => 'xEXT_rtehtmlarea_General:rteResize',
+ ),
+ 'rteMaxHeight' => array(
+ 'type' => 'text',
+ 'label' => 'LLL:EXT:rtehtmlarea/locallang.xml:rteMaxHeight',
+ 'csh' => 'xEXT_rtehtmlarea_General:rteMaxHeight',
+ ),
'rteCleanPasteBehaviour' => array(
'type' => 'select',
'label' => 'LLL:EXT:rtehtmlarea/htmlarea/plugins/PlainText/locallang.xml:rteCleanPasteBehaviour',
@@ -47,6 +68,6 @@
),
)
);
- $GLOBALS['TYPO3_USER_SETTINGS']['showitem'] .= ',--div--;LLL:EXT:rtehtmlarea/locallang.xml:rteSettings,rteResize,rteMaxHeight,rteCleanPasteBehaviour';
+ $GLOBALS['TYPO3_USER_SETTINGS']['showitem'] .= ',--div--;LLL:EXT:rtehtmlarea/locallang.xml:rteSettings,rteWidth,rteHeight,rteResize,rteMaxHeight,rteCleanPasteBehaviour';
}
?>
\ No newline at end of file
Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (révision 9326)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js (copie de travail)
@@ -139,8 +139,6 @@
this.documentType = '\r';
- this.resizable = TYPO3.settings.textareaResize;
- this.maxHeight = TYPO3.settings.textareaMaxHeight;
// Hold the configuration of buttons and hot keys registered by plugins
this.buttonsConfig = {};
this.hotKeyList = {};
Index: typo3/sysext/rtehtmlarea/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/locallang.xml (révision 9325)
+++ typo3/sysext/rtehtmlarea/locallang.xml (copie de travail)
@@ -19,6 +19,8 @@
+
+
Index: typo3/sysext/rtehtmlarea/locallang_csh.xml
===================================================================
--- typo3/sysext/rtehtmlarea/locallang_csh.xml (révision 0)
+++ typo3/sysext/rtehtmlarea/locallang_csh.xml (révision 0)
@@ -0,0 +1,30 @@
+
+
+
+ CSH for htmlArea RTE
+ CSH
+ xEXT_rtehtmlarea_General
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
===================================================================
--- typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php (révision 9325)
+++ typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php (copie de travail)
@@ -224,11 +224,6 @@
$this->TCEform->additionalJS_pre['rtehtmlarea-loadJScode'] = $this->wrapCDATA($this->loadJScode($this->TCEform->RTEcounter));
}
$this->TCEform->additionalJS_initial = $this->loadJSfiles($this->TCEform->RTEcounter);
- $resizableSettings = array(
- 'textareaResize' => true,
- 'textareaMaxHeight' => '600'
- );
- $pageRenderer->addInlineSettingArray('', $resizableSettings);
if ($GLOBALS['TSFE']->isINTincScript()) {
$GLOBALS['TSFE']->additionalHeaderData['rtehtmlarea'] = $pageRenderer->render();
}