From 144b9bc383d8adf3f96deb712f7ad8a977200bdf Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Mon, 29 Jun 2015 23:13:08 +0200
Subject: [PATCH] [TASK] Remove colorpicker icons from typo3/gfx/
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 | Bin 314 -> 0 bytes
typo3/gfx/colorpicker_empty.png | Bin 1432 -> 0 bytes
.../Form/Element/AbstractFormElement.php | 21 ++------------
...moveColorpickerOptionsDimAndTableStyle.rst | 27 ++++++++++++++++++
4 files changed, 29 insertions(+), 19 deletions(-)
delete mode 100644 typo3/gfx/colorpicker.png
delete mode 100644 typo3/gfx/colorpicker_empty.png
create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst
diff --git a/typo3/gfx/colorpicker.png b/typo3/gfx/colorpicker.png
deleted file mode 100644
index 78796093ebe96ba33b2786ede49c7b16f1f33015..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 314
zcmV-A0mc4_P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00032Nkl<ZILl*T
zU|{%9Wz6s&2pFh=M-3b`aMVDW8F+B!a)uQ_WrEXGOlQszk^C@4RN~?UdlUC1dFkXC
zI47l%ceP5&jbjWB{~t4|{J+D;^M8vX@84-b7KvmTSYQ}4a}h(r{}+NC|39bn|Nq>U
z_y1W2*Z)Ozyr;-A&{a6_dlFyy|4l_(|G$0k<o~DFhyH*3sPTW(Hm)yZ8K|U@ev65#
z>3?|M>HphrzWjgY^|t>9pBw$3wVLxeSq3_Ll)Ldrb^T{@J@j90^^N~tyQ=?3ZBhQ8
z(yKU)ECaLiXEPWZ*C%m%OgO?-Ir9U5PRK*+YQw1+Gkv+>22v9P01ss6gP_ZhN&o-=
M07*qoM6N<$f?oHK*#H0l
diff --git a/typo3/gfx/colorpicker_empty.png b/typo3/gfx/colorpicker_empty.png
deleted file mode 100644
index 028bf67d038b42c9ceb38fc8092318519781de1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1432
zcmV;J1!ww+P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%000GFNkl<ZILigW
zTWlOx0S4gzoH=K1JG-+NJ6YS=_)@ox33lwJjT4Eqfj|+^7eGkB0|lfaN`WVMDMCmf
zB*Y6y2!zA~B83Me1X7<UQcG1z3NDG)gvL%|cT=yu_S)Xt%+Ai`oSDP-k>*YVi54-=
zOq-0d(`m(+9Z9l0db7SV_|HEU8gHzX_V2B8DhNt*bHZI+>YaJ=<D0dm%j<5nSP!Fa
z14-7_GBy%Cl4P^_KFcXmMk3GgvC^f3SKqq0@v~nqw(7Sg>|yNKh?v7U2uU$aJP1H~
zln?pij~!fk?sIqMKlzng5s_;~l5K?~?UKFsb_;^DWlpkBH~#S2wOc=Wspbxwd0RW+
zMa7AO0wkqSdH_uuAWJ0%N~)Hbi6aO8qn~}Y`O$Cw`1P(8|0PQcbvB~%bdg(^>My-~
zt^U0mk4(#PGpAd$m;j}mk6g?VLx6@6ii*R74qlPOIiu-CFDTu;@jEM#I<EfUhx<J2
z9xyxa%r^dZ>*C#?{JB<>d9!Fbw3NDVsf%K84+SX5aSrB|kog0oqXDYr5kxLUUYXR;
zEc4wPzp34yfB52~UwHn%jCG@xmw)l6MYCt*XP8M(M*?Lyu&o+cR)HMvVNek$T&Y3i
zVxY5y32z(0-UB#NBA^;QwQA)5*ZTS5%;1?7wz;#jym5P{I-ZU50y8jaxX`maAT@+%
zAA-2thx1Sc#`!Y{#1Ys@4y08;n2nIJL*$>*F*&RA)>f<f-p*f_wdK<E_cw3vPo3pe
z7E=?)W(llZgnrgUZrTO?&>W1V8HlL@n5)CKC?Y#Ty4pwS%U!S!qzH#26801eMkd((
zzc)(7RAY%HQKT+%j)lEPEZ85JMOujAK7Jkp*9S2b48qVaOBkz7l-wbxkgx{=dA)$V
zE7^nnyCrtK+h#e!kW(DOQ(%sbLa_i^wqVSiLTtwvn<^oe6misrna@GDDhQ%e;ADV6
z9wO2*Xq<wJJ;vV9EW}z01p(L;H6G!jC9oho%%&U*rhr2oSUd+Ag&6rJ!eIrTnu4N-
z2)aJnzC?4VVNaQ0)rCd5QGWm=E*P)iAmr$$MMzPGow{HeN4qDGXGfsS2h|k}OGm~D
zWPE}M0hGu<ERM1}F4>c-)!xS28&zAI&@mb!;x3v4hEkWK99mE<18geAxSk+N21u}j
zbhHi0+L+KYsDMF*7UDrDPw|Bw`_#4h&0qcUk7opp%bDYl)GgxOo{r#NiW4=!<Wn<n
zhh5Ak5;BpXxnnSLjHAH8=CF!Ncm&mtRi~5q=dN7eWb=y;*B^UgY4Po~FwYBlop2Xf
zk6@RE=u8^W;uxi77f+ZSDB6J)busPkqt84X`w0fe9L{k^jM2%%+3M9gEf(DMXFva$
zJBA5g&?J+>1C81U#Q}yjj<!nC@(t|x1Kjj`cyr&x_O1u-WDnA_;Cn24r{nrl=f8Ak
z+L>F|Uiik>=?7P43cYS``u5Fjmr_HEb)V!eRG{Wfq+tdgg&2A_p+p<ueun*lhMYQt
zI62PRNB!t>^<$0auD<w6Ow)fc4!y0SleO=@`1Dkg2>kxH@6_N<=F@TTs1p*N#mH12
z&_)>1E{u@iq!p>%jwKAhU!Az#{Py*qzRrlX7N=2L`_>CzODQ)3O-oKb@!<>Isfj|^
z=r>tE>9Dlh)MzRQ;v<D%TaCP9CEJH$crf(rAbtOf&wTZ*=dXO{6^mJ~#tK_z29Goz
z>_IZYctUNP(9_6gvwPiO`Jd~DD{J?g3;#asm0GPPH^~;p#w@W^srHu7o!fkRWpRDd
my--&qYQ&k>)-yU16!QO^T&9s^L^H$y0000<MNUMnLSTY63BCmY
diff --git a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
index 55048393175e..9ed114a7e25f 100644
--- a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
@@ -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
index 000000000000..9c5353f7c110
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst
@@ -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
--
GitLab