[TASK] Replace icon by IconFactory: actions-system-shortcut-new 72/43072/5
authorJan Helke <typo3@helke.de>
Sun, 6 Sep 2015 16:36:13 +0000 (18:36 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 10 Sep 2015 06:50:29 +0000 (08:50 +0200)
Releases: master
Resolves: #69564
Change-Id: I9d48093731539e51e3a129c83b698aaa9389deda
Reviewed-on: http://review.typo3.org/43072
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
typo3/sysext/backend/Classes/Template/DocumentTemplate.php
typo3/sysext/core/Classes/Imaging/IconRegistry.php

index e1701fe..166f5bb 100644 (file)
@@ -181,7 +181,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface {
                if (count($shortcutMenu) === 2) {
                        // No shortcuts added yet, show a small help message how to add shortcuts
                        $title = $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.bookmarks', TRUE);
-                       $icon = '<span title="' . $title . '">' . $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL) . '</span>';
+                       $icon = '<span title="' . $title . '">' . $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render() . '</span>';
                        $label = str_replace('%icon%', $icon, $languageService->sL('LLL:EXT:lang/locallang_misc.xlf:bookmarkDescription'));
                        $compiledShortcutMenu = '<p>' . $label . '</p>';
                } else {
index 45ccae6..e1380ab 100644 (file)
@@ -666,9 +666,10 @@ function jumpToUrl(URL) {
                $shortcutUrl = $pathInfo['path'] . '?' . $storeUrl;
                $shortcutExist = BackendUtility::shortcutExists($shortcutUrl);
 
+               $icon = '<span>' . $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL)->render() . '</span>';
+
                if ($shortcutExist) {
-                       return '<a class="active" title="">' .
-                       $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL) . '</a>';
+                       return '<a class="active" title="">' . $icon . '</a>';
                }
 
                $url = GeneralUtility::quoteJSvalue(rawurlencode($shortcutUrl));
@@ -676,8 +677,7 @@ function jumpToUrl(URL) {
                        ', ' . $url . ', ' . $confirmationText . ', ' . $motherModule . ', this);return false;';
 
                return '<a href="#" onclick="' . htmlspecialchars($onClick) . '" title="' .
-                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark', TRUE) . '">' .
-                       $this->iconFactory->getIcon('actions-system-shortcut-new', Icon::SIZE_SMALL) . '</a>';
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.makeBookmark', TRUE) . '">' . $icon . '</a>';
        }
 
        /**
index 986993f..cb0848f 100644 (file)
@@ -514,16 +514,16 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                                'name' => 'list-alt',
                        )
                ),
-               'actions-version-open' => array(
+               'actions-system-shortcut-new' => array(
                        'provider' => FontawesomeIconProvider::class,
                        'options' => array(
-                               'name' => 'refresh',
+                               'name' => 'star',
                        )
                ),
-               'actions-system-shortcut-new' => array(
-                       'provider' => BitmapIconProvider::class,
+               'actions-version-open' => array(
+                       'provider' => FontawesomeIconProvider::class,
                        'options' => array(
-                               'source' => 'EXT:t3skin/images/icons/actions/system-shortcut-new.png',
+                               'name' => 'refresh',
                        )
                ),
                'actions-system-tree-search-open' => array(