From 06c1f5d29baaa1d2d240998f9197402124a2b78d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Na=CC=88gler?= <frank.naegler@typo3.org>
Date: Mon, 28 Sep 2015 11:32:58 +0200
Subject: [PATCH] [TASK] Replace EXT:t3skin references for icons where possible
Resolves: #70148
Releases: master
Change-Id: Ia7e48bd185d691a0dd5e02c2aa178567d1e5ff0b
Reviewed-on: http://review.typo3.org/43609
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
---
.../Configuration/TCA/Overrides/tt_content.php | 6 +++---
.../core/Classes/Imaging/IconRegistry.php | 4 ++--
typo3/sysext/core/Configuration/TCA/pages.php | 18 +++++++++---------
.../Configuration/TCA/Overrides/tt_content.php | 6 +++---
.../Configuration/TCA/Overrides/tt_content.php | 2 +-
.../Configuration/TCA/Overrides/tt_content.php | 2 +-
.../Configuration/TCA/Overrides/tt_content.php | 3 +--
.../frontend/Configuration/TCA/sys_domain.php | 2 +-
.../Configuration/TCA/sys_template.php | 2 +-
.../frontend/Configuration/TCA/tt_content.php | 18 +++++++++---------
.../Configuration/TCA/Overrides/tt_content.php | 4 ++--
typo3/sysext/t3skin/ext_tables.php | 4 ++--
.../Configuration/TCA/sys_workspace.php | 2 +-
.../Configuration/TCA/sys_workspace_stage.php | 2 +-
14 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
index e1ce513dc1b6..bbc8022a392f 100644
--- a/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/compatibility6/Configuration/TCA/Overrides/tt_content.php
@@ -312,7 +312,7 @@ $GLOBALS['TCA']['tt_content']['palettes']['searchform'] = array(
$additionalCTypeItem = array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.9',
'search',
- 'EXT:t3skin/icons/gfx/i/tt_content_search.gif'
+ 'content-special-indexed_search'
);
$existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'];
@@ -366,7 +366,7 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.8',
'mailform',
- 'EXT:t3skin/icons/gfx/i/tt_content_form.gif'
+ 'content-elements-mailform'
),
'search',
'before'
@@ -402,4 +402,4 @@ if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('form')) {
$GLOBALS['TCA']['tt_content']['palettes']['mailform'] = array(
'showitem' => 'pages;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:pages.ALT.mailform, --linebreak--, subheader;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:subheader.ALT.mailform_formlabel',
);
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
index b668b5b831d8..cb5f0de52a75 100644
--- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php
+++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
@@ -228,9 +228,9 @@ class IconRegistry implements \TYPO3\CMS\Core\SingletonInterface {
)
),
'apps-pagetree-page-mountpoint' => array(
- 'provider' => BitmapIconProvider::class,
+ 'provider' => SvgIconProvider::class,
'options' => array(
- 'source' => 'EXT:t3skin/images/icons/apps/pagetree-page-mountpoint.png',
+ 'source' => 'EXT:backend/Resources/Public/Icons/App/apps-filetree-mount.svg',
)
),
'apps-pagetree-page-mountpoint-hideinmenu' => array(
diff --git a/typo3/sysext/core/Configuration/TCA/pages.php b/typo3/sysext/core/Configuration/TCA/pages.php
index 56a95bc16932..107f654f7526 100644
--- a/typo3/sysext/core/Configuration/TCA/pages.php
+++ b/typo3/sysext/core/Configuration/TCA/pages.php
@@ -77,12 +77,12 @@ return array(
array(
'LLL:EXT:lang/locallang_tca.xlf:doktype.I.0',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT,
- 'EXT:t3skin/icons/gfx/i/pages.gif'
+ 'apps-pagetree-page-default'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.I.4',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_BE_USER_SECTION,
- 'EXT:t3skin/icons/gfx/i/be_users_section.gif'
+ 'apps-pagetree-page-backend-users'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.div.link',
@@ -91,17 +91,17 @@ return array(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.I.2',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_SHORTCUT,
- 'EXT:t3skin/icons/gfx/i/pages_shortcut.gif'
+ 'apps-pagetree-page-shortcut'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.I.5',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_MOUNTPOINT,
- 'EXT:t3skin/icons/gfx/i/pages_mountpoint.gif'
+ 'apps-pagetree-page-mountpoint'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.I.8',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_LINK,
- 'EXT:t3skin/icons/gfx/i/pages_link.gif'
+ 'apps-pagetree-page-shortcut-external'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.div.special',
@@ -110,17 +110,17 @@ return array(
array(
'LLL:EXT:lang/locallang_tca.xlf:doktype.I.folder',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_SYSFOLDER,
- 'EXT:t3skin/icons/gfx/i/sysf.gif'
+ 'apps-pagetree-folder-default'
),
array(
'LLL:EXT:lang/locallang_tca.xlf:doktype.I.2',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_RECYCLER,
- 'EXT:t3skin/icons/gfx/i/recycler.gif'
+ 'apps-filetree-folder-recycler'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype.I.7',
(string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_SPACER,
- 'EXT:t3skin/icons/gfx/i/spacer_icon.gif'
+ 'apps-pagetree-spacer'
)
),
'default' => (string)\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT,
@@ -719,7 +719,7 @@ return array(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.module.I.4',
'fe_users',
- 'EXT:t3skin/icons/gfx/i/fe_users.gif'
+ 'apps-pagetree-folder-contains-fe_users'
)
),
'default' => '',
diff --git a/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
index 235dc1de347f..f19aba1b7a0f 100644
--- a/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/css_styled_content/Configuration/TCA/Overrides/tt_content.php
@@ -373,17 +373,17 @@ array_splice(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.1',
'text',
- 'EXT:t3skin/icons/gfx/i/tt_content.gif'
+ 'content-text'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.2',
'textpic',
- 'EXT:t3skin/icons/gfx/i/tt_content_textpic.gif'
+ 'content-textpic'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.3',
'image',
- 'EXT:t3skin/icons/gfx/i/tt_content_image.gif'
+ 'content-image'
)
)
);
diff --git a/typo3/sysext/felogin/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/felogin/Configuration/TCA/Overrides/tt_content.php
index 3f229d33e121..188ca9279f10 100644
--- a/typo3/sysext/felogin/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/felogin/Configuration/TCA/Overrides/tt_content.php
@@ -14,7 +14,7 @@ call_user_func(function() {
$additionalCTypeItem = array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.10',
'login',
- 'EXT:t3skin/icons/gfx/i/tt_content_login.gif'
+ 'content-elements-login'
);
$existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'];
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
index e31638eb5734..ef39b34796f0 100644
--- a/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
@@ -13,7 +13,7 @@ call_user_func(function() {
[
$languageFilePrefix . 'tt_content.CType.textmedia',
'textmedia',
- 'EXT:t3skin/icons/gfx/i/tt_content_textpic.gif'
+ 'content-textpic'
],
'header',
'after'
diff --git a/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
index ba1027705ee4..2aca065a40bf 100644
--- a/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/form/Configuration/TCA/Overrides/tt_content.php
@@ -3,14 +3,13 @@ defined('TYPO3_MODE') or die();
// add an CType element "mailform"
$GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['mailform'] = 'mimetypes-x-content-form';
-$GLOBALS['TCA']['tt_content']['ctrl']['typeicons']['mailform'] = 'EXT:t3skin/icons/gfx/i/tt_content_form.gif';
// check if there is already a forms tab and add the item after that, otherwise
// add the tab item as well
$additionalCTypeItem = array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.8',
'mailform',
- 'EXT:t3skin/icons/gfx/i/tt_content_form.gif'
+ 'content-elements-mailform'
);
$existingCTypeItems = $GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'];
diff --git a/typo3/sysext/frontend/Configuration/TCA/sys_domain.php b/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
index b83c50470b06..d8ab86283f5b 100644
--- a/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
+++ b/typo3/sysext/frontend/Configuration/TCA/sys_domain.php
@@ -7,7 +7,7 @@ return array(
'cruser_id' => 'cruser_id',
'sortby' => 'sorting',
'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:sys_domain',
- 'iconfile' => 'EXT:t3skin/icons/gfx/i/domain.gif',
+ 'iconfile' => 'tcarecords-sys_domain-default',
'enablecolumns' => array(
'disabled' => 'hidden'
),
diff --git a/typo3/sysext/frontend/Configuration/TCA/sys_template.php b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
index 76f50a5c1231..9c547c618616 100644
--- a/typo3/sysext/frontend/Configuration/TCA/sys_template.php
+++ b/typo3/sysext/frontend/Configuration/TCA/sys_template.php
@@ -14,7 +14,7 @@ return array(
'delete' => 'deleted',
'adminOnly' => 1,
// Only admin, if any
- 'iconfile' => 'EXT:t3skin/icons/gfx/i/template.gif',
+ 'iconfile' => 'tcarecords-sys_template-default',
'enablecolumns' => array(
'disabled' => 'hidden',
'starttime' => 'starttime',
diff --git a/typo3/sysext/frontend/Configuration/TCA/tt_content.php b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
index 9b2e509f0657..1eb6ef1d9aa7 100644
--- a/typo3/sysext/frontend/Configuration/TCA/tt_content.php
+++ b/typo3/sysext/frontend/Configuration/TCA/tt_content.php
@@ -65,7 +65,7 @@ return array(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.0',
'header',
- 'EXT:t3skin/icons/gfx/i/tt_content_header.gif'
+ 'content-header'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.lists',
@@ -74,17 +74,17 @@ return array(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.4',
'bullets',
- 'EXT:t3skin/icons/gfx/i/tt_content_bullets.gif'
+ 'content-bullets'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.5',
'table',
- 'EXT:t3skin/icons/gfx/i/tt_content_table.gif'
+ 'content-table'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.6',
'uploads',
- 'EXT:t3skin/icons/gfx/i/tt_content_uploads.gif'
+ 'content-special-uploads'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.div.special',
@@ -93,27 +93,27 @@ return array(
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.12',
'menu',
- 'EXT:t3skin/icons/gfx/i/tt_content_menu.gif'
+ 'content-special-menu'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.13',
'shortcut',
- 'EXT:t3skin/icons/gfx/i/tt_content_shortcut.gif'
+ 'content-special-shortcut'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.14',
'list',
- 'EXT:t3skin/icons/gfx/i/tt_content_list.gif'
+ 'content-plugin'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.16',
'div',
- 'EXT:t3skin/icons/gfx/i/tt_content_div.gif'
+ 'content-special-div'
),
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.17',
'html',
- 'EXT:t3skin/icons/gfx/i/tt_content_html.gif'
+ 'content-special-html'
)
),
'default' => 'header',
diff --git a/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
index 40fe7a853450..d29d81b2f86b 100644
--- a/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/mediace/Configuration/TCA/Overrides/tt_content.php
@@ -13,7 +13,7 @@ $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.7',
'multimedia',
- 'EXT:t3skin/icons/gfx/i/tt_content_mm.gif'
+ 'content-special-media'
),
'menu', 'before'
);
@@ -21,7 +21,7 @@ $GLOBALS['TCA']['tt_content']['ctrl']['typeicon_classes']['media'] = 'mimetypes-
array(
'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:CType.I.18',
'media',
- 'EXT:t3skin/icons/gfx/i/tt_content_mm.gif'
+ 'content-special-media'
),
'menu', 'before'
);
diff --git a/typo3/sysext/t3skin/ext_tables.php b/typo3/sysext/t3skin/ext_tables.php
index e8bd16e6602a..9ab489982a12 100644
--- a/typo3/sysext/t3skin/ext_tables.php
+++ b/typo3/sysext/t3skin/ext_tables.php
@@ -30,9 +30,9 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
);
// Changing icon for filemounts, needs to be done here as overwriting the original icon would also change the filelist tree's root icon
- $GLOBALS['TCA']['sys_filemounts']['ctrl']['iconfile'] = 'EXT:t3skin/icons/gfx/i/_icon_ftp_2.gif';
+ $GLOBALS['TCA']['sys_filemounts']['ctrl']['iconfile'] = 'apps-filetree-mount';
- $GLOBALS['TCA']['pages']['columns']['module']['config']['items'][1][2] = 'EXT:t3skin/images/icons/status/user-frontend.png';
+ $GLOBALS['TCA']['pages']['columns']['module']['config']['items'][1][2] = 'status-user-frontend';
// extJS theme
$GLOBALS['TBE_STYLES']['extJS']['theme'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'extjs/xtheme-t3skin.css';
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
index 0b6da4708bb1..947ca4700d28 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace.php
@@ -7,7 +7,7 @@ return array(
'adminOnly' => 1,
'rootLevel' => 1,
'delete' => 'deleted',
- 'iconfile' => 'EXT:t3skin/icons/gfx/i/sys_workspace.png',
+ 'iconfile' => 'mimetypes-x-sys_workspace',
'typeicon_classes' => array(
'default' => 'mimetypes-x-sys_workspace'
),
diff --git a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
index 9f36cb940f9b..fd4813c0a268 100644
--- a/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
+++ b/typo3/sysext/workspaces/Configuration/TCA/sys_workspace_stage.php
@@ -9,7 +9,7 @@ return array(
'rootLevel' => 1,
'hideTable' => TRUE,
'delete' => 'deleted',
- 'iconfile' => 'EXT:t3skin/icons/gfx/i/sys_workspace.png',
+ 'iconfile' => 'mimetypes-x-sys_workspace',
'typeicon_classes' => array(
'default' => 'mimetypes-x-sys_workspace'
),
--
GitLab