Fixed bug #11576: Colorpicker has no usable icon (Thanks to Stefan Geith)
authorSteffen Kamper <info@sk-typo3.de>
Wed, 10 Mar 2010 10:26:02 +0000 (10:26 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Wed, 10 Mar 2010 10:26:02 +0000 (10:26 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7095 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_tceforms.php
typo3/gfx/colorpicker.png [new file with mode: 0644]
typo3/gfx/colorpicker_empty.png [new file with mode: 0644]

index 7ee5dc2..fc0fce3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Steffen Kamper  <info@sk-typo3.de>
+
+       * Fixed bug #11576: Colorpicker has no usable icon (Thanks to Stefan Geith)
+
 2010-03-09  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #13785: htmlArea RTE: Extjize Find & Replace dialogue
 2010-03-09  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #13785: htmlArea RTE: Extjize Find & Replace dialogue
index 9fb27fe..1648547 100644 (file)
@@ -3938,9 +3938,11 @@ class t3lib_TCEforms     {
                                                $outArr[] = '<table border="0" cellpadding="0" cellspacing="0" id="'.$md5ID.'"'.$color.' style="'.htmlspecialchars($wConf['tableStyle']).'">
                                                                        <tr>
                                                                                <td>'.
                                                $outArr[] = '<table border="0" cellpadding="0" cellspacing="0" id="'.$md5ID.'"'.$color.' style="'.htmlspecialchars($wConf['tableStyle']).'">
                                                                        <tr>
                                                                                <td>'.
-                                                                                       $colorBoxLinks[0].
-                                                                                       '<img src="clear.gif" width="'.$dX.'" height="'.$dY.'"'.t3lib_BEfunc::titleAltAttrib(trim($iTitle.' '.$PA['itemFormElValue'])).' border="0" />'.
-                                                                                       $colorBoxLinks[1].
+                                                                                       $colorBoxLinks[0].'<img '.
+                                                                                       t3lib_iconWorks::skinImg($this->backPath,
+                                                                                                                               (strlen(trim($color))==0 || strcmp(trim($color),'0')==0) ? 'gfx/colorpicker_empty.png' : 'gfx/colorpicker.png', 
+                                                                                                                               'width="'.$dX.'" height="'.$dY.'"'.t3lib_BEfunc::titleAltAttrib(trim($iTitle.' '.$PA['itemFormElValue'])).' border="0"').
+                                                                                       '>'.$colorBoxLinks[1].
                                                                                        '</td>
                                                                        </tr>
                                                                </table>';
                                                                                        '</td>
                                                                        </tr>
                                                                </table>';
diff --git a/typo3/gfx/colorpicker.png b/typo3/gfx/colorpicker.png
new file mode 100644 (file)
index 0000000..44592d6
Binary files /dev/null and b/typo3/gfx/colorpicker.png differ
diff --git a/typo3/gfx/colorpicker_empty.png b/typo3/gfx/colorpicker_empty.png
new file mode 100644 (file)
index 0000000..73f30f8
Binary files /dev/null and b/typo3/gfx/colorpicker_empty.png differ