Skip to content
Snippets Groups Projects
Commit 144b9bc3 authored by Wouter Wolters's avatar Wouter Wolters Committed by Benjamin Mack
Browse files

[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: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: default avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: default avatarBenjamin Mack <benni@typo3.org>
Tested-by: default avatarBenjamin Mack <benni@typo3.org>
Reviewed-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent 4c412827
Branches
Tags
No related merge requests found
typo3/gfx/colorpicker.png

314 B

typo3/gfx/colorpicker_empty.png

1.4 KiB

......@@ -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;
......
====================================================================
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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment