[TASK] Replace icon by IconFactory: actions-system-help-open 60/43060/2
authorBenjamin Kott <benjamin.kott@outlook.com>
Sat, 5 Sep 2015 20:14:40 +0000 (22:14 +0200)
committerFrans Saris <franssaris@gmail.com>
Sat, 5 Sep 2015 20:42:35 +0000 (22:42 +0200)
Resolves: #69555
Releases: master
Change-Id: I1f12490509f6b3512ad4358fd407b840db8ec3ac
Reviewed-on: http://review.typo3.org/43060
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Frans Saris <franssaris@gmail.com>
Tested-by: Frans Saris <franssaris@gmail.com>
Build/Gruntfile.js
Build/Resources/Private/Icons/Action/actions-system-help-open.svg [new file with mode: 0644]
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Resources/Public/Icons/Action/actions-system-help-open.svg [new file with mode: 0644]
typo3/sysext/core/Classes/Imaging/IconRegistry.php
typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php

index fc106a3..8995453 100644 (file)
@@ -138,7 +138,8 @@ module.exports = function(grunt) {
                                        '<%= paths.backend %>Public/Icons/Action/actions-document-save.svg': '<%= paths.icons %>Action/actions-document-save.svg',
                                        '<%= paths.backend %>Public/Icons/Action/actions-system-cache-clear-impact-high.svg': '<%= paths.icons %>Action/actions-system-cache-clear-impact-high.svg',
                                        '<%= paths.backend %>Public/Icons/Action/actions-system-cache-clear-impact-low.svg': '<%= paths.icons %>Action/actions-system-cache-clear-impact-low.svg',
-                                       '<%= paths.backend %>Public/Icons/Action/actions-system-cache-clear-impact-medium.svg': '<%= paths.icons %>Action/actions-system-cache-clear-impact-medium.svg'
+                                       '<%= paths.backend %>Public/Icons/Action/actions-system-cache-clear-impact-medium.svg': '<%= paths.icons %>Action/actions-system-cache-clear-impact-medium.svg',
+                                       '<%= paths.backend %>Public/Icons/Action/actions-system-help-open.svg': '<%= paths.icons %>Action/actions-system-help-open.svg'
                                }
                        },
                        // Avatar Icons
diff --git a/Build/Resources/Private/Icons/Action/actions-system-help-open.svg b/Build/Resources/Private/Icons/Action/actions-system-help-open.svg
new file mode 100644 (file)
index 0000000..f05b646
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+        viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g id="help-open">
+       <path d="M8,15c-3.86,0-7-3.14-7-7s3.14-7,7-7c3.86,0,7,3.14,7,7S11.86,15,8,15z M8.18,3.33c-1.49,0-2.6,0.64-3.38,1.94
+               C4.72,5.4,4.76,5.57,4.87,5.66l1.2,0.91c0.05,0.04,0.11,0.05,0.17,0.05c0.08,0,0.17-0.04,0.23-0.11C6.91,5.97,7.09,5.8,7.26,5.68
+               c0.15-0.11,0.46-0.22,0.78-0.22c0.58,0,1.12,0.37,1.12,0.78c0,0.47-0.25,0.71-0.8,0.97C7.72,7.49,6.83,8.25,6.83,9.13v0.33
+               c0,0.16,0.13,0.29,0.29,0.29h1.75c0.16,0,0.29-0.13,0.29-0.29c0-0.21,0.26-0.66,0.69-0.9c0.69-0.39,1.64-0.92,1.64-2.31
+               C11.5,4.58,9.75,3.33,8.18,3.33z M9.17,10.62c0-0.16-0.13-0.29-0.29-0.29H7.13c-0.16,0-0.29,0.13-0.29,0.29v1.75
+               c0,0.16,0.13,0.29,0.29,0.29h1.75c0.16,0,0.29-0.13,0.29-0.29V10.62z"/>
+</g>
+</svg>
index 9b8ffd3..f564c4d 100755 (executable)
@@ -24,6 +24,8 @@ use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Database\PreparedStatement;
 use TYPO3\CMS\Core\Database\RelationHandler;
 use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
+use TYPO3\CMS\Core\Imaging\Icon;
+use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
 use TYPO3\CMS\Core\Resource\File;
@@ -2740,7 +2742,9 @@ class BackendUtility {
                if ((!empty($helpText) || $hasHelpTextOverload) && ExtensionManagementUtility::isLoaded('cshmanual')) {
                        // If no text was given, just use the regular help icon
                        if ($text == '') {
-                               $text = IconUtility::getSpriteIcon('actions-system-help-open');
+                               /** @var IconFactory $iconFactory */
+                               $iconFactory = GeneralUtility::makeInstance(IconFactory::class);
+                               $text = $iconFactory->getIcon('actions-system-help-open', Icon::SIZE_SMALL);
                                $abbrClassAdd = '-icon';
                        }
                        $text = '<abbr class="t3-help-teaser' . $abbrClassAdd . '">' . $text . '</abbr>';
diff --git a/typo3/sysext/backend/Resources/Public/Icons/Action/actions-system-help-open.svg b/typo3/sysext/backend/Resources/Public/Icons/Action/actions-system-help-open.svg
new file mode 100644 (file)
index 0000000..7d57220
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M8 15c-3.86 0-7-3.14-7-7s3.14-7 7-7 7 3.14 7 7-3.14 7-7 7zm.18-11.67c-1.49 0-2.6.64-3.38 1.94-.08.13-.04.3.07.39l1.2.91c.05.04.11.05.17.05.08 0 .17-.04.23-.11.44-.54.62-.71.79-.83.15-.11.46-.22.78-.22.58 0 1.12.37 1.12.78 0 .47-.25.71-.8.97-.64.28-1.53 1.04-1.53 1.92v.33c0 .16.13.29.29.29h1.75c.16 0 .29-.13.29-.29 0-.21.26-.66.69-.9.69-.39 1.64-.92 1.64-2.31.01-1.67-1.74-2.92-3.31-2.92zm.99 7.29c0-.16-.13-.29-.29-.29H7.13c-.16 0-.29.13-.29.29v1.75c0 .16.13.29.29.29h1.75c.16 0 .29-.13.29-.29v-1.75z"/></svg>
\ No newline at end of file
index 977196e..f61165c 100644 (file)
@@ -328,6 +328,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                                'source' => 'EXT:backend/Resources/Public/Icons/Action/actions-system-cache-clear-impact-high.svg',
                        )
                ),
+               'actions-system-help-open' => array(
+                       'provider' => SvgIconProvider::class,
+                       'options' => array(
+                               'source' => 'EXT:backend/Resources/Public/Icons/Action/actions-system-help-open.svg',
+                       )
+               ),
                'actions-system-extension-configure' => array(
                        'provider' => FontawesomeIconProvider::class,
                        'options' => array(
index f65d964..14fa99c 100644 (file)
@@ -81,7 +81,6 @@ class IconStyleModifier {
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-sqldump' => 'fa-database',
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-update' => 'fa-refresh',
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-extension-uninstall' => 'fa-minus-square',
-               't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-help-open' => 'fa-question-circle',
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-list-open' => 'fa-list-alt',
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-refresh' => 'fa-refresh',
                't3-icon t3-icon-actions t3-icon-actions-system t3-icon-system-shortcut-new' => 'fa-star',