[!!!][TASK] Remove wizard icons 89/49589/8
authorGeorg Ringer <georg.ringer@gmail.com>
Thu, 25 Aug 2016 06:26:49 +0000 (08:26 +0200)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Wed, 31 Aug 2016 08:32:19 +0000 (10:32 +0200)
The following icons are removed from EXT:backend/Resources/Public/Images/FormFieldWizard/:

- wizard_add.gif
- wizard_edit.gif
- wizard_list.gif
- wizard_table.gif

The TCA migration migrates it to the proper icon fonts.
For 7.6, the patch will be applied without removing the icons.

Resolves: #77630
Resolves: #77629
Releases: master, 7.6
Change-Id: I9e73fb6d1f7197d5c35309fa98093eeee44ccb02
Reviewed-on: https://review.typo3.org/49589
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
15 files changed:
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif [deleted file]
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php
typo3/sysext/core/Classes/Imaging/IconRegistry.php
typo3/sysext/core/Classes/Migrations/TcaMigration.php
typo3/sysext/core/Configuration/TCA/sys_file_reference.php
typo3/sysext/core/Configuration/TCA/sys_news.php
typo3/sysext/core/Documentation/Changelog/master/Breaking-77630-RemoveWizardIcons.rst [new file with mode: 0644]
typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
typo3/sysext/frontend/Configuration/TCA/tt_content.php
typo3/sysext/impexp/Tests/Functional/Fixtures/Extensions/impexp_group_files/Configuration/TCA/tx_impexpgroupfiles_item.php

diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif
deleted file mode 100644 (file)
index 92b32e2..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif
deleted file mode 100644 (file)
index 0aa1cd8..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif
deleted file mode 100644 (file)
index 7bfa658..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif
deleted file mode 100644 (file)
index 84b03ef..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif
deleted file mode 100644 (file)
index 878aa92..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif
deleted file mode 100644 (file)
index a671280..0000000
Binary files a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif and /dev/null differ
index c1bb14b..94dee29 100644 (file)
@@ -190,7 +190,7 @@ class TcaFlexPrepareTest extends UnitTestCase
                                                                     'type' => 'userFunc',
                                                                     'userFunc' => 'TYPO3\\CMS\\T3editor\\FormWizard->main',
                                                                     'title' => 't3editor',
-                                                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                                                    'icon' => 'content-table',
                                                                     'module' => [
                                                                         'name' => 'wizard_table',
                                                                     ],
@@ -276,7 +276,7 @@ class TcaFlexPrepareTest extends UnitTestCase
                                                                                     'type' => 'userFunc',
                                                                                     'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                                                                     'title' => 't3editor',
-                                                                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                                                                    'icon' => 'content-table',
                                                                                     'module' => [
                                                                                         'name' => 'wizard_table',
                                                                                     ],
index 16998f4..a910ce6 100644 (file)
@@ -945,7 +945,18 @@ class IconRegistry implements SingletonInterface
                 'source' => 'EXT:core/Resources/Public/Icons/T3Icons/actions/actions-window-open.svg'
             ]
         ],
-
+        'actions-wizard-link' => [
+            'provider' => FontawesomeIconProvider::class,
+            'options' => [
+                'name' => 'link'
+            ]
+        ],
+        'actions-wizard-rte' => [
+            'provider' => FontawesomeIconProvider::class,
+            'options' => [
+                'name' => 'arrows-alt'
+            ]
+        ],
         // Apps
         'apps-clipboard-images' => [
             'provider' => SvgIconProvider::class,
index 250ce7f..776f0b2 100644 (file)
@@ -351,14 +351,6 @@ class TcaMigration
     /**
      * Migrate core icons for form field wizard to new location
      *
-     * add.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif
-     * link_popup.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif
-     * wizard_rte2.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif
-     * wizard_table.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif
-     * edit2.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif
-     * list.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif
-     * wizard_forms.gif => EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif
-     *
      * @param array $tca Incoming TCA
      * @return array Migrated TCA
      */
@@ -366,25 +358,22 @@ class TcaMigration
     {
         $newTca = $tca;
 
-        $oldFileNames = [
-            'add.gif',
-            'link_popup.gif',
-            'wizard_rte2.gif',
-            'wizard_table.gif',
-            'edit2.gif',
-            'list.gif',
-            'wizard_forms.gif',
-        ];
-
         $newFileLocations = [
-            'add.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
-            'link_popup.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
-            'wizard_rte2.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif',
-            'wizard_table.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
-            'edit2.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
-            'list.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
+            'add.gif' => 'actions-add',
+            'link_popup.gif' => 'actions-wizard-link',
+            'wizard_rte2.gif' => 'actions-wizard-rte',
+            'wizard_table.gif' => 'content-table',
+            'edit2.gif' => 'actions-open',
+            'list.gif' => 'actions-system-list-open',
             'wizard_forms.gif' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif' => 'actions-add',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif' => 'content-table',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif' => 'actions-open',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif' => 'actions-system-list-open',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif' => 'actions-wizard-link',
+            'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif' => 'actions-wizard-rte'
         ];
+        $oldFileNames = array_keys($newFileLocations);
 
         foreach ($tca as $table => $tableDefinition) {
             if (!isset($tableDefinition['columns']) || !is_array($tableDefinition['columns'])) {
index dbc1aad..5e1c355 100644 (file)
@@ -171,7 +171,7 @@ return [
                     'link' => [
                         'type' => 'popup',
                         'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.link',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+                        'icon' => 'actions-wizard-link',
                         'module' => [
                             'name' => 'wizard_link',
                         ],
index 2dc237d..74f1f07 100644 (file)
@@ -72,7 +72,7 @@ return [
                         'RTEonly' => true,
                         'type' => 'script',
                         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.W.RTE',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif',
+                        'icon' => 'actions-wizard-rte',
                         'module' => [
                             'name' => 'wizard_rte'
                         ]
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-77630-RemoveWizardIcons.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-77630-RemoveWizardIcons.rst
new file mode 100644 (file)
index 0000000..3b21fad
--- /dev/null
@@ -0,0 +1,40 @@
+======================================
+Breaking: #77630 - Remove wizard icons
+======================================
+
+Description
+===========
+
+The following icons have been removed from ``typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/``:
+
+- wizard_add.gif
+- wizard_edit.gif
+- wizard_list.gif
+- wizard_table.gif
+- wizard_link.gif
+- wizard_rte.gif
+
+
+Impact
+======
+
+The mentioned icons can not be used anymore.
+
+
+Affected Installations
+======================
+
+Every installation using those icons.
+
+
+Migration
+=========
+
+The TCA migration migrates the icon calls to the new output if used as wizard icon.
+
+- ``wizard_add.gif`` => ``actions-add``
+- ``wizard_edit.gif`` => ``actions-open``
+- ``wizard_list.gif`` => ``actions-system-list-open``
+- ``wizard_table.gif`` => ``content-table``
+- ``wizard_link.gif`` => ``actions-wizard-link``
+- ``wizard_rte.gif`` => ``actions-wizard-rte``
index 9a467e8..0906102 100644 (file)
@@ -71,7 +71,7 @@ class TcaMigrationTest extends UnitTestCase
                                     'type' => 'userFunc',
                                     'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                     'title' => 't3editor',
-                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                    'icon' => 'content-table',
                                     'module' => [
                                         'name' => 'wizard_table'
                                     ],
@@ -233,7 +233,7 @@ class TcaMigrationTest extends UnitTestCase
                                     'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                     'enableByTypeConfig' => 1,
                                     'title' => 't3editor',
-                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                    'icon' => 'content-table',
                                     'module' => [
                                         'name' => 'wizard_table'
                                     ],
@@ -247,7 +247,7 @@ class TcaMigrationTest extends UnitTestCase
                                     'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                     'enableByTypeConfig' => 1,
                                     'title' => 't3editor',
-                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                    'icon' => 'content-table',
                                     'module' => [
                                         'name' => 'wizard_table'
                                     ],
@@ -334,7 +334,7 @@ class TcaMigrationTest extends UnitTestCase
                                     'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                     'enableByTypeConfig' => 1,
                                     'title' => 't3editor',
-                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                    'icon' => 'content-table',
                                     'module' => [
                                         'name' => 'wizard_table'
                                     ],
@@ -446,7 +446,7 @@ class TcaMigrationTest extends UnitTestCase
                         'config' => [
                             'wizards' => [
                                 't3editorHtml' => [
-                                    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                    'icon' => 'content-table',
                                 ],
                             ],
                         ],
index 926c2e7..560ba80 100644 (file)
@@ -333,7 +333,7 @@ return [
                     'link' => [
                         'type' => 'popup',
                         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+                        'icon' => 'actions-wizard-link',
                         'module' => [
                             'name' => 'wizard_link',
                         ],
@@ -406,7 +406,7 @@ return [
                         'RTEonly' => true,
                         'type' => 'script',
                         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.W.RTE',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif',
+                        'icon' => 'actions-wizard-rte',
                         'module' => [
                             'name' => 'wizard_rte'
                         ]
@@ -416,7 +416,7 @@ return [
                         'enableByTypeConfig' => 1,
                         'type' => 'script',
                         'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:bodytext.W.table',
-                        'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                        'icon' => 'content-table',
                         'module' => [
                             'name' => 'wizard_table'
                         ],
index f462192..5836475 100644 (file)
@@ -146,7 +146,7 @@ return [
                                                                                                                        <link type="array">
                                                                                                                                <type>popup</type>
                                                                                                                                <title>Link</title>
-                                                                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
+                                                                                                                               <icon>actions-wizard-link</icon>
                                                                                                                                <module type="array">
                                                                                                                                        <name>wizard_link</name>
                                                                                                                                </module>