Skip to content

Commit 70e2315

Browse files
ouafaaettammoya064
ouafaaetta
authored and
mmoya064
committed
Release v17.5.0 (#2653)
1 parent 347bab2 commit 70e2315

20 files changed

+1189
-485
lines changed

‎templates/_search.scss‎

Lines changed: 47 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,72 @@
22
// Search template
33
//
44
.page-type-search {
5-
label {
6-
font-weight: normal;
5+
.alert {
6+
margin-top: 30px;
77
}
88

9-
.current, .current label {
9+
.current {
1010
font-weight: 700;
1111
}
1212

13-
.location {
14-
color: #006621;
15-
padding-left: 0;
13+
.results > section {
14+
border-bottom: solid 1px #000;
15+
margin-bottom: 1.5em;
16+
padding-bottom: 1.5em;
1617

17-
li {
18+
cite a {
19+
color: #006621;
1820
display: inline-block;
21+
font-size: 1em; // 20px
22+
margin-top: 10px;
23+
}
24+
25+
.context-labels {
26+
font-size: .8em;
27+
list-style: none;
28+
padding-left: 0;
1929

20-
+ li:before {
21-
content: "> ";
30+
li {
31+
background-color: #5e738b;
32+
color:#fff;
33+
display: inline-block;
34+
font-weight: $bold-weight;
35+
margin-bottom: 1px;
36+
padding: 0 5px;
2237
}
2338
}
2439

25-
cite {
26-
font-style: normal;
40+
h2 {
41+
font-size: 1.1em;
2742
}
28-
}
29-
30-
.context-labels {
31-
font-size: .8em;
32-
list-style: none;
33-
padding-left: 0;
3443

35-
li {
36-
background-color: #5e738b;
37-
color:#fff;
38-
display: inline-block;
39-
font-weight: $bold-weight;
40-
margin-bottom: 1px;
41-
padding: 0 5px;
44+
h3 {
45+
font-size: 1.375rem;
4246
}
43-
}
44-
4547

46-
.results > section {
47-
border-bottom: solid 1px #000;
48-
margin-bottom: 1.5em;
49-
padding-bottom: 1.5em;
50-
}
48+
.location {
49+
color: #006621;
50+
padding-left: 0;
5151

52-
.label li {
53-
background-color: #5e738b;
54-
color: white;
55-
font-size: .8em; // 16px
56-
font-weight: bold;
57-
margin-top: 5px;
58-
padding-left: 5px;
59-
padding-right: 5px;
52+
li {
53+
display: inline-block;
6054

61-
// this should also include CSS to cut off and add an expand/collapse, when there are more labels than fit on 1 row
62-
}
55+
+ li:before {
56+
content: "> ";
57+
}
58+
}
6359

64-
.expand-collapse-buttons {
65-
color: white;
66-
font-size: .8em; // 16px
67-
font-weight: bold;
68-
padding-left: 5px;
69-
padding-right: 5px;
70-
}
60+
cite {
61+
font-style: normal;
62+
}
63+
}
7164

72-
cite a {
73-
color: #006621;
74-
display: inline-block;
75-
font-size: 1em; // 20px
76-
margin-top: 10px;
77-
}
65+
.location li, cite a {
66+
word-break: break-word;
67+
}
7868

79-
.search-description { // should be in noto sans, 20px, like standard p tag
80-
line-height: 34px;
81-
padding-bottom: 8px;
82-
padding-top: 8px;
69+
p {
70+
font-size: 18px;
71+
}
8372
}
8473
}

‎templates/search/advanced-search-en.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
{
3+
"title": "Advanced search page for Governement of Canada using Headless",
4+
"language": "en",
5+
"altLangPage": "advanced-search-fr.html",
6+
"pageType": "search",
7+
"pageclass": "page-type-search",
8+
"dateModified": "2025-07-28",
9+
"share": "false",
10+
"deptfeature": false,
11+
"nositesearch": true
12+
}
13+
---
14+
<form role="search">
15+
<fieldset>
16+
<legend class="h3 mrgn-tp-sm">Find pages with...</legend>
17+
<div class="form-group">
18+
<label for="advseacon1">all these words:</label>
19+
<input name="allq" class="form-control" id="advseacon1" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
20+
</div>
21+
<div class="form-group">
22+
<label for="advseacon2">this exact word or phrase:</label>
23+
<input name="exctq" class="form-control" id="advseacon2" maxlength="200" data-fusion-query="safe" aria-describedby="gc-pi">
24+
</div>
25+
<div class="form-group">
26+
<label for="advseacon3">any of these words:</label>
27+
<input name="anyq" class="form-control" id="advseacon3" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
28+
</div>
29+
<div class="form-group">
30+
<label for="advseacon4">none of these words:</label>
31+
<input name="noneq" class="form-control" id="advseacon4" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
32+
</div>
33+
<p id="gc-pi" class="mrgn-tp-md">Don’t include personal information (telephone, email, SIN, financial, medical, or work details).</p>
34+
</fieldset>
35+
<fieldset>
36+
<legend class="h3 mrgn-tp-sm">Then narrow your results by...</legend>
37+
<div class="form-group">
38+
<label for="advseacon5">pages updated:</label>
39+
<select class="form-control" name="fqupdate" id="advseacon5" data-fusion-query="safe"> <option selected="" value="">anytime</option> <option value="dateModified_dt:[NOW-1DAY TO NOW]">past 24 hours</option> <option value="dateModified_dt:[NOW-7DAYS TO NOW]">past week</option> <option value="dateModified_dt:[NOW-1MONTH TO NOW]">past month</option> <option value="dateModified_dt:[NOW-1YEAR TO NOW]">past year</option> </select>
40+
</div>
41+
<div class="form-group">
42+
<label for="advseacon7">site or domain:</label>
43+
<input name="dmn" class="form-control" id="advseacon7" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
44+
</div>
45+
<div class="form-group">
46+
<label for="advseacon8">terms appearing:</label>
47+
<select class="form-control" name="fqocct" id="advseacon8" data-fusion-query="safe"> <option value="">anywhere in the page</option> <option value="title_t">in the title of the page</option> <option value="url_t">in the URL of the page</option> <option value="body_t">in the body of the page </option></select>
48+
</div>
49+
</fieldset>
50+
<button type="submit" class="btn btn-md btn-primary">Search</button>
51+
</form>
52+
<div class="row mrgn-tp-md">
53+
<div class="col-md-2">
54+
<a href="results-en.html">Basic search</a>
55+
</div>
56+
<div class="col-md-2">
57+
<a href="https://www.canada.ca/en/sr/st.html">Search tips</a>
58+
</div>
59+
</div>

‎templates/search/advanced-search-fr.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
{
3+
"title": "Résultats de la recherche (avancés) pour le gouvernement du Canada avec Headless",
4+
"language": "fr",
5+
"altLangPage": "advanced-search-en.html",
6+
"pageType": "search",
7+
"pageclass": "page-type-search",
8+
"dateModified": "2025-07-28",
9+
"share": "false",
10+
"deptfeature": false,
11+
"nositesearch": true
12+
}
13+
---
14+
<form role="search">
15+
<fieldset>
16+
<legend class="h3 mrgn-tp-sm">Trouvez des pages avec…</legend>
17+
<div class="form-group">
18+
<label for="advseacon1">tous les mots suivants :</label>
19+
<input name="allq" class="form-control" id="advseacon1" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
20+
</div>
21+
<div class="form-group">
22+
<label for="advseacon2">ce mot ou groupe de mots exact :</label>
23+
<input name="exctq" class="form-control" id="advseacon2" maxlength="200" data-fusion-query="safe" aria-describedby="gc-pi">
24+
</div>
25+
<div class="form-group">
26+
<label for="advseacon3">l'un des mots suivants :</label>
27+
<input name="anyq" class="form-control" id="advseacon3" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
28+
</div>
29+
<div class="form-group">
30+
<label for="advseacon4">aucun des mots suivants :</label>
31+
<input name="noneq" class="form-control" id="advseacon4" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
32+
</div>
33+
<p id="gc-pi" class="mrgn-tp-md">N'incluez pas de renseignements personnels (téléphone, courriel, NAS, renseignements financiers, médicaux ou professionnels).</p>
34+
</fieldset>
35+
<fieldset>
36+
<legend class="h3 mrgn-tp-sm">Affinez ensuite la recherche par…</legend>
37+
<div class="form-group">
38+
<label for="advseacon5">dernière mise à jour :</label>
39+
<select class="form-control" name="fqupdate" id="advseacon5" data-fusion-query="safe"> <option selected="" value=""> à une date indifférente </option> <option value="dateModified_dt:[NOW-1DAY TO NOW]"> au cours des dernières 24 heures </option> <option value="dateModified_dt:[NOW-7DAYS TO NOW]"> au cours des 7 derniers jours </option> <option value="dateModified_dt:[NOW-1MONTH TO NOW]"> au cours des 31 derniers jours </option> <option value="dateModified_dt:[NOW-1YEAR TO NOW]"> au cours des 365 derniers jours </option> </select>
40+
</div>
41+
<div class="form-group">
42+
<label for="advseacon7">site ou domaine :</label>
43+
<input name="dmn" class="form-control" id="advseacon7" maxlength="100" data-fusion-query="safe" aria-describedby="gc-pi">
44+
</div>
45+
<div class="form-group">
46+
<label for="advseacon8">termes paraissant :</label>
47+
<select class="form-control" name="fqocct" id="advseacon8" data-fusion-query="safe"> <option value="" n'importe où dans la page </option> <option value="title_t"> dans le titre de la page </option> <option value="url_t">dans l'URL de la page </option> <option value="body_t">dans le corps de la page </option> </select>
48+
</div>
49+
</fieldset>
50+
<button type="submit" class="btn btn-md btn-primary">Recherche</button>
51+
</form>
52+
<div class="row mrgn-tp-md">
53+
<div class="col-md-2">
54+
<a href="results-fr.html">Recherche de base</a>
55+
</div>
56+
<div class="col-md-2">
57+
<a href="https://www.canada.ca/fr/sr/tr.html">Trucs de recherche</a>
58+
</div>
59+
</div>

0 commit comments

Comments
 (0)