Skip to content

Commit

Permalink
[FEATURE] Introduce site sets in the configuration chapter (#158)
Browse files Browse the repository at this point in the history
* Regenerate code snippets
* Other places still need to be changed but trying to keep PRs as small as initially possible

releases: main
  • Loading branch information
linawolf authored May 15, 2024
1 parent e00d4d8 commit 7db008b
Show file tree
Hide file tree
Showing 29 changed files with 287 additions and 225 deletions.
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: tutorial-sitepackage
type: php
docroot: ""
php_version: "8.1"
php_version: "8.2"
webserver_type: nginx-fpm
router_http_port: "8081"
router_https_port: "4434"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/composer.json
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/composer.json
.. code-block:: json
:caption: EXT:site_package/composer.json
Expand All @@ -22,8 +22,8 @@
}
],
"require": {
"typo3/cms-core": "^12.0.0|dev-main",
"typo3/cms-fluid-styled-content": "^12.0.0|dev-main"
"typo3/cms-core": "^13.1.0|dev-main",
"typo3/cms-fluid-styled-content": "^13.1.0|dev-main"
},
"homepage": "https://github.com/TYPO3-Documentation/TYPO3CMS-Tutorial-SitePackage-Code",
"license": "MIT",
Expand All @@ -45,7 +45,7 @@
"extension-key": "site_package"
},
"branch-alias": {
"dev-master": "12.0.x-dev"
"dev-master": "13.0.x-dev"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/config.yaml
.. code-block:: yaml
:caption: EXT:site_package/Configuration/Sets/SitePackage/config.yaml
:linenos:
name: t3docs/site-package
label: Example site package set
dependencies:
- typo3/fluid-styled-content
- typo3/fluid-styled-content-css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/constants.typoscript
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/Sets/SitePackage/constants.typoscript
page {
fluidtemplate {
layoutRootPath = EXT:site_package/Resources/Private/Layouts/Page/
partialRootPath = EXT:site_package/Resources/Private/Partials/Page/
templateRootPath = EXT:site_package/Resources/Private/Templates/Page/
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/page.tsconfig
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/Sets/SitePackage/page.tsconfig
@import 'EXT:site_package/Configuration/TsConfig/Page/PageLayout/*.tsconfig'
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.. 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/Sets/SitePackage/setup.typoscript
@import 'EXT:site_package/Configuration/TypoScript/Setup/*.typoscript'

This file was deleted.

This file was deleted.

5 changes: 2 additions & 3 deletions Documentation/CodeSnippets/Fluid/Layout.rst.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Private/Layouts/Page/Default.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Private/Layouts/Page/Default.html
.. code-block:: html
:caption: EXT:site_package/Resources/Private/Layouts/Page/Default.html
:linenos:


<f:render partial="Navigation/MainNavigation.html" arguments="{_all}"/>
<f:render section="Main" />

4 changes: 2 additions & 2 deletions Documentation/CodeSnippets/Fluid/PartialJumbotron.rst.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Private/Partials/Page/Jumbotron.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Private/Partials/Page/Jumbotron.html
.. code-block:: html
:caption: EXT:site_package/Resources/Private/Partials/Page/Jumbotron.html
Expand Down
7 changes: 3 additions & 4 deletions Documentation/CodeSnippets/Fluid/Step1Default.rst.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Public/StaticTemplate/Step1Default.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Public/StaticTemplate/Step1Default.html
.. code-block:: html
:caption: EXT:site_package/Resources/Public/StaticTemplate/Step1Default.html
:linenos:


<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#">Navbar</a>
<button aria-controls="navbarsExampleDefault"
Expand All @@ -28,7 +27,7 @@
</ul>
</div>
</nav>

<main role="main">
<div class="jumbotron">
<div class="container">
Expand Down
7 changes: 3 additions & 4 deletions Documentation/CodeSnippets/Fluid/Step2Default.rst.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Public/StaticTemplate/Step2Default.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Public/StaticTemplate/Step2Default.html
.. code-block:: html
:caption: EXT:site_package/Resources/Public/StaticTemplate/Step2Default.html
:linenos:


<f:render partial="Navigation/MainNavigation.html" arguments="{_all}"/>

<main role="main">
<f:render partial="Jumbotron" />
<div class="container">
Expand Down
7 changes: 3 additions & 4 deletions Documentation/CodeSnippets/Fluid/Step3Default.rst.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Public/StaticTemplate/Step3Default.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Public/StaticTemplate/Step3Default.html
.. code-block:: html
:caption: EXT:site_package/Resources/Public/StaticTemplate/Step3Default.html
:linenos:


<f:layout name="Default" />
<f:section name="Main">
<f:render partial="Navigation/MainNavigation.html" arguments="{_all}"/>

<main role="main">
<f:render partial="Jumbotron" />
<div class="container">
Expand Down
14 changes: 7 additions & 7 deletions Documentation/CodeSnippets/Fluid/TemplateDefault.rst.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Private/Templates/Page/Default.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Private/Templates/Page/Default.html
.. code-block:: html
:caption: EXT:site_package/Resources/Private/Templates/Page/Default.html
:linenos:

<f:layout name="Default" />
<f:section name="Main">

<main role="main">

<f:render partial="Jumbotron" arguments="{jumbotronContent: jumbotronContent}"/>

<div class="container">
<div class="row">
<div class="col-md-12">
Expand All @@ -25,8 +25,8 @@
</div>
</div>
</div>

</main>

</f:section>

12 changes: 6 additions & 6 deletions Documentation/CodeSnippets/Fluid/TemplateTwoColumns.rst.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Resources/Private/Templates/Page/TwoColumns.html
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Resources/Private/Templates/Page/TwoColumns.html
.. code-block:: html
:caption: EXT:site_package/Resources/Private/Templates/Page/TwoColumns.html
:linenos:

<f:layout name="Default" />
<f:section name="Main">

<main role="main">
<f:render partial="Jumbotron" arguments="{jumbotronContent: jumbotronContent}"/>

<div class="container">
<div class="row">
<div class="col-12 col-md-8">
Expand All @@ -33,8 +33,8 @@
</div>
</div>
</div>

</main>

</f:section>

8 changes: 3 additions & 5 deletions Documentation/CodeSnippets/TypoScript/Constants.rst.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Configuration/TypoScript/constants.typoscript
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/Sets/SitePackage/constants.typoscript
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/TypoScript/constants.typoscript
:caption: EXT:site_package/Configuration/Sets/SitePackage/constants.typoscript
:linenos:
@import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript'
page {
fluidtemplate {
layoutRootPath = EXT:site_package/Resources/Private/Layouts/Page/
Expand Down
4 changes: 2 additions & 2 deletions Documentation/CodeSnippets/TypoScript/Page.rst.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Configuration/TypoScript/Setup/Page.typoscript
.. 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Configuration/TypoScript/Setup/Part1FluidTemplateSection.typoscript
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/TypoScript/Setup/Part1FluidTemplateSection.typoscript
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/TypoScript/Setup/Part1FluidTemplateSection.typoscript
Expand All @@ -21,20 +21,20 @@
1.current = 1
}
}
ifEmpty = Default
}
templateRootPaths {
0 = EXT:site_package/Resources/Private/Templates/Page/
1 = {$page.fluidtemplate.templateRootPath}
}
partialRootPaths {
0 = EXT:site_package/Resources/Private/Partials/Page/
1 = {$page.fluidtemplate.partialRootPath}
}
layoutRootPaths {
0 = EXT:site_package/Resources/Private/Layouts/Page/
1 = {$page.fluidtemplate.layoutRootPath}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from typo3conf/ext/site_package/Configuration/TypoScript/Setup/Part2CssFileInclusion.typoscript
.. Generated by https://github.com/TYPO3-Documentation/t3docs-codesnippets
.. Extracted from EXT:site_package/Configuration/TypoScript/Setup/Part2CssFileInclusion.typoscript
.. code-block:: typoscript
:caption: EXT:site_package/Configuration/TypoScript/Setup/Part2CssFileInclusion.typoscript
:linenos:
page {
// Part 2: CSS file inclusion
includeCSS {
bootstrap = https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css
bootstrap.external = 1
website = EXT:site_package/Resources/Public/Css/website.css
}
// Part 3: JavaScript file inclusion
includeJSFooter {
jquery = https://code.jquery.com/jquery-3.2.1.slim.min.js
Expand Down
Loading

0 comments on commit 7db008b

Please sign in to comment.