From 50a48bb3314b92d3ec958bfd61c4a19e100fe03e Mon Sep 17 00:00:00 2001 From: SBsudo Date: Tue, 20 Aug 2024 10:07:50 -0400 Subject: [PATCH] Renamed stacked header variant, changed index.json accordingly --- _data/templates.json | 89 ++++++++++++++++++- templates/topic/index.json-ld | 89 ++++++++++++++++++- templates/topic/topic-doc-en.html | 1 + templates/topic/topic-doc-fr.html | 1 + templates/topic/topic-en.html | 7 +- templates/topic/topic-fr.html | 7 +- templates/topic/topic-nostackedheader-en.html | 36 ++++++++ templates/topic/topic-nostackedheader-fr.html | 36 ++++++++ 8 files changed, 256 insertions(+), 10 deletions(-) create mode 100644 templates/topic/topic-nostackedheader-en.html create mode 100644 templates/topic/topic-nostackedheader-fr.html diff --git a/_data/templates.json b/_data/templates.json index d3cbb71e1..9fbe594eb 100644 --- a/_data/templates.json +++ b/_data/templates.json @@ -1285,10 +1285,10 @@ "en": "Topic template examples", "fr": "Exemples de page de sujets" }, - "modified": "2024-06-10", + "modified": "2024-08-20", "componentName": "topic", "status": "stable", - "version": "2.0", + "version": "2.1", "pages": { "examples": [ { @@ -1301,6 +1301,16 @@ "language": "fr", "path": "topic-fr.html" }, + { + "title": "[Topic title with stacked header]", + "language": "en", + "path": "topic-stackedheader-en.html" + }, + { + "title": "[Titre du sujet avec en-tête superposée]", + "language": "fr", + "path": "topic-stackedheader-fr.html" + }, { "title": "Theme/Topic page - Demoted", "language": "en", @@ -1355,6 +1365,39 @@ }, "a11yGuidance": "No accessibility guidance.", "variations": [ + { + "name": { + "en": "Topic page with stacked header", + "fr": "Page de sujet avec en-tête superposée" + }, + "status": "stable", + "description": { + "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" + }, + "iteration": "_:iteration_topic_4", + "example": [ + { + "en": { "href": "topic-stackedheader-en.html", "text": "Topic page with stacked header" }, + "fr": { "href": "topic-stackedheader-fr.html", "text": "Page de sujet avec en-tête superposée" } + } + ], + "implementation": [ + "_:implement_topic", + "_:implement_topic_aem", + "_:implement_topic_1_to_2" + ], + "history": [ + { + "en": "August 2024 - Version 1 of the stacked header variant.", + "fr": "août 2024 - Version 1 de la variante d'en-tête empilé." + } + ] + }, { "name": { "en": "Topic page", @@ -1463,9 +1506,51 @@ "Veuillez suivre les instructions d'implémentation sous l'onglet « Standard »\"." ] } + }, + { + "@id": "_:implement_topic_stackedheader", + "iteration": "_:iteration_topic_4", + "name": { + "en": "Topic page with stacked header", + "fr": "Page de sujet avec en-tête superposée" + }, + "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." + }, + "instructions": { + "en": [ + "A full content review needs to be performed. This change cannot be automated.", + "Follow the implementation instructions under the \"Standard\" tab." + ], + "fr": [ + "Un examen complet du contenu doit être effectué. Ce changement ne peut pas être automatisé.", + "Veuillez suivre les instructions d'implémentation sous l'onglet « Standard »\"." + ] + } } ], "iteration": [ + { + "@id": "_:iteration_topic_4", + "name": "Topic page - Iteration 4", + "date": "2024-08", + "detectableBy": "Stacked main page title to display the page's section title as well as the page title.", + "example": { + "en": [ + { + "href": "topic-stackedheader-en.html", + "text": "Topic page with stacked header" + } + ], + "fr": [ + { + "href": "topic-stackedheader-fr.html", + "text": "Page de sujet avec en-tête superposée" + } + ] + } + }, { "@id": "_:iteration_topic_3", "name": "Topic page - Iteration 3", diff --git a/templates/topic/index.json-ld b/templates/topic/index.json-ld index 35645901d..e73aa8bd2 100644 --- a/templates/topic/index.json-ld +++ b/templates/topic/index.json-ld @@ -14,10 +14,10 @@ "en": "Topic template examples", "fr": "Exemples de page de sujets" }, - "modified": "2024-06-10", + "modified": "2024-08-20", "componentName": "topic", "status": "stable", - "version": "2.0", + "version": "2.1", "pages": { "examples": [ { @@ -30,6 +30,16 @@ "language": "fr", "path": "topic-fr.html" }, + { + "title": "[Topic title without stacked header]", + "language": "en", + "path": "topic-nostackedheader-en.html" + }, + { + "title": "[Titre du sujet sans en-tête superposée]", + "language": "fr", + "path": "topic-nostackedheader-fr.html" + }, { "title": "Theme/Topic page - Demoted", "language": "en", @@ -84,6 +94,39 @@ }, "a11yGuidance": "No accessibility guidance.", "variations": [ + { + "name": { + "en": "Topic page with stacked header", + "fr": "Page de sujet avec en-tête superposée" + }, + "status": "stable", + "description": { + "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" + }, + "iteration": "_:iteration_topic_4", + "example": [ + { + "en": { "href": "topic-en.html", "text": "Topic page with stacked header" }, + "fr": { "href": "topic-fr.html", "text": "Page de sujet avec en-tête superposée" } + } + ], + "implementation": [ + "_:implement_topic", + "_:implement_topic_aem", + "_:implement_topic_1_to_2" + ], + "history": [ + { + "en": "August 2024 - Version 1 of the stacked header variant.", + "fr": "août 2024 - Version 1 de la variante d'en-tête empilé." + } + ] + }, { "name": { "en": "Topic page", @@ -192,9 +235,51 @@ "Veuillez suivre les instructions d'implémentation sous l'onglet « Standard »\"." ] } + }, + { + "@id": "_:implement_topic_stackedheader", + "iteration": "_:iteration_topic_4", + "name": { + "en": "Topic page with stacked header", + "fr": "Page de sujet avec en-tête superposée" + }, + "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." + }, + "instructions": { + "en": [ + "A full content review needs to be performed. This change cannot be automated.", + "Follow the implementation instructions under the \"Standard\" tab." + ], + "fr": [ + "Un examen complet du contenu doit être effectué. Ce changement ne peut pas être automatisé.", + "Veuillez suivre les instructions d'implémentation sous l'onglet « Standard »\"." + ] + } } ], "iteration": [ + { + "@id": "_:iteration_topic_4", + "name": "Topic page - Iteration 4", + "date": "2024-08", + "detectableBy": "Stacked main page title to display the page's section title as well as the page title.", + "example": { + "en": [ + { + "href": "topic-en.html", + "text": "Topic page with stacked header" + } + ], + "fr": [ + { + "href": "topic-fr.html", + "text": "Page de sujet avec en-tête superposée" + } + ] + } + }, { "@id": "_:iteration_topic_3", "name": "Topic page - Iteration 3", diff --git a/templates/topic/topic-doc-en.html b/templates/topic/topic-doc-en.html index 5c685ecf3..64f46a0b7 100644 --- a/templates/topic/topic-doc-en.html +++ b/templates/topic/topic-doc-en.html @@ -7,3 +7,4 @@ layout: documentation index_json: index.json-ld --- +{%- include /alert-softlaunch.html genre="m" component="topic template" version="2" -%} diff --git a/templates/topic/topic-doc-fr.html b/templates/topic/topic-doc-fr.html index 331358c40..3020c149a 100644 --- a/templates/topic/topic-doc-fr.html +++ b/templates/topic/topic-doc-fr.html @@ -7,3 +7,4 @@ layout: documentation index_json: index.json-ld --- +{%- include /alert-softlaunch.html genre="m" component="gabarit de sujet" version="2" -%} diff --git a/templates/topic/topic-en.html b/templates/topic/topic-en.html index 1024ceeb8..59bc73d69 100644 --- a/templates/topic/topic-en.html +++ b/templates/topic/topic-en.html @@ -1,15 +1,16 @@ --- title: "[Topic title]" +sectionTitle: "[Section title]" layout: no-container language: "en" -altLangPage: "topic-fr.html" -dateModified: "2024-06-10" +altLangPage: "topic-stackedheader-fr.html" +dateModified: "2024-08-20" ---
-

{{ page.title }}

+ {%- include /sites/[main-page-title/main-page-title.html -%}

1-2 sentences that describe the topics and top tasks that can be accessed on this page.