diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-page-tsconfig.rst.txt index dd1bc77..3c7b2e4 100644 --- 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-settings.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt new file mode 100644 index 0000000..cc09d09 --- /dev/null +++ b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-settings.rst.txt @@ -0,0 +1,19 @@ +.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets +.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/settings.yaml + +.. code-block:: yaml + :caption: EXT:site_package/Configuration/Sets/SitePackage/settings.yaml + :linenos: + + styles: + templates: + layoutRootPath: EXT:site_package/Resources/Private/Layouts/ContentElements + partialRootPath: EXT:site_package/Resources/Private/Partials/ContentElements + templateRootPath: EXT:site_package/Resources/Private/Templates/ContentElements + content: + textmedia: + maxW: 1200 + maxWInText: 600 + linkWrap: + lightboxEnabled: true + lightboxCssClass: lightbox diff --git a/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-setup.rst.txt b/Documentation/CodeSnippets/ExtensionConfiguration/SitePackage-setup.rst.txt index b3ac190..7753562 100644 --- 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 deleted file mode 100644 index 88963c3..0000000 --- a/Documentation/CodeSnippets/TypoScript/Page.rst.txt +++ /dev/null @@ -1,13 +0,0 @@ -.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets -.. Extracted from EXT:site_package/Configuration/TypoScript/Setup/Page.typoscript - -.. code-block:: typoscript - :caption: EXT:site_package/Configuration/TypoScript/Setup/Page.typoscript - :linenos: - - page = PAGE - page { - typeNum = 0 - // 10 = TEXT - // 10.value = Hello World! - } diff --git a/Documentation/CodeSnippets/TypoScript/Part4GlobalConfiguration.rst.txt b/Documentation/CodeSnippets/TypoScript/Part4GlobalConfiguration.rst.txt deleted file mode 100644 index b0c8cff..0000000 --- a/Documentation/CodeSnippets/TypoScript/Part4GlobalConfiguration.rst.txt +++ /dev/null @@ -1,16 +0,0 @@ -.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets -.. Extracted from EXT:site_package/Configuration/TypoScript/Setup/Part4GlobalConfiguration.typoscript - -.. code-block:: typoscript - :caption: EXT:site_package/Configuration/TypoScript/Setup/Part4GlobalConfiguration.typoscript - :linenos: - - // Part 4: global site configuration - config { - # Adjust the title tag to be displayed as “website - page title” - pageTitleSeparator = - - pageTitleSeparator.noTrimWrap = | | | - - # Display the Admin Panel at the bottom of pages to logged in backend users - admPanel = 1 - } diff --git a/Documentation/CodeSnippets/TypoScript/Setup.rst.txt b/Documentation/CodeSnippets/TypoScript/Setup.rst.txt index b154e83..c4cfebb 100644 --- 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/Navigation/menu.typoscript b/Documentation/CodeSnippets/TypoScript/menu.rst.txt similarity index 64% rename from Documentation/CodeSnippets/TypoScript/Navigation/menu.typoscript rename to Documentation/CodeSnippets/TypoScript/menu.rst.txt index e5fb2a5..4dd7d58 100644 --- a/Documentation/CodeSnippets/TypoScript/Navigation/menu.typoscript +++ 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 deleted file mode 100644 index db8fd68..0000000 --- a/Documentation/CodeSnippets/TypoScript/pageview.rst.txt +++ /dev/null @@ -1,22 +0,0 @@ -.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets -.. Extracted from EXT:site_package/Configuration/TypoScript/Setup/pageview.typoscript - -.. code-block:: typoscript - :caption: EXT:site_package/Configuration/TypoScript/Setup/pageview.typoscript - :linenos: - - // Part 1: PAGEVIEW section - page { - 10 = PAGEVIEW - 10 { - paths { - 0 = EXT:site_package/Resources/Private/Templates/ - 10 = {$mySitepackage.template_path} - } - - dataProcessing { - # makes content elements available as {content} in Fluid template - 10 = page-content - } - } - } diff --git a/Documentation/CodeSnippets/codesnippets.php b/Documentation/CodeSnippets/codesnippets.php index 0a65f50..6ba45d3 100644 --- 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 index 36e47cb..22a5607 100644 --- a/Documentation/MainMenuCreation/Index.rst +++ b/Documentation/MainMenuCreation/Index.rst @@ -23,9 +23,9 @@ The :ref:`data processor 'menu' ` 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 index a273afa..aa0d08e 100644 --- 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 index 630e72a..63fda50 100644 --- 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 ` and the