From f24908b0ba7a49ae22b86613eb8a40b07f315fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Garneau?= Date: Wed, 28 Aug 2024 11:44:32 -0400 Subject: [PATCH] Topic template: content edits --- _data/templates.json | 34 +++++++++++++++++------ sites/layouts/documentation.html | 35 +++++++++++++++++++----- sites/layouts/documentation_pattern.html | 29 ++++++++++++++++---- templates/topic/index.json-ld | 34 +++++++++++++++++------ 4 files changed, 103 insertions(+), 29 deletions(-) diff --git a/_data/templates.json b/_data/templates.json index 37d2f8d0a..3f4fb2910 100644 --- a/_data/templates.json +++ b/_data/templates.json @@ -1416,10 +1416,7 @@ "en": "Use the stacked main page title to display the page's section title as well as the page title.", "fr": "Utilisez le titre de la page principale superposé pour afficher le titre de la section de la page ainsi que le titre de la page." }, - "guidance": { - "en": "https://design.canada.ca/mandatory-templates/theme-topic.html", - "fr": "https://conception.canada.ca/modeles-obligatoire/theme-sujet.html" - }, + "guidance": "no guidance defined.", "iteration": "_:iteration_topic_3", "example": [ { @@ -1429,7 +1426,7 @@ ], "implementation": [ "_:implement_topic_stackedheader", - "_:implement_topic_aem", + "_:implement_topic_stackedheader_aem", "_:implement_topic_1_to_2" ], "history": [ @@ -1474,9 +1471,8 @@ "fr": "Utilisateurs AEM" }, "introduction": { - "en": "Use the stacked main page title to display the page's section title as well as the page title.", - "fr": "Utilisez le titre de la page principale superposé pour afficher le titre de la section de la page ainsi que le titre de la page." - + "en": "This implementation is meant for publishers adding the template manually into an AEM page.", + "fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM." }, "instructions": { "en": [ @@ -1532,6 +1528,28 @@ "en": "topic-stackedheader-en.html main > *:not(.pagedetails)", "fr": "topic-stackedheader-fr.html main > *:not(.pagedetails)" } + }, + { + "@id": "_:implement_topic_stackedheader_aem", + "iteration": "_:iteration_topic_3", + "name": { + "en": "AEM users", + "fr": "Utilisateurs AEM" + }, + "introduction": { + "en": "This implementation is meant for publishers adding the template manually into an AEM page.", + "fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM." + }, + "instructions": { + "en": [ + "Use the stacked main page title to display the page's section title as well as the page title.", + "Please refer to the documentation on GCPedia." + ], + "fr": [ + "Utilisez le titre de la page principale superposé pour afficher le titre de la section de la page ainsi que le titre de la page.", + "Veuillez vous référer à la documentation dans GCPedia." + ] + } } ], "iteration": [ diff --git a/sites/layouts/documentation.html b/sites/layouts/documentation.html index da8b42a4b..74b6674b4 100644 --- a/sites/layouts/documentation.html +++ b/sites/layouts/documentation.html @@ -221,9 +221,24 @@

{% if lng == "fr" %}Variantes{% else %}Variations{% endif %} "mapping": [ { "selector": "[data-name]", "value": "/name/{{lng}}" }, { "selector": "[data-description]", "value": "/description/{{lng}}", "isHTML": true }, - { "selector": "[data-guidance]", "value": "/guidance/{{lng}}", "attr": "href" }, { "selector": "[data-iteration]", "value": "/revisedFor/name/{{lng}}" }, + { + "template": "[data-guidance]", + "test": "fn:guessType", + "expect": "rdfs:Resource", + "assess": "/guidance", + "mapping": [ + { + "selector": "p", + "value": "/guidance", + "mapping": [ + { "selector": "a", "value": "/{{lng}}", "attr": "href" } + ] + } + ] + }, + { "@type": "rdf:Alt", "mapping": [ @@ -500,11 +515,14 @@

[[ Short description ]]

- {%- if lng == "fr" -%} -

Consultez les guides de conception concernant cette variante.

- {%- else -%} -

Consult the design guidance about this variation.

- {%- endif -%} + +