[TASK] Move TypoScript into sets folder (#286)

github-actions[bot] · linawolf · web-flow · commit 907b51754cb5 · 2024-11-25T17:15:45.000+01:00
Releases: main, 13.4

Co-authored-by: lina.wolf &lt;lwolf@w-commerce.de&gt;
diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt
@@ -4,4 +4,4 @@
 ..  code-block:: typoscript
     :caption: EXT:site_package/Configuration/Sets/SitePackage/page.tsconfig
 
-    @import 'EXT:site_package/Configuration/TsConfig/Page/PageLayout/*.tsconfig'
+    @import './PageTSconfig/PageLayout/*.tsconfig'
diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-setup.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-setup.rst.txt
@@ -4,5 +4,5 @@
 ..  code-block:: typoscript
     :caption: EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript
 
-    @import 'EXT:site_package/Configuration/TypoScript/Setup/*.typoscript'
-    @import 'EXT:site_package/Configuration/TypoScript/Setup/Navigation/*.typoscript'
+    @import './TypoScript/*.typoscript'
+    @import './TypoScript/Navigation/*.typoscript'
diff --git a/Documentation/CodeSnippets/TypoScript/Page.rst.txt b/Documentation/CodeSnippets/TypoScript/Page.rst.txt
diff --git a/Documentation/CodeSnippets/TypoScript/Part4GlobalConfiguration.rst.txt b/Documentation/CodeSnippets/TypoScript/Part4GlobalConfiguration.rst.txt
diff --git a/Documentation/CodeSnippets/TypoScript/Setup.rst.txt b/Documentation/CodeSnippets/TypoScript/Setup.rst.txt
@@ -5,5 +5,5 @@
     :caption: EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript
     :linenos:
 
-    @import 'EXT:site_package/Configuration/TypoScript/Setup/*.typoscript'
-    @import 'EXT:site_package/Configuration/TypoScript/Setup/Navigation/*.typoscript'
+    @import './TypoScript/*.typoscript'
+    @import './TypoScript/Navigation/*.typoscript'
diff --git a/Documentation/CodeSnippets/TypoScript/menu.rst.txt b/Documentation/CodeSnippets/TypoScript/menu.rst.txt
@@ -1,8 +1,7 @@
 ..  Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
-..  Extracted from EXT:site_package/Configuration/TypoScript/Setup/Navigation/menu.typoscript
+..  Extracted from EXT:site_package/Configuration/Sets/SitePackage/TypoScript/Navigation/menu.typoscript
 
 ..  code-block:: typoscript
-    :linenos:
 
     page {
       10 {
diff --git a/Documentation/CodeSnippets/TypoScript/pageview.rst.txt b/Documentation/CodeSnippets/TypoScript/pageview.rst.txt
diff --git a/Documentation/CodeSnippets/codesnippets.php b/Documentation/CodeSnippets/codesnippets.php
@@ -11,34 +11,6 @@
         'caption' => 'EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript',
         'showLineNumbers' => true
     ],
-    [
-        'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Configuration/TypoScript/Setup/Page.typoscript',
-        'targetFileName' => 'TypoScript/Page.rst.txt',
-        'caption' => 'EXT:site_package/Configuration/TypoScript/Setup/Page.typoscript',
-        'showLineNumbers' => true
-    ],
-    [
-        'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Configuration/TypoScript/Setup/pageview.typoscript',
-        'targetFileName' => 'TypoScript/pageview.rst.txt',
-        'caption' => 'EXT:site_package/Configuration/TypoScript/Setup/pageview.typoscript',
-        'showLineNumbers' => true
-    ],
-    [
-        'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Configuration/TypoScript/Setup/Part4GlobalConfiguration.typoscript',
-        'targetFileName' => 'TypoScript/Part4GlobalConfiguration.rst.txt',
-        'caption' => 'EXT:site_package/Configuration/TypoScript/Setup/Part4GlobalConfiguration.typoscript',
-        'showLineNumbers' => true
-    ],
-    [
-        'action' => 'createCodeSnippet',
-        'sourceFile' => 'EXT:site_package/Configuration/TypoScript/Setup/Navigation/menu.typoscript',
-        'targetFileName' => 'TypoScript/Navigation/menu.typoscript',
-        'showLineNumbers' => true
-    ],
-
     #code Snippets Extension Configuration
     [
         'action' => 'createCodeSnippet',
@@ -53,6 +25,11 @@
         'targetFileName' => 'ExtensionConfiguration/SitePackage-setup.rst.txt',
         'caption' => 'EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript',
     ],
+    [
+        'action' => 'createCodeSnippet',
+        'sourceFile' => 'EXT:site_package/Configuration/Sets/SitePackage/TypoScript/Navigation/menu.typoscript',
+        'targetFileName' => 'TypoScript/menu.rst.txt',
+    ],
     [
         'action' => 'createCodeSnippet',
         'sourceFile' => 'EXT:site_package/Configuration/Sets/SitePackage/settings.definitions.yaml',
diff --git a/Documentation/MainMenuCreation/Index.rst b/Documentation/MainMenuCreation/Index.rst
@@ -23,9 +23,9 @@ The :ref:`data processor 'menu' <t3tsref:MenuProcessor>` can be configured to
 provide the data of all pages in your current site to your page template.
 
 We save the TypoScript configuration for the menu into file
-:file:`Configuration/TypoScript/Setup/Navigation/menu.typoscript`:
+:file:`Configuration/Set/MySitePackage/TypoScript/Navigation/menu.typoscript`:
 
-..  include:: /CodeSnippets/TypoScript/Navigation/menu.typoscript
+..  include:: /CodeSnippets/TypoScript/menu.rst.txt
 
 .. _fluid-implement-main-menu:
 
diff --git a/Documentation/MinimalExample/Index.rst b/Documentation/MinimalExample/Index.rst
@@ -371,5 +371,5 @@ example when setting your favicon in TypoScript:
     :caption: package/my-site-package/Configuration/Sets/SitePackage/setup.typoscript
 
     page {
-        shortcutIcon = EXT:my_site_package/Ressources/Public/Icons/favicon.ico
+        shortcutIcon = EXT:my_site_package/Resources/Public/Icons/favicon.ico
     }
diff --git a/Documentation/TypoScript/Index.rst b/Documentation/TypoScript/Index.rst
@@ -29,8 +29,8 @@ Familiarize yourself with the TypoScript `@import` syntax first:
 Import the TypoScript from a different location
 ===============================================
 
-Create a new folder called :path:`Configuration/TypoScript/Setup`. In this
-create a file called :file:`pageview.typoscript` and copy the content from
+Create a new folder called :path:`Configuration/Sets/MySet/TypoScript`. In this
+create a file called :file:`page.typoscript` and copy the content from
 file :file:`Configuration/Sets/SitePackage/setup.typoscript`
 into it.
 
@@ -39,7 +39,7 @@ Then change the latter file to contain the following:
 ..  code-block:: typoscript
     :caption: Configuration/Sets/SitePackage/setup.typoscript
 
-    @import 'EXT:site_package/Configuration/TypoScript/Setup/pageview.typoscript'
+    @import './TypoScript/page.typoscript'
 
 Flush the caches and preview the page. The output should be unchanged.
 
@@ -72,16 +72,14 @@ Your :path:`Configuration` directory should now have the following structure:
 
         *   Sets
 
-            *   SitePackage
+            *   MySitePackage
 
-                *   config.yaml
-                *   setup.typoscript
-
-        *   TypoScript
+                *   TypoScript
 
-            *   Setup
+                        *   page.typoscript
 
-                *   pageview.typoscript
+                *   config.yaml
+                *   setup.typoscript
 
 In the next steps you will create more TypoScript files to configure the
 :ref:`Content mapping <t3sitepackage:content-mapping>` and the

Original file line number	Diff line number	Diff line change
`@@ -371,5 +371,5 @@ example when setting your favicon in TypoScript:`
`371`	`371`	`:caption: package/my-site-package/Configuration/Sets/SitePackage/setup.typoscript`
`372`	`372`
`373`	`373`	`page {`
`374`		`- shortcutIcon = EXT:my_site_package/Ressources/Public/Icons/favicon.ico`
	`374`	`+ shortcutIcon = EXT:my_site_package/Resources/Public/Icons/favicon.ico`
`375`	`375`	`}`