From 784b3ea647a1e96a49fff542fe04eb48ae1e031c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20M=C3=BCller?= <2566282+brotkrueml@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:00:57 +0200 Subject: [PATCH 1/3] [TASK] Move page.meta refresh example to dedicated section (#1336) The Open Graph meta tag examples are polluted by the meta refresh example. This is now moved to the already available section. The previous "[seconds]; [URL, leave blank for same page]" is removed as this is not a manual about the "refresh" property but about setting that property in TYPO3. Releases: main, 12.4 --- Documentation/TopLevelObjects/Page/Index.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/TopLevelObjects/Page/Index.rst b/Documentation/TopLevelObjects/Page/Index.rst index 8bcdccfbd..0ec081f39 100644 --- a/Documentation/TopLevelObjects/Page/Index.rst +++ b/Documentation/TopLevelObjects/Page/Index.rst @@ -473,7 +473,7 @@ Properties The optional properties from :ref:`includeJS ` can be applied. - Currently one difference between :typoscript:`includeJS` and :typoscript:`includeJSFooterlibs` exists: + Currently one difference between :typoscript:`includeJS` and :typoscript:`includeJSFooterlibs` exists: There is no :typoscript:`data`-array as optional parameter but all keys not explicitly mentioned as parameters are used as additional attributes - behaviour is the same as in :ref:`includeCSS `. .. code-block:: typoscript @@ -499,7 +499,7 @@ Properties The optional properties from :ref:`includeJS ` can be applied. - Currently one difference between :typoscript:`includeJS` and :typoscript:`includeJSLibs` exists: + Currently one difference between :typoscript:`includeJS` and :typoscript:`includeJSLibs` exists: There is no :typoscript:`data`-array as optional parameter but all keys not explicitly mentioned as parameters are used as additional attributes - behaviour is the same as in :ref:`includeCSS `. .. code-block:: typoscript @@ -987,7 +987,8 @@ Demonstrates: .. code-block:: typoscript :caption: EXT:site_package/Configuration/TypoScript/setup.typoscript - meta.refresh = [seconds]; [URL, leave blank for same page] + page.meta.refresh = 5; url=https://example.org/ + page.meta.refresh.attribute = http-equiv .. _setup-page-meta-example-og: @@ -1023,8 +1024,6 @@ Open Graph meta tags: 2 = de_DE } } - refresh = 5; url=https://example.org/ - refresh.attribute = http-equiv } .. note:: From bd6a0a9b82fe7f5ee1fd27a315b315c1ef1ec90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20M=C3=BCller?= <2566282+brotkrueml@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:01:33 +0200 Subject: [PATCH 2/3] [BUGFIX] Move example output for formattedDate out of code block (#1339) Releases: main, 12.4 --- Documentation/Functions/Stdwrap.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Functions/Stdwrap.rst b/Documentation/Functions/Stdwrap.rst index a0cd28d3b..b8369725f 100644 --- a/Documentation/Functions/Stdwrap.rst +++ b/Documentation/Functions/Stdwrap.rst @@ -935,7 +935,7 @@ formattedDate formattedDate.locale = fr-FR } - will result in "dimanche 12 mars 2023 à 11:16:44 heure d’été du Pacifique". + will result in "dimanche 12 mars 2023 à 11:16:44 heure d’été du Pacifique". .. note:: The timezone will be taken from the setting `date.timezone` in your From 16cf4c081f3fc15d7804160b70d1ddcd16877415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20M=C3=BCller?= <2566282+brotkrueml@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:09:06 +0200 Subject: [PATCH 3/3] [BUGFIX] Adjust default value for typolink extTarget (#1340) Tested with this snippet in main and v12: page.20 = TEXT page.20.value = link to example.com page.20.typolink.parameter = https://example.com/ Releases: main, 12.4 --- Documentation/Functions/Typolink.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Functions/Typolink.rst b/Documentation/Functions/Typolink.rst index 31198026a..333f1374a 100644 --- a/Documentation/Functions/Typolink.rst +++ b/Documentation/Functions/Typolink.rst @@ -36,7 +36,7 @@ extTarget .. confval:: extTarget :name: typolink-extTarget :type: :ref:`data-type-target` / :ref:`stdwrap` - :Default: `_top` + :Default: "" (no target set) Target used for external links