From 459500c3caa82c3fdd3153af42ec3ecfb61537ff Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Thu, 2 Nov 2023 15:35:10 +0100
Subject: [PATCH] [TASK] Clean up usages of typo3conf/ext/styleguide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some left over usages pointing to
typo3conf/ext/styleguide.
Resolves: #102235
Releases: main
Change-Id: Ib7e1050bc63fdafa15bb344a145735644c4985c4
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/81649
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Jasmina Ließmann <minapokhalo+typo3@gmail.com>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benjamin Franzke <ben@bnf.dev>
Reviewed-by: Benjamin Franzke <ben@bnf.dev>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Jasmina Ließmann <minapokhalo+typo3@gmail.com>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Andreas Kienast <a.fernandez@scripting-base.de>
---
.gitattributes | 1 -
.gitignore | 1 -
.../styleguide/Configuration/TypoScript/setup.typoscript | 6 +-----
.../Documentation/CodeSnippets/Automatic/T3editor1.rst.txt | 2 +-
typo3/sysext/t3editor/Documentation/screenshots.json | 2 +-
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index 5b7d4f48bab4..31a0c994dec2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,7 +8,6 @@
/rector.yml export-ignore
/typo3/sysext/*/Resources/Private/TypeScript/ export-ignore
/typo3/sysext/*/Tests/ export-ignore
-/typo3conf/ext/styleguide export-ignore
/components/testing_framework/ export-ignore
# Enforce checkout with linux lf consistent over all platforms
diff --git a/.gitignore b/.gitignore
index 220d01aee820..9ab2325e8fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,6 @@ nbproject
/typo3conf/*
!/typo3conf/ext
/typo3conf/ext/*
-!/typo3conf/ext/styleguide
/fileadmin/*
/uploads/*
/FIRST_INSTALL
diff --git a/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript b/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
index a0b0855d453a..bcfd2792a878 100644
--- a/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
+++ b/typo3/sysext/styleguide/Configuration/TypoScript/setup.typoscript
@@ -11,11 +11,6 @@
// Configure admin panel
config.admPanel = 1
-page.headerData.1568907945 = TEXT
-page.headerData.1568907945.value (
- <link rel="shortcut icon" href="typo3conf/ext/styleguide/Resources/Public/Icons/Extension.svg" />
-)
-
// Define template paths for fluid_styled_content
lib.contentElement {
templateName = Default
@@ -61,6 +56,7 @@ lib.dynamicContent {
page = PAGE
page {
typeNum = 0
+ shortcutIcon = EXT:styleguide/Resources/Public/Icons/Extension.svg
10 = FLUIDTEMPLATE
10 {
templateName = StyleguideFrontend
diff --git a/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt b/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
index ceac6d2287bc..a0c871ee47ef 100644
--- a/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
+++ b/typo3/sysext/t3editor/Documentation/CodeSnippets/Automatic/T3editor1.rst.txt
@@ -2,7 +2,7 @@
.. Automatically generated code snippet
.. ====================================
..
-.. Extracted from typo3conf/ext/styleguide/Configuration/TCA/tx_styleguide_elements_t3editor.php
+.. Extracted from typo3/sysext/styleguide/Configuration/TCA/tx_styleguide_elements_t3editor.php
.. code-block:: php
diff --git a/typo3/sysext/t3editor/Documentation/screenshots.json b/typo3/sysext/t3editor/Documentation/screenshots.json
index b7b507fe9185..6c2b51260324 100644
--- a/typo3/sysext/t3editor/Documentation/screenshots.json
+++ b/typo3/sysext/t3editor/Documentation/screenshots.json
@@ -18,7 +18,7 @@
},
{
"action": "setCodeSnippetsSourcePath",
- "path": "typo3conf/ext/styleguide"
+ "path": "typo3/sysext/styleguide"
},
{
"action": "makeScreenshotOfField",
--
GitLab