[TASK] Replace icon by the IconFactory actions-system-refresh 81/43081/2
authorFrank Nägler <frank.naegler@typo3.org>
Mon, 7 Sep 2015 08:04:49 +0000 (10:04 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Mon, 7 Sep 2015 16:03:53 +0000 (18:03 +0200)
Resolves: #69576
Releases: master
Change-Id: If7c7f97bbfaccec32bf06374c2333f544bc036f5
Reviewed-on: http://review.typo3.org/43081
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php

index 4a4012f..cd423ed 100644 (file)
@@ -19,6 +19,8 @@ use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Backend\Tree\View\ElementBrowserFolderTreeView;
 use TYPO3\CMS\Backend\Utility\IconUtility;
 use TYPO3\CMS\Core\Http\ControllerInterface;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Filelist\FileListFolderTree;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
@@ -222,8 +224,9 @@ class FileSystemNavigationFrameController implements ControllerInterface {
                        'csh' => '',
                        'refresh' => ''
                );
+               $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
                // Refresh
-               $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
+               $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '">' . $iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</a>';
                // CSH
                $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', BackendUtility::cshItem('xMOD_csh_corebe', 'filetree'));
                return $buttons;
index b4831d5..1918c11 100644 (file)
@@ -18,6 +18,8 @@ use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Backend\Utility\IconUtility;
 use TYPO3\CMS\Backend\View\PageTreeView;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
@@ -221,11 +223,12 @@ class PageTreeNavigationController {
                        'new_page' => '',
                        'refresh' => ''
                );
+               $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
                // New Page
                $onclickNewPageWizard = 'top.content.list_frame.location.href=' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('db_new', ['pagesOnly' => 1, 'id' => ''])) . '+Tree.pageID;';
                $buttons['new_page'] = '<a href="#" onclick="' . $onclickNewPageWizard . '" title="' . $this->getLanguageService()->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:newPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
                // Refresh
-               $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.refresh', TRUE) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
+               $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.refresh', TRUE) . '">' . $iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL)->render() . '</a>';
                // CSH
                $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', BackendUtility::cshItem('xMOD_csh_corebe', 'pagetree'));
                return $buttons;
index 015a918..5fd9ef6 100644 (file)
@@ -228,7 +228,9 @@ class TableController extends AbstractWizardController implements \TYPO3\CMS\Cor
                                . $this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL)
                                . '</button>';
                        // Reload
-                       $buttons['reload'] = IconUtility::getSpriteIcon('actions-system-refresh', array('html' => '<button class="c-inputButton" name="_refresh" value="1"></button>', 'title' => $this->getLanguageService()->getLL('forms_refresh', TRUE)));
+                       $buttons['reload'] = '<button class="c-inputButton" name="_refresh" value="1" title="' . $this->getLanguageService()->getLL('forms_refresh', TRUE) . '">'
+                               . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL)
+                               . '</button>';
                }
                return $buttons;
        }
index 2430dd8..4a7fb69 100644 (file)
@@ -274,7 +274,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                        // Save & Close
                        $buttons['save_close'] = '<button class="c-inputButton" name="saveandclosedok" value="1" title=' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveCloseDoc', TRUE) . '>' . $this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL) . '</button>';
                        // Reload
-                       $buttons['reload'] = '<button class="c-inputButton" name="_refresh" value="1">' . IconUtility::getSpriteIcon('actions-system-refresh', array('title' => $this->getLanguageService()->getLL('forms_refresh', TRUE))) . '</button>';
+                       $buttons['reload'] = '<button class="c-inputButton" name="_refresh" value="1" title="' . $this->getLanguageService()->getLL('forms_refresh', TRUE) . '">' . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</button>';
                }
                return $buttons;
        }
index 47650eb..e53b5e1 100644 (file)
@@ -284,7 +284,7 @@ class FileList extends AbstractRecordList {
                        }
 
                }
-               $buttons['refresh'] = '<a href="' . htmlspecialchars($this->listURL()) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload', TRUE) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
+               $buttons['refresh'] = '<a href="' . htmlspecialchars($this->listURL()) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload', TRUE) . '">' . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</a>';
                return array($buttons, $otherMarkers);
        }
 
@@ -1033,4 +1033,4 @@ class FileList extends AbstractRecordList {
                return $GLOBALS['BE_USER'];
        }
 
-}
\ No newline at end of file
+}
index 02e0e89..cc755f7 100644 (file)
@@ -311,7 +311,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                        // Reload
                        $buttons['reload'] = '<a href="' . htmlspecialchars($this->listURL()) . '" title="'
                                . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload', TRUE) . '">'
-                               . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
+                               . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</a>';
                        // Shortcut
                        if ($backendUser->mayMakeShortcut()) {
                                $buttons['shortcut'] = $this->getDocumentTemplate()->makeShortcutIcon(
@@ -1138,7 +1138,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                        . '&pointer=\'+calculatePointer(document.getElementById(\'jumpPage-' . $renderPart
                        . '\').value); document.dblistForm.submit(); return true;" title="'
                        . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:reload', TRUE) . '">'
-                       . IconUtility::getSpriteIcon('actions-system-refresh') . '</a></li>';
+                       . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</a></li>';
                if ($renderPart === 'top') {
                        // Add js to traverse a page select input to a pointer value
                        $content = '
index 2d77dda..a5f996b 100644 (file)
@@ -1522,7 +1522,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                        'shortcut' => $this->getShortcutButton()
                );
                if (empty($this->CMD) || $this->CMD === 'list' || $this->CMD === 'delete' || $this->CMD === 'stop' || $this->CMD === 'toggleHidden') {
-                       $buttons['reload'] = '<a href="' . htmlspecialchars($this->moduleUri) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload', TRUE) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
+                       $buttons['reload'] = '<a href="' . htmlspecialchars($this->moduleUri) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.reload', TRUE) . '">' . $this->iconFactory->getIcon('actions-system-refresh', Icon::SIZE_SMALL) . '</a>';
                        if ($this->MOD_SETTINGS['function'] === 'scheduler' && !empty($this->getRegisteredClasses())) {
                                $link = $this->moduleUri . '&CMD=add';
                                $image = $this->iconFactory->getIcon('actions-document-new', Icon::SIZE_SMALL);