[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 <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>

diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
index 3201b68..8f2b6b3 100644 (file)
--- 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',
                        )
                ),
                                'name' => 'arrows',
                        )
                ),

-

                'actions-document-new' => array(
                        'provider' => FontawesomeIconProvider::class,
                        'options' => array(
                'actions-document-new' => array(
                        'provider' => FontawesomeIconProvider::class,
                        'options' => array(


@@ -99,6 +98,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                                'name' => 'clipboard',
                        )
                ),
                                'name' => 'clipboard',
                        )
                ),

+               'actions-document-select' => array(
+                       'provider' => FontawesomeIconProvider::class,
+                       'options' => array(
+                               'name' => 'check-square-o',
+                       )
+               ),

                'actions-document-view' => array(
                        'provider' => FontawesomeIconProvider::class,
                        'options' => array(
                '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 d65f368..d504695 100644 (file)
--- 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-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-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',
        '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 aeed317..a5854a4 100644 (file)
--- 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[] = $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[] = '<a class="btn btn-default" rel="" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $this->getLanguageService()->getLL('clip_markRecords', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-select') . '</a>';
+                                               $cells[] = '<a class="btn btn-default" rel="" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $this->getLanguageService()->getLL('clip_markRecords', TRUE) . '">' . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . '</a>';

                                        }
                                        $theData[$v] = implode('', $cells);
                                } else {
                                        }
                                        $theData[$v] = implode('', $cells);
                                } else {

diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index d1b1537..d75a296 100755 (executable)
--- 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 . '</a>&nbsp;&nbsp;&nbsp;'
                        . 'title="' . $labelImportSelection . '">'
                        . $this->iconFactory->getIcon('actions-document-import-t3d', Icon::SIZE_SMALL)
                        . $labelImportSelection . '</a>&nbsp;&nbsp;&nbsp;'

-                       . '<a href="#" onclick="BrowseLinks.Selector.toggle()">'
-                       . IconUtility::getSpriteIcon('actions-document-select', array('title' => $labelToggleSelection))
+                       . '<a href="#" onclick="BrowseLinks.Selector.toggle()" title="' . $labelToggleSelection . '">'
+                       . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL)

                        . $labelToggleSelection . '</a>' . '</div>';
                if (!$noThumbsInEB && $this->selectedFolder) {
                        // MENU-ITEMS, fetching the setting for thumbnails from File>List module:
                        . $labelToggleSelection . '</a>' . '</div>';
                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 1e6a86e..7b09113 100644 (file)
--- 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'] = '<a class="btn btn-default" rel="" href="#" onclick="' . $onClick . '" title="'
                                                        . $lang->getLL('clip_markRecords', TRUE) . '">'
                                                $onClick = htmlspecialchars(('checkOffCB(\'' . implode(',', $this->CBnames) . '\', this); return false;'));
                                                $cells['markAll'] = '<a class="btn btn-default" rel="" href="#" onclick="' . $onClick . '" title="'
                                                        . $lang->getLL('clip_markRecords', TRUE) . '">'

-                                                       . IconUtility::getSpriteIcon('actions-document-select') . '</a>';
+                                                       . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . '</a>';

                                        } else {
                                                $cells['empty'] = '';
                                        }
                                        } else {
                                                $cells['empty'] = '';
                                        }

diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 944fe84..6e0a8b6 100644 (file)
--- 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[] =
                                '<thead><tr>'
                        // Header row
                        $table[] =
                                '<thead><tr>'

-                                       . '<th><a href="#" id="checkall" title="' . $this->getLanguageService()->getLL('label.checkAll', TRUE) . '" class="icon">' . IconUtility::getSpriteIcon('actions-document-select') . '</a></th>'
+                                       . '<th><a href="#" id="checkall" title="' . $this->getLanguageService()->getLL('label.checkAll', TRUE) . '" class="icon">' . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . '</a></th>'

                                        . '<th>' . $this->getLanguageService()->getLL('label.id', TRUE). '</th>'
                                        . '<th>' . $this->getLanguageService()->getLL('task', TRUE). '</th>'
                                        . '<th>' . $this->getLanguageService()->getLL('label.type', TRUE). '</th>'
                                        . '<th>' . $this->getLanguageService()->getLL('label.id', TRUE). '</th>'
                                        . '<th>' . $this->getLanguageService()->getLL('task', TRUE). '</th>'
                                        . '<th>' . $this->getLanguageService()->getLL('label.type', TRUE). '</th>'