Fixed bug #16058: htmlArea RTE: Overlay to choose a color exceeds the viewport if...
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 1 Dec 2010 05:47:19 +0000 (05:47 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 1 Dec 2010 05:47:19 +0000 (05:47 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-4@9703 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Color/typo3color.js
typo3/sysext/t3skin/rtehtmlarea/htmlarea.css

index 9311562..c88495b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-01  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16058: htmlArea RTE: Overlay to choose a color exceeds the viewport if many colors are defined
+
 2010-01-01  Oliver Hader  <oliver@typo3.org>
 
        * Fixed bug #16604: Changes in workspace are not shown automatically in pagetree
index a541234..cecc79c 100644 (file)
@@ -1,3 +1,7 @@
+2010-12-01  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #16058: htmlArea RTE: Overlay to choose a color exceeds the viewport if many colors are defined
+
 2010-11-25  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Follow-up to bug #16431: htmlArea RTE: in WebKit, clicking on image does not select it
index 46bc335..06a4ac9 100644 (file)
@@ -3769,6 +3769,7 @@ Ext.ux.form.ColorPaletteField = Ext.extend(Ext.form.TriggerField, {
                }
                if (this.menu == null) {
                        this.menu = new Ext.ux.menu.HTMLAreaColorMenu({
+                               cls: 'htmlarea-color-menu',
                                hideOnClick: false,
                                colors: this.colors,
                                colorsConfiguration: this.colorsConfiguration,
index a976b60..0d6aa9b 100644 (file)
@@ -137,7 +137,13 @@ HTMLArea.TYPO3Color = HTMLArea.Plugin.extend({
                                element: element,
                                buttonId: buttonId
                        },
-                       this.getWindowDimensions({ width: 350}, buttonId),
+                       this.getWindowDimensions(
+                               {
+                                       width: 350,
+                                       height: 350
+                               },
+                               buttonId
+                       ),
                        this.buildItemsConfig(element, buttonId),
                        this.setColor
                );
@@ -311,7 +317,8 @@ HTMLArea.TYPO3Color = HTMLArea.Plugin.extend({
                        cls: 'htmlarea-window',
                        border: false,
                        width: dimensions.width,
-                       height: 'auto',
+                       height: dimensions.height,
+                       autoScroll: true,
                                // As of ExtJS 3.1, JS error with IE when the window is resizable
                        resizable: !Ext.isIE,
                        iconCls: this.getButton(arguments.buttonId).iconCls,
@@ -324,6 +331,9 @@ HTMLArea.TYPO3Color = HTMLArea.Plugin.extend({
                        items: {
                                xtype: 'container',
                                layout: 'form',
+                               style: {
+                                       width: '95%'
+                               },
                                defaults: {
                                        labelWidth: 150
                                },
index 90c3b9f..bb25bb6 100644 (file)
@@ -265,13 +265,21 @@ body.ext-ie6 .htmlarea-window .x-panel-icon {
        border-width: 1px;
        border-color: white;
 }
-.htmlarea-custom-colors {
+.htmlarea-color-menu .htmlarea-custom-colors {
+       height: 170px;
+       overflow: auto;
+}
+.htmlarea-window .htmlarea-custom-colors {
        height: auto;
+       overflow: inherit;
 }
 .htmlarea-custom-colors a {
        border-color: transparent;
        float: none;
        display: block;
+       width: 90%;
+}
+.htmlarea-window .htmlarea-custom-colors a {
        width: 100%;
 }
 .htmlarea-custom-colors em {