Skip to content

Commit 32d2d86

Browse files
GarneaumaGarneauma
authored
Content - Topic template: content edits (#2420)
1 parent d69ee26 commit 32d2d86

File tree

5 files changed

+105
-31
lines changed

5 files changed

+105
-31
lines changed

‎_data/templates.json‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,10 +1416,7 @@
14161416
"en": "Use the stacked main page title to display the page's section title as well as the page title.",
14171417
"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."
14181418
},
1419-
"guidance": {
1420-
"en": "https://design.canada.ca/mandatory-templates/theme-topic.html",
1421-
"fr": "https://conception.canada.ca/modeles-obligatoire/theme-sujet.html"
1422-
},
1419+
"guidance": "no guidance defined.",
14231420
"iteration": "_:iteration_topic_3",
14241421
"example": [
14251422
{
@@ -1429,7 +1426,7 @@
14291426
],
14301427
"implementation": [
14311428
"_:implement_topic_stackedheader",
1432-
"_:implement_topic_aem",
1429+
"_:implement_topic_stackedheader_aem",
14331430
"_:implement_topic_1_to_2"
14341431
],
14351432
"history": [
@@ -1474,9 +1471,8 @@
14741471
"fr": "Utilisateurs AEM"
14751472
},
14761473
"introduction": {
1477-
"en": "Use the stacked main page title to display the page's section title as well as the page title.",
1478-
"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."
1479-
1474+
"en": "This implementation is meant for publishers adding the template manually into an AEM page.",
1475+
"fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM."
14801476
},
14811477
"instructions": {
14821478
"en": [
@@ -1532,6 +1528,28 @@
15321528
"en": "topic-stackedheader-en.html main > *:not(.pagedetails)",
15331529
"fr": "topic-stackedheader-fr.html main > *:not(.pagedetails)"
15341530
}
1531+
},
1532+
{
1533+
"@id": "_:implement_topic_stackedheader_aem",
1534+
"iteration": "_:iteration_topic_3",
1535+
"name": {
1536+
"en": "AEM users",
1537+
"fr": "Utilisateurs AEM"
1538+
},
1539+
"introduction": {
1540+
"en": "This implementation is meant for publishers adding the template manually into an AEM page.",
1541+
"fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM."
1542+
},
1543+
"instructions": {
1544+
"en": [
1545+
"Use the stacked main page title to display the page's section title as well as the page title.",
1546+
"Please refer to the documentation on GCPedia."
1547+
],
1548+
"fr": [
1549+
"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.",
1550+
"Veuillez vous référer à la documentation dans GCPedia."
1551+
]
1552+
}
15351553
}
15361554
],
15371555
"iteration": [

‎_includes/alert-softlaunch.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{%- if page.language == "fr" -%}
22
<section class="alert alert-info">
33
<h2>Prélancement</h2>
4-
<p>{%- if include.genre == "f" -%}La composante{%- else -%}Le composant{%- endif %} <strong>{{ include.component }}</strong> sur cette page implémente la <em>version {{ include.version }}</em> qui a été prélancé{%- if include.genre == "f" -%}e{%- endif %} jusqu'à ce que les lignes directrices officielles soient publiées par le Bureau de la transformation numérique du SCT.</p>
4+
<p>{%- if include.genre == "f" -%}La composante{%- else -%}Le composant{%- endif %} <strong>{{ include.component }}</strong> sur cette page implémente la <em>version {{ include.version }}</em> qui a été prélancé{%- if include.genre == "f" -%}e{%- endif %} jusqu'à ce que les lignes directrices officielles soient publiées par le Bureau de la transformation numérique du SNC.</p>
55
</section>
66
{%- elsif page.language == "en" -%}
77
<section class="alert alert-info">
88
<h2>Soft launch</h2>
9-
<p>The <strong>{{ include.component }}</strong> component on this page implements the <em>version {{ include.version }}</em> which has been soft launched until the official guidance is published by the Digital Transformation Office at TBS.</p>
9+
<p>The <strong>{{ include.component }}</strong> component on this page implements the <em>version {{ include.version }}</em> which has been soft launched until the official guidance is published by the Digital Transformation Office at CDS.</p>
1010
</section>
1111
{%- endif -%}

‎sites/layouts/documentation.html‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,24 @@ <h2 id="variations">{% if lng == "fr" %}Variantes{% else %}Variations{% endif %}
221221
"mapping": [
222222
{ "selector": "[data-name]", "value": "/name/{{lng}}" },
223223
{ "selector": "[data-description]", "value": "/description/{{lng}}", "isHTML": true },
224-
{ "selector": "[data-guidance]", "value": "/guidance/{{lng}}", "attr": "href" },
225224
{ "selector": "[data-iteration]", "value": "/revisedFor/name/{{lng}}" },
226225
226+
{
227+
"template": "[data-guidance]",
228+
"test": "fn:guessType",
229+
"expect": "rdfs:Resource",
230+
"assess": "/guidance",
231+
"mapping": [
232+
{
233+
"selector": "p",
234+
"value": "/guidance",
235+
"mapping": [
236+
{ "selector": "a", "value": "/{{lng}}", "attr": "href" }
237+
]
238+
}
239+
]
240+
},
241+
227242
{
228243
"@type": "rdf:Alt",
229244
"mapping": [
@@ -500,11 +515,14 @@ <h3>
500515
</h3>
501516

502517
<p data-description>[[ Short description ]]</p>
503-
{%- if lng == "fr" -%}
504-
<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
505-
{%- else -%}
506-
<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
507-
{%- endif -%}
518+
519+
<template data-guidance>
520+
{%- if lng == "fr" -%}
521+
<p>Consultez les <a href>guides de conception concernant cette variante</a>.</p>
522+
{%- else -%}
523+
<p>Consult the <a href>design guidance about this variation</a>.</p>
524+
{%- endif -%}
525+
</template>
508526

509527
<!--
510528
<p>TODO: Screen capture</p>
@@ -548,7 +566,10 @@ <h4>{% if lng == "fr" %}Implémentation{% else %}Implementation{% endif %}</h4>
548566
</template>
549567

550568
<template data-ajax-source-code>
551-
<pre><code data-wb-ajax='{ "encode": true }'></code></pre>
569+
<details>
570+
<summary>{% if lng == "fr" %}Exemple de code{% else %}Code sample{% endif %}</summary>
571+
<pre><code data-wb-ajax='{ "encode": true }'></code></pre>
572+
</details>
552573
</template>
553574

554575
<template data-notes>

‎sites/layouts/documentation_pattern.html‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,21 @@ <h2 id="variations">{% if lng == "fr" %}Variantes{% else %}Variations{% endif %}
208208
"mapping": [
209209
{ "selector": "[data-name]", "value": "/name/{{lng}}" },
210210
{ "selector": "[data-description]", "value": "/description/{{lng}}", "isHTML": true },
211-
{ "selector": "[data-guidance]", "value": "/guidance/{{lng}}", "attr": "href" },
211+
212+
{
213+
"template": "[data-guidance]",
214+
"test": "fn:guessType",
215+
"assess": "/guidance",
216+
"mapping": [
217+
{
218+
"selector": "p",
219+
"value": "/guidance",
220+
"mapping": [
221+
{ "selector": "a", "value": "/{{lng}}", "attr": "href" }
222+
]
223+
}
224+
]
225+
},
212226
213227
{
214228
"template": "[data-variation-example]",
@@ -430,11 +444,14 @@ <h2 id="variations">{% if lng == "fr" %}Variantes{% else %}Variations{% endif %}
430444
<h3><span data-name>[[ Name of the variation ]]</span></h3>
431445

432446
<p data-description>[[ Short description ]]</p>
433-
{%- if lng == "fr" -%}
434-
<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
435-
{%- else -%}
436-
<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
437-
{%- endif -%}
447+
448+
<template data-guidance>
449+
{%- if lng == "fr" -%}
450+
<p>Consultez les <a data-guidance href>guides de conception concernant cette variante</a>.</p>
451+
{%- else -%}
452+
<p>Consult the <a data-guidance href>design guidance about this variation</a>.</p>
453+
{%- endif -%}
454+
</template>
438455

439456
<!--
440457
<p>TODO: Screen capture</p>

‎templates/topic/index.json-ld‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,7 @@
145145
"en": "Use the stacked main page title to display the page's section title as well as the page title.",
146146
"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."
147147
},
148-
"guidance": {
149-
"en": "https://design.canada.ca/mandatory-templates/theme-topic.html",
150-
"fr": "https://conception.canada.ca/modeles-obligatoire/theme-sujet.html"
151-
},
148+
"guidance": "no guidance defined.",
152149
"iteration": "_:iteration_topic_3",
153150
"example": [
154151
{
@@ -158,7 +155,7 @@
158155
],
159156
"implementation": [
160157
"_:implement_topic_stackedheader",
161-
"_:implement_topic_aem",
158+
"_:implement_topic_stackedheader_aem",
162159
"_:implement_topic_1_to_2"
163160
],
164161
"history": [
@@ -203,9 +200,8 @@
203200
"fr": "Utilisateurs AEM"
204201
},
205202
"introduction": {
206-
"en": "Use the stacked main page title to display the page's section title as well as the page title.",
207-
"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."
208-
203+
"en": "This implementation is meant for publishers adding the template manually into an AEM page.",
204+
"fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM."
209205
},
210206
"instructions": {
211207
"en": [
@@ -261,6 +257,28 @@
261257
"en": "topic-stackedheader-en.html main > *:not(.pagedetails)",
262258
"fr": "topic-stackedheader-fr.html main > *:not(.pagedetails)"
263259
}
260+
},
261+
{
262+
"@id": "_:implement_topic_stackedheader_aem",
263+
"iteration": "_:iteration_topic_3",
264+
"name": {
265+
"en": "AEM users",
266+
"fr": "Utilisateurs AEM"
267+
},
268+
"introduction": {
269+
"en": "This implementation is meant for publishers adding the template manually into an AEM page.",
270+
"fr": "Cette implémentation est destinée aux éditeurs qui ajoutent le gabarit manuellement à une page d'AEM."
271+
},
272+
"instructions": {
273+
"en": [
274+
"Use the stacked main page title to display the page's section title as well as the page title.",
275+
"Please refer to the documentation on GCPedia."
276+
],
277+
"fr": [
278+
"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.",
279+
"Veuillez vous référer à la documentation dans GCPedia."
280+
]
281+
}
264282
}
265283
],
266284
"iteration": [

0 commit comments

Comments
 (0)