[TASK] Remove colorpicker icons from typo3/gfx/ 34/40734/4
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 29 Jun 2015 21:13:08 +0000 (23:13 +0200)
committerBenjamin Mack <benni@typo3.org>
Mon, 29 Jun 2015 21:33:04 +0000 (23:33 +0200)
This patch also removes TCA options "dim" and "tableStyle".

Resolves: #67825
Releases: master
Change-Id: I3812d791269e2fee69fce0f7c5ea2b579eeb8c1d
Reviewed-on: http://review.typo3.org/40734
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/gfx/colorpicker.png [deleted file]
typo3/gfx/colorpicker_empty.png [deleted file]
typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst [new file with mode: 0644]

diff --git a/typo3/gfx/colorpicker.png b/typo3/gfx/colorpicker.png
deleted file mode 100644 (file)
index 7879609..0000000
Binary files a/typo3/gfx/colorpicker.png and /dev/null differ
diff --git a/typo3/gfx/colorpicker_empty.png b/typo3/gfx/colorpicker_empty.png
deleted file mode 100644 (file)
index 028bf67..0000000
Binary files a/typo3/gfx/colorpicker_empty.png and /dev/null differ
index 5504839..9ed114a 100644 (file)
@@ -336,7 +336,7 @@ abstract class AbstractFormElement extends AbstractNode {
                                        $aOnClick =
                                                'this.blur();' .
                                                'vHWin=window.open('. GeneralUtility::quoteJSvalue($url) . '+\'&P[currentValue]=\'+TBE_EDITOR.rawurlencode(' .
-                                                       'document.editform[\'' . $itemName . '\'].value,200' .
+                                                       'document.editform[' . GeneralUtility::quoteJSvalue($itemName) . '].value,200' .
                                                        ')' .
                                                        '+\'&P[currentSelectedValues]=\'+TBE_EDITOR.curSelected(' . GeneralUtility::quoteJSvalue($itemName . $listFlag) . '),' .
                                                        GeneralUtility::quoteJSvalue('popUp' . $md5ID) . ',' .
@@ -345,25 +345,8 @@ abstract class AbstractFormElement extends AbstractNode {
                                                'vHWin.focus();' .
                                                'return false;';
 
-                                       $dim = GeneralUtility::intExplode('x', $wizardConfiguration['dim']);
-                                       $dX = MathUtility::forceIntegerInRange($dim[0], 1, 200, 20);
-                                       $dY = MathUtility::forceIntegerInRange($dim[1], 1, 200, 20);
-                                       $color = $PA['itemFormElValue'] ? ' bgcolor="' . htmlspecialchars($PA['itemFormElValue']) . '"' : '';
-                                       $skinImg = IconUtility::skinImg(
-                                               '',
-                                               $PA['itemFormElValue'] === '' ? 'gfx/colorpicker_empty.png' : 'gfx/colorpicker.png',
-                                               'width="' . $dX . '" height="' . $dY . '"' . BackendUtility::titleAltAttrib(trim($iTitle . ' ' . $PA['itemFormElValue'])) . ' border="0"'
-                                       );
-                                       $otherWizards[] =
-                                               '<table border="0" id="' . $md5ID . '"' . $color . ' style="' . htmlspecialchars($wizardConfiguration['tableStyle']) . '">' .
-                                                       '<tr>' .
-                                                               '<td>' .
-                                                                       '<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($aOnClick) . '">' . '<img ' . $skinImg . '>' . '</a>' .
-                                                               '</td>' .
-                                                       '</tr>' .
-                                               '</table>';
+                                       $otherWizards[] = '<a id="' . $md5ID . '" class="btn btn-default" href="#" onclick="' . htmlspecialchars($aOnClick) . '"><span class="t3-icon fa fa-eyedropper"></span></a>';
                                        break;
-
                                case 'slider':
                                        $params = array();
                                        $params['fieldConfig'] = $fieldConfig;
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst
new file mode 100644 (file)
index 0000000..9c5353f
--- /dev/null
@@ -0,0 +1,27 @@
+====================================================================
+Breaking: #67825 - Remove colorpicker options "dim" and "tableStyle"
+====================================================================
+
+Description
+===========
+
+``TCA`` colorpicker options "dim" and "tableStyle" have been removed.
+
+
+Impact
+======
+
+The TCA options won't have any effect anymore.
+
+
+Affected Installations
+======================
+
+Any extension that has a colorpicker wizard configured in ``TCA`` and uses ``dim``
+or ``tableStyle`` options is effected.
+
+
+Migration
+=========
+
+Both options can de safely removed.
\ No newline at end of file