[TASK] Move form field wizard icons 60/40660/5
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 25 Jun 2015 22:30:11 +0000 (00:30 +0200)
committerBenjamin Mack <benni@typo3.org>
Mon, 29 Jun 2015 17:43:19 +0000 (19:43 +0200)
Migrate TCA and FlexForm with the TCA migration during bootstrap.

Resolves: #67793
Releases: master
Change-Id: I1cfa4196603832d6fb1d91a58ac12d05d48562a8
Reviewed-on: http://review.typo3.org/40660
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>
29 files changed:
typo3/gfx/add.gif [deleted file]
typo3/gfx/edit2.gif [deleted file]
typo3/gfx/link_popup.gif [deleted file]
typo3/gfx/list.gif [deleted file]
typo3/gfx/wizard_forms.gif [deleted file]
typo3/gfx/wizard_rte2.gif [deleted file]
typo3/gfx/wizard_table.gif [deleted file]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif [new file with mode: 0644]
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/core/Classes/Migrations/TcaMigration.php
typo3/sysext/core/Configuration/TCA/be_groups.php
typo3/sysext/core/Configuration/TCA/be_users.php
typo3/sysext/core/Configuration/TCA/sys_file_reference.php
typo3/sysext/core/Configuration/TCA/sys_news.php
typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/Blog.php
typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/Post.php
typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/frontend/Configuration/TCA/sys_template.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
typo3/sysext/mediace/Configuration/FlexForms/media.xml

diff --git a/typo3/gfx/add.gif b/typo3/gfx/add.gif
deleted file mode 100644 (file)
index 92b32e2..0000000
Binary files a/typo3/gfx/add.gif and /dev/null differ
diff --git a/typo3/gfx/edit2.gif b/typo3/gfx/edit2.gif
deleted file mode 100644 (file)
index 0aa1cd8..0000000
Binary files a/typo3/gfx/edit2.gif and /dev/null differ
diff --git a/typo3/gfx/link_popup.gif b/typo3/gfx/link_popup.gif
deleted file mode 100644 (file)
index 7bfa658..0000000
Binary files a/typo3/gfx/link_popup.gif and /dev/null differ
diff --git a/typo3/gfx/list.gif b/typo3/gfx/list.gif
deleted file mode 100644 (file)
index 84b03ef..0000000
Binary files a/typo3/gfx/list.gif and /dev/null differ
diff --git a/typo3/gfx/wizard_forms.gif b/typo3/gfx/wizard_forms.gif
deleted file mode 100644 (file)
index 687748b..0000000
Binary files a/typo3/gfx/wizard_forms.gif and /dev/null differ
diff --git a/typo3/gfx/wizard_rte2.gif b/typo3/gfx/wizard_rte2.gif
deleted file mode 100644 (file)
index 878aa92..0000000
Binary files a/typo3/gfx/wizard_rte2.gif and /dev/null differ
diff --git a/typo3/gfx/wizard_table.gif b/typo3/gfx/wizard_table.gif
deleted file mode 100644 (file)
index a671280..0000000
Binary files a/typo3/gfx/wizard_table.gif and /dev/null differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif
new file mode 100644 (file)
index 0000000..92b32e2
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif 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
new file mode 100644 (file)
index 0000000..0aa1cd8
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif
new file mode 100644 (file)
index 0000000..687748b
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif 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
new file mode 100644 (file)
index 0000000..7bfa658
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif 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
new file mode 100644 (file)
index 0000000..84b03ef
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif 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
new file mode 100644 (file)
index 0000000..878aa92
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif 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
new file mode 100644 (file)
index 0000000..a671280
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif differ
index 97585a1..207405f 100644 (file)
@@ -475,7 +475,7 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                                        } else {
                                                $ctrl .= '<input type="image" name="FORMCFG[row_top][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/turn_down.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_top', TRUE) . '" />' . $brTag;
                                        }
-                                       $ctrl .= '<input type="image" name="FORMCFG[row_add][' . ($k + 1) * 2 . ']"' . IconUtility::skinImg($this->doc->backPath, 'gfx/add.gif', '') . $onClick . ' title="' . $this->getLanguageService()->getLL('table_addRow', TRUE) . '" />' . $brTag;
+                                       $ctrl .= '<button name="FORMCFG[row_add][' . ($k + 1) * 2 . ']"' . $onClick . ' title="' . $this->getLanguageService()->getLL('table_addRow', TRUE) . '">' . IconUtility::getSpriteIcon('actions-template-new') . '</button>' . $brTag;
                                        $ctrl = '<span class="c-wizButtonsV">' . $ctrl . '</span>';
                                        // Finally, put together the full row from the generated content above:
                                        $bgC = $confData['type'] ? ' class="bgColor5"' : '';
index 84b3e0c..43dde70 100644 (file)
@@ -58,7 +58,7 @@ $extraContentColumns = array(
                                'link' => array(
                                        'type' => 'popup',
                                        'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
-                                       'icon' => 'link_popup.gif',
+                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
                                        'module' => array(
                                                'name' => 'wizard_element_browser',
                                                'urlParameters' => array(
@@ -127,7 +127,7 @@ $extraContentColumns = array(
                                'link' => array(
                                        'type' => 'popup',
                                        'title' => 'LLL:EXT:cms/locallang_ttc.xlf:image_link_formlabel',
-                                       'icon' => 'link_popup.gif',
+                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
                                        'module' => array(
                                                'name' => 'wizard_element_browser',
                                                'urlParameters' => array(
@@ -350,7 +350,7 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
                'enableByTypeConfig' => 1,
                'type' => 'script',
                'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.forms',
-               'icon' => 'wizard_forms.gif',
+               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif',
                'module' => array(
                        'name' => 'wizard_forms',
                        'urlParameters' => array(
index e1b87c1..994bed0 100644 (file)
@@ -43,6 +43,7 @@ class TcaMigration {
                $tca = $this->migrateSpecialConfigurationAndRemoveShowItemStylePointerConfig($tca);
                $tca = $this->migrateT3editorWizardWithEnabledByTypeConfigToColumnsOverrides($tca);
                $tca = $this->migrateShowItemAdditionalPaletteToOwnPalette($tca);
+               $tca = $this->migrateIconsForFormFieldWizardsToNewLocation($tca);
                // @todo: if showitem/defaultExtras wizards[xy] is migrated to columnsOverrides here, enableByTypeConfig could be dropped
                return $tca;
        }
@@ -328,4 +329,69 @@ class TcaMigration {
                }
                return $newTca;
        }
+
+       /**
+        * 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
+        */
+       protected function migrateIconsForFormFieldWizardsToNewLocation($tca) {
+               $newTca = $tca;
+
+               $oldFileNames = array(
+                       'add.gif',
+                       'link_popup.gif',
+                       'wizard_rte2.gif',
+                       'wizard_table.gif',
+                       'edit2.gif',
+                       'list.gif',
+                       'wizard_forms.gif',
+               );
+
+               $newFileLocations = array(
+                       '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',
+               );
+
+               foreach ($tca as $table => $tableDefinition) {
+                       if (!isset($tableDefinition['columns']) || !is_array($tableDefinition['columns'])) {
+                               continue;
+                       }
+                       foreach ($tableDefinition['columns'] as $fieldName => $fieldConfig) {
+                               if (
+                                       isset($fieldConfig['config']['wizards'])
+                                       && is_array($fieldConfig['config']['wizards']) // and there are wizards
+                               ) {
+                                       foreach ($fieldConfig['config']['wizards'] as $wizardName => $wizardConfig) {
+                                               if (!is_array($wizardConfig)) {
+                                                       continue;
+                                               }
+
+                                               foreach ($wizardConfig as $option => $value) {
+                                                       if ($option === 'icon' && in_array($value, $oldFileNames, TRUE)) {
+                                                               $newTca[$table]['columns'][$fieldName]['config']['wizards'][$wizardName]['icon'] = $newFileLocations[$value];
+                                                               $this->messages[] = 'Migrated icon path of wizard "' . $wizardName . '" in field "' . $fieldName . '" from TCA table "' . $table . '". New path is: ' . $newFileLocations[$value];
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               return $newTca;
+       }
 }
index c2156a9..92e1e7f 100644 (file)
@@ -70,13 +70,13 @@ return array(
                                                        'name' => 'wizard_edit',
                                                ),
                                                'popup_onlyOpenIfSelected' => 1,
-                                               'icon' => 'edit2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1'
                                        ),
                                        'add' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
-                                               'icon' => 'add.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                'params' => array(
                                                        'table' => 'sys_filemounts',
                                                        'pid' => '0',
@@ -89,7 +89,7 @@ return array(
                                        'list' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
-                                               'icon' => 'list.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
                                                'params' => array(
                                                        'table' => 'sys_filemounts',
                                                        'pid' => '0'
index 5e64d6f..2d75939 100644 (file)
@@ -71,13 +71,13 @@ return array(
                                                        'name' => 'wizard_edit',
                                                ),
                                                'popup_onlyOpenIfSelected' => 1,
-                                               'icon' => 'edit2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1'
                                        ),
                                        'add' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_add_title',
-                                               'icon' => 'add.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                'params' => array(
                                                        'table' => 'be_groups',
                                                        'pid' => '0',
@@ -90,7 +90,7 @@ return array(
                                        'list' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:be_users.usergroup_list_title',
-                                               'icon' => 'list.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
                                                'params' => array(
                                                        'table' => 'be_groups',
                                                        'pid' => '0'
@@ -147,14 +147,14 @@ return array(
                                                'module' => array(
                                                        'name' => 'wizard_edit',
                                                ),
-                                               'icon' => 'edit2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                'popup_onlyOpenIfSelected' => 1,
                                                'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1'
                                        ),
                                        'add' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_add_title',
-                                               'icon' => 'add.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                'params' => array(
                                                        'table' => 'sys_filemounts',
                                                        'pid' => '0',
@@ -167,7 +167,7 @@ return array(
                                        'list' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:file_mountpoints_list_title',
-                                               'icon' => 'list.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_list.gif',
                                                'params' => array(
                                                        'table' => 'sys_filemounts',
                                                        'pid' => '0'
index 848e70a..3677e1d 100644 (file)
@@ -176,7 +176,7 @@ return array(
                                        'link' => array(
                                                'type' => 'popup',
                                                'title' => 'LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.link',
-                                               'icon' => 'link_popup.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
                                                'module' => array(
                                                        'name' => 'wizard_element_browser',
                                                        'urlParameters' => array(
index 8434120..5971dcb 100644 (file)
@@ -72,7 +72,7 @@ return array(
                                                'RTEonly' => 1,
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.RTE',
-                                               'icon' => 'wizard_rte2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif',
                                                'module' => array(
                                                        'name' => 'wizard_rte'
                                                )
index 64cfe51..510d6a6 100644 (file)
@@ -69,7 +69,7 @@ class TcaMigrationTest extends UnitTestCase {
                                                                        'type' => 'userFunc',
                                                                        'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                                                        'title' => 't3editor',
-                                                                       'icon' => 'wizard_table.gif',
+                                                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
                                                                        'module' => array(
                                                                                'name' => 'wizard_table'
                                                                        ),
@@ -227,7 +227,7 @@ class TcaMigrationTest extends UnitTestCase {
                                                                        'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                                                        'enableByTypeConfig' => 1,
                                                                        'title' => 't3editor',
-                                                                       'icon' => 'wizard_table.gif',
+                                                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
                                                                        'module' => array(
                                                                                'name' => 'wizard_table'
                                                                        ),
@@ -241,7 +241,7 @@ class TcaMigrationTest extends UnitTestCase {
                                                                        'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                                                        'enableByTypeConfig' => 1,
                                                                        'title' => 't3editor',
-                                                                       'icon' => 'wizard_table.gif',
+                                                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
                                                                        'module' => array(
                                                                                'name' => 'wizard_table'
                                                                        ),
@@ -327,7 +327,7 @@ class TcaMigrationTest extends UnitTestCase {
                                                                        'userFunc' => 'TYPO3\CMS\T3editor\FormWizard->main',
                                                                        'enableByTypeConfig' => 1,
                                                                        'title' => 't3editor',
-                                                                       'icon' => 'wizard_table.gif',
+                                                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
                                                                        'module' => array(
                                                                                'name' => 'wizard_table'
                                                                        ),
@@ -407,4 +407,44 @@ class TcaMigrationTest extends UnitTestCase {
                $subject = new TcaMigration();
                $this->assertEquals($expected, $subject->migrate($input));
        }
+
+       /**
+        * @test
+        */
+       public function migrateIconsForFormFieldWizardsToNewLocation() {
+               $input = array(
+                       'aTable' => array(
+                               'columns' => array(
+                                       'bodytext' => array(
+                                               'config' => array(
+                                                       'wizards' => array(
+                                                               't3editorHtml' => array(
+                                                                       'icon' => 'wizard_table.gif',
+                                                               ),
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       ),
+               );
+
+               $expected = array(
+                       'aTable' => array(
+                               'columns' => array(
+                                       'bodytext' => array(
+                                               'config' => array(
+                                                       'wizards' => array(
+                                                               't3editorHtml' => array(
+                                                                       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
+                                                               ),
+                                                       ),
+                                               ),
+                                       ),
+                               ),
+                       ),
+               );
+
+               $subject = new TcaMigration();
+               $this->assertEquals($expected, $subject->migrate($input));
+       }
 }
index f851efe..4ca54ff 100644 (file)
@@ -145,14 +145,14 @@ $TCA['tx_blogexample_domain_model_blog'] = array(
                                                 'type' => 'popup',
                                                 'title' => 'Edit',
                                                 'script' => 'wizard_edit.php',
-                                                'icon' => 'edit2.gif',
+                                                'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                 'popup_onlyOpenIfSelected' => 1,
                                                 'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1',
                                         ),
                                         'add' => Array(
                                                 'type' => 'script',
                                                 'title' => 'Create new',
-                                                'icon' => 'add.gif',
+                                                'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                 'params' => Array(
                                                         'table'=>'fe_users',
                                                         'pid' => '###CURRENT_PID###',
index 281e855..f5ed25d 100644 (file)
@@ -92,14 +92,14 @@ $TCA['tx_blogexample_domain_model_post'] = array(
                                                 'type' => 'popup',
                                                 'title' => 'Edit',
                                                 'script' => 'wizard_edit.php',
-                                                'icon' => 'edit2.gif',
+                                                'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                 'popup_onlyOpenIfSelected' => 1,
                                                 'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1',
                                         ),
                                         'add' => Array(
                                                 'type' => 'script',
                                                 'title' => 'Create new',
-                                                'icon' => 'add.gif',
+                                                'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                 'params' => Array(
                                                         'table'=>'tx_blogexample_domain_model_person',
                                                         'pid' => '###CURRENT_PID###',
index 9c34508..959925f 100644 (file)
@@ -40,7 +40,7 @@ $GLOBALS['TCA']['tt_content']['columns']['bodytext']['config']['wizards']['forms
        'enableByTypeConfig' => 1,
        'type' => 'script',
        'title' => 'Form wizard',
-       'icon' => 'wizard_forms.gif',
+       'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_forms.gif',
        'module' => array(
                'name' => 'wizard_form'
        ),
index 799ecbb..07135d5 100644 (file)
@@ -162,13 +162,13 @@ return array(
                                                        'name' => 'wizard_edit',
                                                ),
                                                'popup_onlyOpenIfSelected' => 1,
-                                               'icon' => 'edit2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_edit.gif',
                                                'JSopenParams' => 'height=350,width=580,status=0,menubar=0,scrollbars=1'
                                        ),
                                        'add' => array(
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:cms/locallang_tca.xlf:sys_template.basedOn_add',
-                                               'icon' => 'add.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_add.gif',
                                                'params' => array(
                                                        'table' => 'sys_template',
                                                        'pid' => '###CURRENT_PID###',
index 6aae5fa..4c47be8 100644 (file)
@@ -320,7 +320,7 @@ return array(
                                        'link' => array(
                                                'type' => 'popup',
                                                'title' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
-                                               'icon' => 'link_popup.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
                                                'module' => array(
                                                        'name' => 'wizard_element_browser',
                                                        'urlParameters' => array(
@@ -395,7 +395,7 @@ return array(
                                                'RTEonly' => 1,
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.RTE',
-                                               'icon' => 'wizard_rte2.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif',
                                                'module' => array(
                                                        'name' => 'wizard_rte'
                                                )
@@ -405,7 +405,7 @@ return array(
                                                'enableByTypeConfig' => 1,
                                                'type' => 'script',
                                                'title' => 'LLL:EXT:cms/locallang_ttc.xlf:bodytext.W.table',
-                                               'icon' => 'wizard_table.gif',
+                                               'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_table.gif',
                                                'module' => array(
                                                        'name' => 'wizard_table'
                                                ),
index 73e6914..b3e6a33 100644 (file)
@@ -149,7 +149,7 @@ return array(
                                                                                                                        <link type="array">
                                                                                                                                <type>popup</type>
                                                                                                                                <title>Link</title>
-                                                                                                                               <icon>link_popup.gif</icon>
+                                                                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                                                                <module type="array">
                                                                                                                                        <name>wizard_element_browser</name>
                                                                                                                                        <urlParameters type="array">
index d3ece58..060aa45 100644 (file)
                                                                        <link type="array">
                                                                                <type>popup</type>
                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                               <icon>link_popup.gif</icon>
+                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                <module type="array">
                                                                                        <name>wizard_element_browser</name>
                                                                                        <urlParameters type="array">
                                                                                                        <link type="array">
                                                                                                                <type>popup</type>
                                                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                                                               <icon>link_popup.gif</icon>
+                                                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                                                <module type="array">
                                                                                                                        <name>wizard_element_browser</name>
                                                                                                                        <urlParameters type="array">
                                                                        <link type="array">
                                                                                <type>popup</type>
                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                               <icon>link_popup.gif</icon>
+                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                <module type="array">
                                                                                        <name>wizard_element_browser</name>
                                                                                        <urlParameters type="array">
                                                                                                        <link type="array">
                                                                                                                <type>popup</type>
                                                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                                                               <icon>link_popup.gif</icon>
+                                                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                                                <module type="array">
                                                                                                                        <name>wizard_element_browser</name>
                                                                                                                        <urlParameters type="array">
                                                                        <link type="array">
                                                                                <type>popup</type>
                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                               <icon>link_popup.gif</icon>
+                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                <module type="array">
                                                                                        <name>wizard_element_browser</name>
                                                                                        <urlParameters type="array">
                                                                                                        <link type="array">
                                                                                                                <type>popup</type>
                                                                                                                <title>LLL:EXT:cms/locallang_ttc.xml:media.browseUrlTitle</title>
-                                                                                                               <icon>link_popup.gif</icon>
+                                                                                                               <icon>EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif</icon>
                                                                                                                <module type="array">
                                                                                                                        <name>wizard_element_browser</name>
                                                                                                                        <urlParameters type="array">