diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php index fbdb8c427bde3ccccfc0b2b11196ab758bd78ea1..9a27e7556f59ef1854e67ca3a3a35ba1fe158371 100644 --- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php +++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php @@ -61,7 +61,7 @@ class ElementBrowserRecordList extends DatabaseRecordList $ATag_alt = '<a href="#" data-close="1" title="' . htmlspecialchars($this->getLanguageService()->getLL('addToList')) . '">'; $ATag_e = '</a>'; $out = '<span data-uid="' . htmlspecialchars($row['uid']) . '" data-table="' . htmlspecialchars($table) . '" data-title="' . htmlspecialchars($title) . '" data-icon="' . htmlspecialchars($ficon) . '">'; - $out .= $ATag . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . $ATag_e . $ATag_alt . $code . $ATag_e; + $out .= $ATag . $this->iconFactory->getIcon('actions-add', Icon::SIZE_SMALL)->render() . $ATag_e . $ATag_alt . $code . $ATag_e; $out .= '</span>'; return $out; diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html index c545a92e662c33297dd4bf33a1be5562b3038c74..7d68e031e7df21850f3360883411a1d7ab3b0dfe 100644 --- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html +++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/IndexListRow.html @@ -51,7 +51,7 @@ <a class="btn btn-default" href="#" onclick="top.launchView('be_users', '{backendUser.uid}'); return false;"><core:icon identifier="actions-document-info" /></a> </div> <div class="btn-group" role="group"> - <f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><core:icon identifier="actions-edit-add" size="small"/> <f:translate key="compare" /></f:link.action> + <f:link.action action="addToCompareList" arguments="{uid: backendUser.uid}" class="btn btn-default"><core:icon identifier="actions-add" size="small"/> <f:translate key="compare" /></f:link.action> <bu:SwitchUser backendUser="{backendUser}" /> </div> </td> diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php index 5136cc69a29c2e343dc4298aee1792a3c0ffcc10..45e54aee49ccb3ef6609cf5661832610d08e5432 100644 --- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php +++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php @@ -3152,6 +3152,10 @@ class IconRegistry implements SingletonInterface 'actions-document-close' => [ 'message' => '%s is deprecated since TYPO3 CMS 8, this icon will be removed in TYPO3 CMS 9', 'replacement' => 'actions-close' + ], + 'actions-edit-add' => [ + 'message' => '%s is deprecated since TYPO3 CMS 8, this icon will be removed in TYPO3 CMS 9', + 'replacement' => 'actions-add' ] ]; diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-80603-ChangeDuplicateIconIdentifiersToActions-add.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-80603-ChangeDuplicateIconIdentifiersToActions-add.rst new file mode 100644 index 0000000000000000000000000000000000000000..b16f56444b059be3cba15fb3fe4d1d2d92cfe136 --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-80603-ChangeDuplicateIconIdentifiersToActions-add.rst @@ -0,0 +1,33 @@ +.. include:: ../../Includes.txt + +====================================================================== +Deprecation: #80603 - Change duplicate icon identifiers to actions-add +====================================================================== + +See :issue:`80603` + +Description +=========== + +The icon ``actions-edit-add`` has been marked as deprecated. + + +Impact +====== + +Using the icon identifier ``actions-edit-add`` will trigger a deprecation log entry. + +Affected Installations +====================== + +Any installation using the icon identifier. + + +Migration +========= + +Use the new icon identifier ``actions-add`` instead. + + + +.. index:: Backend diff --git a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php index f56c23de3c5bf628caca2b21b340b3e329d7aa9f..6f409e3198acb90dd0b4631ae47d3a9f5dce59d2 100644 --- a/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php +++ b/typo3/sysext/recordlist/Classes/Browser/DatabaseBrowser.php @@ -218,7 +218,7 @@ class DatabaseBrowser extends AbstractElementBrowser implements ElementBrowserIn if (in_array('pages', $tablesArr, true)) { $out .= '<span data-uid="' . htmlspecialchars($mainPageRecord['uid']) . '" data-table="pages" data-title="' . htmlspecialchars($mainPageRecord['title']) . '" data-icon="">'; $out .= '<a href="#" data-close="0">' - . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() + . $this->iconFactory->getIcon('actions-add', Icon::SIZE_SMALL)->render() . '</a>' . '<a href="#" data-close="1">' . $pText diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php index e426cec5357bd538e7440d352e996364ff4de6b9..674318f066b9e40638755c6acfa5c100370cfe55 100644 --- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php +++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php @@ -302,7 +302,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf ]; if ($this->fileIsSelectableInFileList($fileObject, $imgInfo)) { $ATag = '<a href="#" class="btn btn-default" title="' . htmlspecialchars($fileObject->getName()) . '" data-file-index="' . htmlspecialchars($filesIndex) . '" data-close="0">'; - $ATag .= '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>'; + $ATag .= '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-add', Icon::SIZE_SMALL)->render() . '</span>'; $ATag_alt = '<a href="#" title="' . htmlspecialchars($fileObject->getName()) . '" data-file-index="' . htmlspecialchars($filesIndex) . '" data-close="1">'; $ATag_e = '</a>'; $bulkCheckBox = '<label class="btn btn-default btn-checkbox"><input type="checkbox" class="typo3-bulk-item" name="file_' . $filesIndex . '" value="0" /><span class="t3-icon fa"></span></label>'; diff --git a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php index b5106181387ad260045131654b2813928123508e..32351e428db85491be386bb2e13ae9c0f7c191d0 100644 --- a/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php +++ b/typo3/sysext/recordlist/Classes/Browser/FolderBrowser.php @@ -176,7 +176,7 @@ class FolderBrowser extends AbstractElementBrowser implements ElementBrowserInte $lines[] = ' <tr> <td nowrap="nowrap">' . $foldernameAndIcon . ' </td> - <td>' . $aTag . '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>' . $aTag_e . '</td> + <td>' . $aTag . '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-add', Icon::SIZE_SMALL)->render() . '</span>' . $aTag_e . '</td> <td> </td> </tr>'; $lines[] = ' diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php index 8e2ed44bd895145fbb4c25d7a32241adf4ef9830..a0b3217212fc61b7434ef73ea4a38cf7be0cbe6f 100644 --- a/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php +++ b/typo3/sysext/rtehtmlarea/Classes/ImageHandler/AddImageHandler.php @@ -387,7 +387,7 @@ class AddImageHandler implements LinkParameterProviderInterface, LinkHandlerInte <tr class="file_list_normal"> <td class="col-title" nowrap="nowrap">' . $filenameAndIcon . ' </td> <td class="col-control"> - <div class="btn-group">' . $ATag . '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-edit-add', Icon::SIZE_SMALL)->render() . '</span>' . $ATag_e . ' + <div class="btn-group">' . $ATag . '<span title="' . htmlspecialchars($lang->getLL('addToList')) . '">' . $this->iconFactory->getIcon('actions-add', Icon::SIZE_SMALL)->render() . '</span>' . $ATag_e . ' <a href="' . htmlspecialchars($Ahref) . '" class="btn btn-default" title="' . htmlspecialchars($lang->getLL('info')) . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL) . '</a> </td> <td class="col-clipboard" valign="top">' . $bulkCheckBox . '</td>