Follow-up to bug #14793: htmlArea RTE: Problematic icons in IE6

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

diff --git a/ChangeLog b/ChangeLog
index d78a7ee..6b2d19d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-06-26  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14876: htmlArea RTE: SelectFont plugin may cause js error
+       * Follow-up to bug #14793: htmlArea RTE: Problematic icons in IE6
 
 2010-06-25  Steffen Kamper  <info@sk-typo3.de>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index 382acb5..de42da3 100644 (file)
--- a/typo3/sysext/rtehtmlarea/ChangeLog
+++ b/typo3/sysext/rtehtmlarea/ChangeLog
@@ -1,6 +1,7 @@
 2010-06-26  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #14876: htmlArea RTE: SelectFont plugin may cause js error
+       * Follow-up to bug #14793: htmlArea RTE: Problematic icons in IE6
 
 2010-06-21  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
index 713b90e..58d2c4a 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
+++ b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/htmlarea.css
@@ -104,6 +104,9 @@ body.ext-ie6 .htmlarea .toolbar .button {
        padding: 0;
        margin: 1px 0 1px 2px;
 }
+body.ext-ie6 .htmlarea .toolbar .x-btn-text {
+       background-image: url("images/sprites/actions.gif");
+}
 /* fixing button background-color and border-color in IE6 */
 body.ext-ie6 .htmlarea .toolbar .buttonHover,
 .htmlarea .toolbar .buttonHover {
@@ -197,6 +200,7 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        margin: 0;
        padding: 0 3px;
        line-height: 20px;
+       font-family: Verdana, Helvetica, Geneva, Arial, sans-serif;
 }
 .htmlarea .statusBar .statusBarTree a {
        color:ButtonText;
@@ -217,6 +221,9 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        margin-top: 2px;
        height: 22px;
 }
+body.ext-ie6 .htmlarea-window .x-panel-icon {
+       background-image: url("images/sprites/actions.gif");
+}
 .htmlarea-window ul.x-tab-strip {
        list-style: none;
 }
@@ -367,12 +374,8 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        width: 18px;
        height: 18px;
 }
-/* Remove the icons in IE6 as they are not iepngfixed */
-body.ext-ie6 .htmlarea-context-menu a.x-menu-item {
-       padding-left: 3px;
-}
 body.ext-ie6 .htmlarea-context-menu .x-menu-item-icon {
-       background-image: none;
+       background-image: url("images/sprites/actions.gif");
 }
 /* Window status bar selectors */
 .htmlarea-window .status-ready {

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/sprites/actions.gif b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/sprites/actions.gif
new file mode 100644 (file)
index 0000000..710c492
Binary files /dev/null and b/typo3/sysext/rtehtmlarea/htmlarea/skins/default/images/sprites/actions.gif differ

diff --git a/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php b/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
index d905b3d..07020e0 100644 (file)
--- a/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
+++ b/typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
@@ -207,7 +207,6 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                        // Preloading the pageStyle and including RTE skin stylesheets
                $this->addPageStyle();
                $this->addSkin();
-               $this->addPngFix();
                $pageRenderer->addCssFile($this->siteURL . 't3lib/js/extjs/ux/resize.css');
                        // Loading JavaScript files and code
                $pageRenderer->loadExtJs();
@@ -272,18 +271,6 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                $pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
                $pageRenderer->addCssFile($href, $relation, 'screen', $title);
        }
-       /**
-        * Add iepngfix js and inline css for IE6, if available (t3skin must be loaded)
-        *
-        * @return      void
-        */
-       protected function addPngFix() {
-               if ($this->client['browser'] == 'msie' && $this->client['version'] < 7 && t3lib_extMgm::isLoaded('t3skin')) {
-                       $pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
-                       $pageRenderer->addJsFile($this->siteURL . t3lib_extMgm::siteRelPath('t3skin') . 'pngfix/iepngfix.js');
-                       $pageRenderer->addCssInlineBlock('htmlarea-iepngfix', ".htmlarea .toolbar .x-btn-text, .htmlarea-window .x-panel-icon { behavior: url('" . $this->siteURL . t3lib_extMgm::siteRelPath('t3skin') . 'pngfix/iepngfix.php' . "\');");
-               }
-       }
        /**
         * Return true if we are in the FE, but not in the FE editing feature of BE.
         *

diff --git a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
index 369d6fd..5a4e8c0 100644 (file)
--- a/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
+++ b/typo3/sysext/t3skin/rtehtmlarea/htmlarea.css
@@ -104,6 +104,9 @@ body.ext-ie6 .htmlarea .toolbar .button {
        padding: 0;
        margin: 1px 0 1px 2px;
 }
+body.ext-ie6 .htmlarea .toolbar .x-btn-text {
+       background-image: url("images/sprites/actions.gif");
+}
 /* fixing button background-color and border-color in IE6 */
 body.ext-ie6 .htmlarea .toolbar .buttonHover,
 .htmlarea .toolbar .buttonHover {
@@ -202,6 +205,7 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        margin: 0;
        padding: 0 3px;
        line-height: 20px;
+       font-family: Verdana, Helvetica, Geneva, Arial, sans-serif;
 }
 .htmlarea .statusBar .statusBarTree a {
        color:#FFFFFF;
@@ -222,6 +226,9 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        margin-top: 2px;
        height: 22px;
 }
+body.ext-ie6 .htmlarea-window .x-panel-icon {
+       background-image: url("images/sprites/actions.gif");
+}
 .htmlarea-window ul.x-tab-strip {
        list-style: none;
 }
@@ -372,12 +379,8 @@ body.ext-ie6 .htmlarea-context-menu .buttonActive,
        width: 18px;
        height: 18px;
 }
-/* Remove the icons in IE6 as they are not iepngfixed */
-body.ext-ie6 .htmlarea-context-menu a.x-menu-item {
-       padding-left: 3px;
-}
 body.ext-ie6 .htmlarea-context-menu .x-menu-item-icon {
-       background-image: none;
+       background-image: url("images/sprites/actions.gif");
 }
 /* Window status bar selectors */
 .htmlarea-window .status-ready {

diff --git a/typo3/sysext/t3skin/rtehtmlarea/images/sprites/actions.gif b/typo3/sysext/t3skin/rtehtmlarea/images/sprites/actions.gif
new file mode 100644 (file)
index 0000000..710c492
Binary files /dev/null and b/typo3/sysext/t3skin/rtehtmlarea/images/sprites/actions.gif differ