[FOLLOWUP][TASK] Replace sprite icon "actions-edit-delete" with the new IconFactory 95/43195/2
authorMorton Jonuschat <m.jonuschat@mojocode.de>
Fri, 11 Sep 2015 12:54:55 +0000 (14:54 +0200)
committerFrank Nägler <frank.naegler@typo3.org>
Fri, 11 Sep 2015 14:40:29 +0000 (16:40 +0200)
Replaces all IconUtility::getSpriteIcon calls for the icon
actions-edit-delete with the new IconFactory.

Resolves: #69670
Releases: master
Change-Id: I719f8d78c0c9c5623f793e9d469f5595cc54127d
Reviewed-on: http://review.typo3.org/43195
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
typo3/sysext/feedit/Classes/FrontendEditPanel.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php

index 5899d77..ac5efa8 100644 (file)
@@ -145,7 +145,9 @@ class FrontendEditPanel {
                // Hiding in workspaces because implementation is incomplete
                // Hiding for localizations because it is unknown what should be the function in that case
                if (isset($allow['delete']) && $this->backendUser->workspace === 0 && !$dataArr['_LOCALIZED_UID']) {
-                       $icon = IconUtility::getSpriteIcon('actions-edit-delete', array('title' => $this->backendUser->extGetLL('p_delete')));
+                       $icon = '<span title="' . htmlspecialchars($this->backendUser->extGetLL('p_delete')) . '">'
+                               . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)
+                               . '</span>';
                        $panel .= $this->editPanelLinkWrap($icon, $formName, 'delete', '', $this->backendUser->extGetLL('p_deleteConfirm'));
                }
                // Final
index 7b88644..57b136e 100644 (file)
@@ -422,7 +422,7 @@ class FileList extends AbstractRecordList {
                                        }
                                        if ($this->clipObj->current !== 'normal' && $iOut) {
                                                $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'));
+                                               $cells[] = $this->linkClipboardHeaderIcon('<span title="' . $this->getLanguageService()->getLL('clip_deleteMarked', TRUE) . '">' . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL), $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) . '">' . $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL) . '</a>';
                                        }
index 87aaafd..e723683 100644 (file)
@@ -939,7 +939,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                                                        . $this->iconFactory->getIcon('actions-document-open', Icon::SIZE_SMALL) . '</a>';
                                                // The "Delete marked" link:
                                                $cells['delete'] = $this->linkClipboardHeaderIcon(
-                                                       IconUtility::getSpriteIcon('actions-edit-delete', array('title' => $lang->getLL('clip_deleteMarked', TRUE))),
+                                                       '<span title="' . $lang->getLL('clip_deleteMarked', TRUE) . '">' . $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL) . '</span>',
                                                        $table,
                                                        'delete',
                                                        sprintf($lang->getLL('clip_deleteMarkedWarning'), $lang->sL($GLOBALS['TCA'][$table]['ctrl']['title']))