[TASK] Replace icon by IconFactory: actions-page-move 77/43077/2
authorBenjamin Kott <benjamin.kott@outlook.com>
Sun, 6 Sep 2015 21:28:54 +0000 (23:28 +0200)
committerFrank Nägler <frank.naegler@typo3.org>
Mon, 7 Sep 2015 11:35:57 +0000 (13:35 +0200)
Resolves: #69570
Releases: master
Change-Id: Ie1a3a7cb57f740474ae678831b464c8aed69ae4a
Reviewed-on: http://review.typo3.org/43077
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
Build/Gruntfile.js
Build/Resources/Private/Icons/Action/actions-page-move.svg [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Icons/Action/actions-page-move.svg [new file with mode: 0644]
typo3/sysext/core/Classes/Imaging/IconRegistry.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
typo3/sysext/t3skin/Classes/Slot/IconStyleModifier.php

index 5904dc8..b7b6250 100644 (file)
@@ -140,6 +140,7 @@ module.exports = function(grunt) {
                                        '<%= paths.backend %>Public/Icons/Action/actions-document-save-translation.svg': '<%= paths.icons %>Action/actions-document-save-translation.svg',
                                        '<%= paths.backend %>Public/Icons/Action/actions-document-save-view.svg': '<%= paths.icons %>Action/actions-document-save-view.svg',
                                        '<%= paths.backend %>Public/Icons/Action/actions-document-save.svg': '<%= paths.icons %>Action/actions-document-save.svg',
+                                       '<%= paths.backend %>Public/Icons/Action/actions-page-move.svg': '<%= paths.icons %>Action/actions-page-move.svg',
                                        '<%= paths.backend %>Public/Icons/Action/actions-page-open.svg': '<%= paths.icons %>Action/actions-page-open.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',
diff --git a/Build/Resources/Private/Icons/Action/actions-page-move.svg b/Build/Resources/Private/Icons/Action/actions-page-move.svg
new file mode 100644 (file)
index 0000000..3f4febd
--- /dev/null
@@ -0,0 +1,17 @@
+<?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="actions-page-move">
+       <path d="M8.39,14H3V2h6v3.5C9,5.78,9.22,6,9.5,6H13v1.44l1,0.95V5.25c0-0.41-0.24-0.99-0.53-1.28l-2.44-2.44
+               C10.74,1.24,10.16,1,9.75,1H2.5C2.22,1,2,1.22,2,1.5v13C2,14.78,2.22,15,2.5,15h6.94L8.39,14z M10,2.06
+               c0.13,0.05,0.27,0.12,0.32,0.17l2.45,2.45c0.05,0.05,0.13,0.19,0.17,0.32H10V2.06z"/>
+       <path d="M15.9,11.75l-1.33-1.4c-0.06-0.07-0.15-0.1-0.23-0.1c-0.18,0-0.33,0.16-0.33,0.35V11h-1v-1h0.4
+               c0.19,0,0.35-0.15,0.35-0.33c0-0.09-0.04-0.17-0.1-0.23l-1.4-1.33C12.18,8.04,12.09,8,12,8s-0.18,0.04-0.25,0.1l-1.4,1.33
+               c-0.07,0.06-0.1,0.15-0.1,0.23c0,0.18,0.16,0.33,0.35,0.33H11v1h-1v-0.4c0-0.19-0.15-0.35-0.33-0.35c-0.09,0-0.17,0.04-0.23,0.1
+               l-1.33,1.4C8.04,11.82,8,11.91,8,12s0.04,0.18,0.1,0.25l1.33,1.4c0.06,0.07,0.15,0.1,0.23,0.1c0.18,0,0.33-0.16,0.33-0.35V13h1v1
+               h-0.4c-0.19,0-0.35,0.15-0.35,0.33c0,0.09,0.04,0.17,0.1,0.23l1.4,1.33C11.82,15.96,11.91,16,12,16s0.18-0.04,0.25-0.1l1.4-1.33
+               c0.07-0.06,0.1-0.15,0.1-0.23c0-0.18-0.16-0.33-0.35-0.33H13v-1h1v0.4c0,0.19,0.15,0.35,0.33,0.35c0.09,0,0.17-0.04,0.23-0.1
+               l1.33-1.4C15.96,12.18,16,12.09,16,12S15.96,11.82,15.9,11.75z"/>
+</g>
+</svg>
diff --git a/typo3/sysext/backend/Resources/Public/Icons/Action/actions-page-move.svg b/typo3/sysext/backend/Resources/Public/Icons/Action/actions-page-move.svg
new file mode 100644 (file)
index 0000000..c7698ad
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M8.39 14H3V2h6v3.5c0 .28.22.5.5.5H13v1.44l1 .95V5.25c0-.41-.24-.99-.53-1.28l-2.44-2.44c-.29-.29-.87-.53-1.28-.53H2.5c-.28 0-.5.22-.5.5v13c0 .28.22.5.5.5h6.94l-1.05-1zM10 2.06c.13.05.27.12.32.17l2.45 2.45c.05.05.13.19.17.32H10V2.06z"/><path d="M15.9 11.75l-1.33-1.4c-.06-.07-.15-.1-.23-.1-.18 0-.33.16-.33.35v.4h-1v-1h.4c.19 0 .35-.15.35-.33 0-.09-.04-.17-.1-.23l-1.4-1.33C12.18 8.04 12.09 8 12 8s-.18.04-.25.1l-1.4 1.33c-.07.06-.1.15-.1.23 0 .18.16.33.35.33h.4v1h-1v-.4c0-.19-.15-.35-.33-.35-.09 0-.17.04-.23.1l-1.33 1.4c-.07.08-.11.17-.11.26s.04.18.1.25l1.33 1.4c.06.07.15.1.23.1.18 0 .33-.16.33-.35V13h1v1h-.4c-.19 0-.35.15-.35.33 0 .09.04.17.1.23l1.4 1.33c.08.07.17.11.26.11s.18-.04.25-.1l1.4-1.33c.07-.06.1-.15.1-.23 0-.18-.16-.33-.35-.33H13v-1h1v.4c0 .19.15.35.33.35.09 0 .17-.04.23-.1l1.33-1.4c.07-.08.11-.17.11-.26s-.04-.18-.1-.25z"/></svg>
\ No newline at end of file
index 70b9d8c..6465a5a 100644 (file)
@@ -316,6 +316,12 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
                                'name' => 'square-o',
                        )
                ),
+               'actions-page-move' => array(
+                       'provider' => SvgIconProvider::class,
+                       'options' => array(
+                               'source' => 'EXT:backend/Resources/Public/Icons/Action/actions-page-move.svg',
+                       )
+               ),
                'actions-page-open' => array(
                        'provider' => SvgIconProvider::class,
                        'options' => array(
index ec182d3..02e0e89 100644 (file)
@@ -1259,7 +1259,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                if ($permsEdit && ($table === 'tt_content' || $table === 'pages')) {
                        $onClick = 'return jumpExt(\'' . BackendUtility::getModuleUrl('move_element') . '&table=' . $table . '&uid=' . $row['uid'] . '\');';
                        $linkTitleLL = $this->getLanguageService()->getLL('move_' . ($table === 'tt_content' ? 'record' : 'page'), TRUE);
-                       $icon = ($table == 'pages' ? IconUtility::getSpriteIcon('actions-page-move') : $this->iconFactory->getIcon('actions-document-move', Icon::SIZE_SMALL));
+                       $icon = ($table == 'pages' ? $this->iconFactory->getIcon('actions-page-move', Icon::SIZE_SMALL) : $this->iconFactory->getIcon('actions-document-move', Icon::SIZE_SMALL));
                        $moveAction = '<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $linkTitleLL . '">' . $icon . '</a>';
                        $this->addActionToCellGroup($cells, $moveAction, 'move');
                }
index bc7ac84..043a505 100644 (file)
@@ -62,7 +62,6 @@ class IconStyleModifier {
                't3-icon t3-icon-actions t3-icon-actions-move t3-icon-move-to-top t3-btn t3-btn-moveoption-top' => 'fa-angle-double-up t3-btn t3-btn-moveoption-top',
                't3-icon t3-icon-actions t3-icon-actions-move t3-icon-move-up t3-btn t3-btn-moveoption-up' => 'fa-angle-up t3-btn t3-btn-moveoption-up',
                't3-icon t3-icon-actions t3-icon-actions-move t3-icon-move-up' => 'fa-angle-up',
-               't3-icon t3-icon-actions t3-icon-actions-page t3-icon-page-move' => 'fa-arrows',
                't3-icon t3-icon-actions t3-icon-actions-page t3-icon-page-new' => 'fa-plus-square',
                // @todo t3-btn-* is still used in FormEngine.js refactor to use data attributes in HTML
                't3-icon t3-icon-actions t3-icon-actions-selection t3-icon-selection-delete t3-btn t3-btn-removeoption' => 'fa-times t3-btn t3-btn-removeoption',