Topic template: content edits

wet-boew · Aug 28, 2024 · f24908b · f24908b
1 parent 9b648bf
commit f24908b
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 29 deletions.
diff --git 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
@@ -221,9 +221,24 @@ <h2 id="variations">{% 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 @@ <h3>
 		</h3>
 
 		<p data-description>[[ Short description ]]</p>
-		{%- if lng == "fr" -%}
-		<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
-		{%- else -%}
-		<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
-		{%- endif -%}
+
+		<template data-guidance>
+			{%- if lng == "fr" -%}
+			<p>Consultez les <a href>guides de conception concernant cette variante</a>.</p>
+			{%- else -%}
+			<p>Consult the <a href>design guidance about this variation</a>.</p>
+			{%- endif -%}
+		</template>
 
 		<!--
 		<p>TODO: Screen capture</p>
@@ -548,7 +566,10 @@ <h4>{% if lng == "fr" %}Implémentation{% else %}Implementation{% endif %}</h4>
 							</template>
 
 							<template data-ajax-source-code>
-								<pre><code data-wb-ajax='{ "encode": true }'></code></pre>
+								<details>
+									<summary>{% if lng == "fr" %}Exemple de code{% else %}Code sample{% endif %}</summary>
+									<pre><code data-wb-ajax='{ "encode": true }'></code></pre>
+								</details>
 							</template>
 
 							<template data-notes>

diff --git a/sites/layouts/documentation_pattern.html b/sites/layouts/documentation_pattern.html
@@ -208,7 +208,21 @@ <h2 id="variations">{% 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" },
+
+		{
+			"template": "[data-guidance]",
+			"test": "fn:guessType",
+			"assess": "/guidance",
+			"mapping": [
+				{
+					"selector": "p",
+					"value": "/guidance",
+					"mapping": [
+						{ "selector": "a", "value": "/{{lng}}", "attr": "href" }
+					]
+				}
+			]
+		},
 
 		{
 			"template": "[data-variation-example]",
@@ -430,11 +444,14 @@ <h2 id="variations">{% if lng == "fr" %}Variantes{% else %}Variations{% endif %}
 		<h3><span data-name>[[ Name of the variation ]]</span></h3>
 
 		<p data-description>[[ Short description ]]</p>
-		{%- if lng == "fr" -%}
-		<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
-		{%- else -%}
-		<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
-		{%- endif -%}
+
+		<template data-guidance>
+			{%- if lng == "fr" -%}
+			<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
+			{%- else -%}
+			<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
+			{%- endif -%}
+		</template>
 
 		<!--
 		<p>TODO: Screen capture</p>

diff --git a/templates/topic/index.json-ld b/templates/topic/index.json-ld
@@ -145,10 +145,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": [
 				{
@@ -158,7 +155,7 @@
 			],
 			"implementation": [
 				"_:implement_topic_stackedheader",
-				"_:implement_topic_aem",
+				"_:implement_topic_stackedheader_aem",
 				"_:implement_topic_1_to_2"
 			],
 			"history": [
@@ -203,9 +200,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": [
@@ -261,6 +257,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": [