From ec44b0f930d5c2f5ed99bcd1996e732b5a5e96fd Mon Sep 17 00:00:00 2001 From: Markus Guenther Date: Sat, 8 Aug 2015 18:35:07 +0200 Subject: [PATCH] [TASK] Replace sprite icon "actions-document-select" with the new IconFactory Replaces all IconUtility::getSpriteIcon calls for the icon actions-document-select with the new IconFactory. Change-Id: Ibbaef99faf0b3103ce526ad849d677162e8ce7f3 Resolves: #68870 Releases: master Reviewed-on: http://review.typo3.org/42418 Reviewed-by: Stefan Neufeind Tested-by: Stefan Neufeind Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters --- typo3/sysext/core/Classes/Imaging/IconRegistry.php | 7 ++++++- typo3/sysext/core/ext_tables.php | 4 ++-- typo3/sysext/filelist/Classes/FileList.php | 2 +- typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php | 4 ++-- .../recordlist/Classes/RecordList/DatabaseRecordList.php | 2 +- .../Classes/Controller/SchedulerModuleController.php | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php index 3201b68d878f..8f2b6b3bad0d 100644 --- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php +++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php @@ -80,7 +80,6 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface { 'name' => 'arrows', ) ), - 'actions-document-new' => array( 'provider' => FontawesomeIconProvider::class, 'options' => array( @@ -99,6 +98,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface { 'name' => 'clipboard', ) ), + 'actions-document-select' => array( + 'provider' => FontawesomeIconProvider::class, + 'options' => array( + 'name' => 'check-square-o', + ) + ), 'actions-document-view' => array( 'provider' => FontawesomeIconProvider::class, 'options' => array( diff --git a/typo3/sysext/core/ext_tables.php b/typo3/sysext/core/ext_tables.php index d65f3683a904..d5046959f2f3 100644 --- a/typo3/sysext/core/ext_tables.php +++ b/typo3/sysext/core/ext_tables.php @@ -193,10 +193,10 @@ $GLOBALS['TBE_STYLES']['spriteIconApi']['coreSpriteImageNames'] = array( 'actions-document-paste-after', 'actions-document-paste-into', 'actions-document-save', - 'actions-document-save-cleartranslationcache', + 'actions-document-save-cleartranslationcache', // Not used in core! 'actions-document-save-close', 'actions-document-save-new', - 'actions-document-save-translation', + 'actions-document-save-translation', // Not used in core! 'actions-document-save-view', 'actions-document-select', 'actions-document-synchronize', diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php index aeed3173356c..a5854a418053 100644 --- a/typo3/sysext/filelist/Classes/FileList.php +++ b/typo3/sysext/filelist/Classes/FileList.php @@ -423,7 +423,7 @@ class FileList extends AbstractRecordList { $cells[] = $this->linkClipboardHeaderIcon(IconUtility::getSpriteIcon('actions-edit-copy', array('title' => $this->getLanguageService()->getLL('clip_selectMarked', TRUE))), $table, 'setCB'); $cells[] = $this->linkClipboardHeaderIcon(IconUtility::getSpriteIcon('actions-edit-delete', array('title' => $this->getLanguageService()->getLL('clip_deleteMarked'))), $table, 'delete', $this->getLanguageService()->getLL('clip_deleteMarkedWarning')); $onClick = 'checkOffCB(\'' . implode(',', $this->CBnames) . '\', this); return false;'; - $cells[] = '' . IconUtility::getSpriteIcon('actions-document-select') . ''; + $cells[] = '' . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . ''; } $theData[$v] = implode('', $cells); } else { diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php index d1b15371a7cd..d75a296b16bd 100755 --- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php +++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php @@ -2546,8 +2546,8 @@ class ElementBrowser { . 'title="' . $labelImportSelection . '">' . $this->iconFactory->getIcon('actions-document-import-t3d', Icon::SIZE_SMALL) . $labelImportSelection . '   ' - . '' - . IconUtility::getSpriteIcon('actions-document-select', array('title' => $labelToggleSelection)) + . '' + . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . $labelToggleSelection . '' . ''; if (!$noThumbsInEB && $this->selectedFolder) { // MENU-ITEMS, fetching the setting for thumbnails from File>List module: diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php index 1e6a86eb8cec..7b091138bd58 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php @@ -946,7 +946,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList { $onClick = htmlspecialchars(('checkOffCB(\'' . implode(',', $this->CBnames) . '\', this); return false;')); $cells['markAll'] = '' - . IconUtility::getSpriteIcon('actions-document-select') . ''; + . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . ''; } else { $cells['empty'] = ''; } diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php index 944fe846dbe0..6e0a8b61ed1f 100644 --- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php +++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php @@ -919,7 +919,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas // Header row $table[] = '' - . '' . IconUtility::getSpriteIcon('actions-document-select') . '' + . '' . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . '' . '' . $this->getLanguageService()->getLL('label.id', TRUE). '' . '' . $this->getLanguageService()->getLL('task', TRUE). '' . '' . $this->getLanguageService()->getLL('label.type', TRUE). '' -- 2.20.1