diff --git a/_config.yml b/_config.yml index b80c3f89c8..65edf56b9a 100644 --- a/_config.yml +++ b/_config.yml @@ -6,8 +6,8 @@ website: "https://wet-boew.github.io/GCWeb/" # URL of your public facing website global: lang: fr feedbackPath: - en: "/sites/feedback/ajax/report-problem-en.html" - fr: "/sites/feedback/ajax/report-problem-fr.html" + en: "https://wet-boew.github.io/GCWeb/sites/feedback/ajax/page-feedback-en.html" + fr: "https://wet-boew.github.io/GCWeb/sites/feedback/ajax/page-feedback-fr.html" # contextualFooter: # Contextual footer settings # title: # fr: "Référence d'implémentation de Canada.ca" diff --git a/_data/sites.json b/_data/sites.json index 0a72a8aa28..3c4c4019c0 100644 --- a/_data/sites.json +++ b/_data/sites.json @@ -171,39 +171,69 @@ "modified": "dct:modified" }, "title": { - "en": "Report a problem (RAP) - Feedback", - "fr": "Signaler un problème (SUP) - Commentaires" + "en": "Feedback area", + "fr": "Zone de rétroaction" }, "description": { - "en": "Documentation on how to use the page feedback form.", - "fr": "Documentation sur l'utilisation de formulaire de commentaires de page." + "en": "Documentation on how to use the elements of the feedback area.", + "fr": "Documentation sur l'utilisation des éléments de la zone commentaires." }, - "modified": "2022-04-26", + "modified": "2023-01-10", "componentName": "feedback", "status": "stable", "pages": { "docs": [ { - "title": "Documentation for Page feedback form", + "title": "Documentation for the feedback area", "language": "en", "path": "feedback-docs-en.html" }, { - "title": "Documentation pour formulaire de commentaire de page", + "title": "Documentation pour la zone de rétroaction", "language": "fr", "path": "feedback-docs-fr.html" } ], "examples": [ { - "title": "Page feedback form", + "title": "Page feedback tool", + "language": "en", + "path": "page-feedback-en.html" + }, + { + "title": "Outil de rétroaction sur la page", + "language": "fr", + "path": "page-feedback-fr.html" + }, + { + "title": "Page feedback tool with contact link", + "language": "en", + "path": "page-feedback-contact-en.html" + }, + { + "title": "Outil de rétroaction sur la page avec lien de contact", + "language": "fr", + "path": "page-feedback-contact-fr.html" + }, + { + "title": "Page feedback tool without comment", + "language": "en", + "path": "page-feedback-no-form-en.html" + }, + { + "title": "Outil de rétroaction sur la page sans commentaire", + "language": "fr", + "path": "page-feedbac-no-formk-fr.html" + }, + { + "title": "Report a problem", "language": "en", - "path": "feedback-en.html" + "path": "report-problem-en.html" }, { - "title": "Formulaire de commentaire de page", + "title": "Signaler un problème", "language": "fr", - "path": "feedback-fr.html" + "path": "report-problem-fr.html" } ] } @@ -344,50 +374,6 @@ ] } } -,{ - "@context": { - "@version": 1.1, - "dct": "http://purl.org/dc/terms/", - "title": { "@id": "dct:title", "@container": "@language" }, - "description": { "@id": "dct:description", "@container": "@language" }, - "modified": "dct:modified" - }, - "title": { - "en": "Page feedback tool", - "fr": "Outil de rétroaction sur la page" - }, - "description": { - "en": "Page feedback tool for Canada.ca", - "fr": "Outil de rétroaction sur la page pour Canada.ca" - }, - "modified": "2022-12-06", - "componentName": "gc-page-feedback", - "status": "stable", - "pages": { - "examples": [ - { - "title": "Page feedback tool", - "language": "en", - "path": "gc-page-feedback-en.html" - }, - { - "title": "Outil de rétroaction sur la page", - "language": "fr", - "path": "gc-page-feedback-fr.html" - }, - { - "title": "Page feedback tool with custom parameters", - "language": "en", - "path": "gc-page-feedback-custom-en.html" - }, - { - "title": "Outil de rétroaction sur la page avec paramètres personnalisés", - "language": "fr", - "path": "gc-page-feedback-custom-fr.html" - } - ] - } -} ,{ "@context": { "@version": 2.0, diff --git a/_includes/gc-page-feedback/gc-page-feedback.html b/_includes/gc-page-feedback/gc-page-feedback.html deleted file mode 100644 index d614cd7e3e..0000000000 --- a/_includes/gc-page-feedback/gc-page-feedback.html +++ /dev/null @@ -1,12 +0,0 @@ - -{%- if page.dir == "/sites/gc-page-feedback/" -%} - {%- include_relative includes/css.html -%} - {%- include_relative includes/gc-page-feedback.html -%} -{%- else -%} -

Error: The page feedback tool only can only be activated in pages located at "sites/gc-page-feedback/*.html".

-{%- endif -%} diff --git a/_includes/page-details/footer.html b/_includes/page-details/footer.html deleted file mode 100644 index cad6a7932e..0000000000 --- a/_includes/page-details/footer.html +++ /dev/null @@ -1,45 +0,0 @@ - - diff --git a/package-lock.json b/package-lock.json index 39ec8602c9..feebd34906 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1573,7 +1573,7 @@ "code-prettify": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz", - "integrity": "sha512-tNOWwXoF3ycqtvLCGPLYds2hKekmZfsPWinbRcLk6BBHBaSf+v+HJOvfg33VfVzYzvQ6zmVq+WO88oKweiJSQg==" + "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4=" }, "coffeescript": { "version": "2.5.1", @@ -2362,7 +2362,7 @@ "es5-shim": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-2.3.0.tgz", - "integrity": "sha512-lqeBVvMTAbQwqOSVMJbhE/ykQ2tQm5so3tFsEc9fRsN8sxde/4o74WMDPKF/u9SY/d900D59ccra5PhKZI5hIw==" + "integrity": "sha1-kCG8UK1Nmj5TkwjuvTRDcgNVUAM=" }, "es6-iterator": { "version": "2.0.3", @@ -5886,7 +5886,7 @@ "html5shiv": { "version": "3.7.3", "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz", - "integrity": "sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==" + "integrity": "sha1-14qEo2e8uacQEA1XgCw4ewhGMdI=" }, "htmlparser2": { "version": "3.10.1", @@ -6546,7 +6546,7 @@ "jquery": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz", - "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q==" + "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=" }, "jquery-validation": { "version": "1.19.5", @@ -6666,7 +6666,7 @@ "jsonpointer.js": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/jsonpointer.js/-/jsonpointer.js-0.4.0.tgz", - "integrity": "sha512-2bf/1crAmPpsmj1I6rDT6W0SOErkrNBpb555xNWcMVWYrX6VnXpG0GRMQ2shvOHwafpfse8q0gnzPFYVH6Tqdg==" + "integrity": "sha1-ACyxI/dnqv3rAZYTLOXE+ZQcyro=" }, "jsprim": { "version": "1.4.1", @@ -7414,7 +7414,7 @@ "mgrs": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-0.0.0.tgz", - "integrity": "sha512-YQm8HnF5Ty7EH+X+Pn9h8P4tdE7Jcyvm6RJ6Ed8HdyTZIZQ5yMa7apQQF58KMfC7wKFaBbtyGBAcTWBAfeHchw==" + "integrity": "sha1-qqK0gpMXv4ERipYNMlbgbdlnS40=" }, "micromatch": { "version": "3.1.10", @@ -8719,7 +8719,7 @@ "proj4": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.3.3.tgz", - "integrity": "sha512-ZmXyIEcq1+fQROkr92rFdXLTPZyBFtcxyagu1cVSFtPfK8MOcctakofmAzHDovut2/UIZpzVqMVX69rAly4/Uw==", + "integrity": "sha1-SWp2hXivQ55Gd6CFpjmh8ZjLvc0=", "requires": { "mgrs": "0.0.0" } diff --git a/sites/gc-page-feedback/_base.scss b/sites/feedback/_base.scss similarity index 63% rename from sites/gc-page-feedback/_base.scss rename to sites/feedback/_base.scss index 10692aba5a..2c9336d52e 100644 --- a/sites/gc-page-feedback/_base.scss +++ b/sites/feedback/_base.scss @@ -2,10 +2,21 @@ @title: Page feedback tool - Base */ -/* In noscript/basic HTML mode... */ -.no-js, -.wb-disable { - .gc-pft { +#gc-pft { + details { + margin-bottom: 15px; + margin-top: 0; + } + + .gc-pft-no { + details summary { + font-weight: $bold-weight; + } + } + + /* In noscript/basic HTML mode... */ + .no-js &, + .wb-disable & { /* Disable row gutters (default selector isn't specific-enough) */ .row-no-gutters { @extend .row-no-gutters; diff --git a/sites/gc-page-feedback/_print.scss b/sites/feedback/_print.scss similarity index 57% rename from sites/gc-page-feedback/_print.scss rename to sites/feedback/_print.scss index 5f9c4031db..b206302f22 100644 --- a/sites/gc-page-feedback/_print.scss +++ b/sites/feedback/_print.scss @@ -3,5 +3,5 @@ */ .gc-pft { - @extend %gcweb-print-display-none-important; + display: none !important; } diff --git a/sites/gc-page-feedback/_screen-sm-min.scss b/sites/feedback/_screen-sm-min.scss similarity index 100% rename from sites/gc-page-feedback/_screen-sm-min.scss rename to sites/feedback/_screen-sm-min.scss diff --git a/sites/feedback/ajax/deprecated/report-problem-v1-en.html b/sites/feedback/ajax/deprecated/report-problem-v1-en.html new file mode 100644 index 0000000000..21a260c3da --- /dev/null +++ b/sites/feedback/ajax/deprecated/report-problem-v1-en.html @@ -0,0 +1,57 @@ +
+
+
+ Report a problem on this page +
+
+
+
+ Please select all that apply: +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+

Thank you for your help!

+

You will not receive a reply. For enquiries, please contact us.

+
+
+
+
+
diff --git a/sites/feedback/ajax/deprecated/report-problem-v1-fr.html b/sites/feedback/ajax/deprecated/report-problem-v1-fr.html new file mode 100644 index 0000000000..71e7257888 --- /dev/null +++ b/sites/feedback/ajax/deprecated/report-problem-v1-fr.html @@ -0,0 +1,57 @@ +
+
+
+ Signaler un problème ou une erreur sur cette page +
+
+
+
+ Veuillez cocher toutes les réponses pertinentes : +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+

Merci de votre aide!

+

Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît contactez-nous.

+
+
+
+
+
diff --git a/sites/feedback/ajax/report-problem-v2-en.html b/sites/feedback/ajax/deprecated/report-problem-v2-en.html similarity index 100% rename from sites/feedback/ajax/report-problem-v2-en.html rename to sites/feedback/ajax/deprecated/report-problem-v2-en.html diff --git a/sites/feedback/ajax/report-problem-v2-fr.html b/sites/feedback/ajax/deprecated/report-problem-v2-fr.html similarity index 100% rename from sites/feedback/ajax/report-problem-v2-fr.html rename to sites/feedback/ajax/deprecated/report-problem-v2-fr.html diff --git a/sites/feedback/ajax/deprecated/report-problem-v3-en.html b/sites/feedback/ajax/deprecated/report-problem-v3-en.html new file mode 100644 index 0000000000..f5abf9a435 --- /dev/null +++ b/sites/feedback/ajax/deprecated/report-problem-v3-en.html @@ -0,0 +1,79 @@ +
+
+
+ Report a problem on this page +
+
+
+
+ + + + + + + +
+ + Please select all that apply: + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+

Thank you for your help!

+

You will not receive a reply. For enquiries, please contact us.

+
+

Something went wrong. Please submit your information via an alternative method.

+
+
+
+
+
diff --git a/sites/feedback/ajax/deprecated/report-problem-v3-fr.html b/sites/feedback/ajax/deprecated/report-problem-v3-fr.html new file mode 100644 index 0000000000..68e56d3dee --- /dev/null +++ b/sites/feedback/ajax/deprecated/report-problem-v3-fr.html @@ -0,0 +1,78 @@ +
+
+ Signaler un problème ou une erreur sur cette page +
+
+
+
+ + + + + + + +
+ + Veuillez sélectionner toutes les cases qui s'appliquent : + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+

Merci de votre aide!

+

Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît contactez-nous.

+
+

Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.

+
+
+
+
+
diff --git a/sites/feedback/ajax/page-feedback-contact-en.html b/sites/feedback/ajax/page-feedback-contact-en.html new file mode 100644 index 0000000000..3cc6cf2469 --- /dev/null +++ b/sites/feedback/ajax/page-feedback-contact-en.html @@ -0,0 +1,69 @@ +
+
+
+

Give feedback about this page

+
+
+ +
+
+ Did you find what you were looking for? +
+ +
+
+ + +
+
+
+

If not, tell us why below:

+

Tell us why below:

+
+ Need urgent help with a problem? Contact us +

+ +

+
+
+ +

You will not receive a reply. Don't include personal information (telephone, email, SIN, financial, medical, or work details).

+

Maximum 300 characters

+ +
+ +
+
+
+

Thank you for your feedback.

+
+
+
+
diff --git a/sites/feedback/ajax/page-feedback-contact-fr.html b/sites/feedback/ajax/page-feedback-contact-fr.html new file mode 100644 index 0000000000..e276208d32 --- /dev/null +++ b/sites/feedback/ajax/page-feedback-contact-fr.html @@ -0,0 +1,69 @@ +
+
+
+

Donnez votre rétroaction sur cette page

+
+
+ +
+
+ Avez-vous trouvé ce que vous cherchiez? +
+ +
+
+ + +
+
+
+

Sinon, dites nous pourquoi ci-dessous :

+

Dites nous pourquoi ci-dessous :

+
+ Besoin d’aide urgente pour résoudre un problème? Communiquez avec nous +

+ +

+
+
+ +

Vous ne recevrez pas de réponse. N'incluez pas de renseignements personnels (téléphone, courriel, NAS, renseignements financiers, médicaux ou professionnels).

+

Maximum de 300 caractères

+ +
+ +
+
+
+

Merci de vos commentaires.

+
+
+
+
diff --git a/sites/feedback/ajax/page-feedback-en.html b/sites/feedback/ajax/page-feedback-en.html new file mode 100644 index 0000000000..f509f62579 --- /dev/null +++ b/sites/feedback/ajax/page-feedback-en.html @@ -0,0 +1,58 @@ +
+
+
+

Give feedback about this page

+
+
+ +
+
+ Did you find what you were looking for? +
+ +
+
+ + +
+
+
+

If not, tell us why below:

+

Tell us why below:

+
+ +

You will not receive a reply. Don't include personal information (telephone, email, SIN, financial, medical, or work details).

+

Maximum 300 characters

+ +
+ +
+
+
+

Thank you for your feedback.

+
+
+
+
diff --git a/sites/feedback/ajax/page-feedback-fr.html b/sites/feedback/ajax/page-feedback-fr.html new file mode 100644 index 0000000000..65dc742313 --- /dev/null +++ b/sites/feedback/ajax/page-feedback-fr.html @@ -0,0 +1,58 @@ +
+
+
+

Donnez votre rétroaction sur cette page

+
+
+ +
+
+ Avez-vous trouvé ce que vous cherchiez? +
+ +
+
+ + +
+
+
+

Sinon, dites nous pourquoi ci-dessous :

+

Dites nous pourquoi ci-dessous :

+
+ +

Vous ne recevrez pas de réponse. N'incluez pas de renseignements personnels (téléphone, courriel, NAS, renseignements financiers, médicaux ou professionnels).

+

Maximum de 300 caractères

+ +
+ +
+
+
+

Merci de vos commentaires.

+
+
+
+
diff --git a/sites/feedback/ajax/report-problem-aa-en.html b/sites/feedback/ajax/report-problem-aa-en.html deleted file mode 100644 index 5e23844424..0000000000 --- a/sites/feedback/ajax/report-problem-aa-en.html +++ /dev/null @@ -1,107 +0,0 @@ -
-
- Report a problem on this page -
-
-
-
- - - - - - - -
- Please select all that apply: -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
-
- - -
-
- - -
-
- -
-
-
-

Thank you for your help!

-

You will not receive a reply. For enquiries, please contact us.

-
-

Something went wrong. Please submit your information via an alternative method.

-
-
-
-
diff --git a/sites/feedback/ajax/report-problem-aa-fr.html b/sites/feedback/ajax/report-problem-aa-fr.html deleted file mode 100644 index 5d883e9c31..0000000000 --- a/sites/feedback/ajax/report-problem-aa-fr.html +++ /dev/null @@ -1,109 +0,0 @@ -
-
- Signaler un problème ou une erreur sur cette page -
-
-
-
- - - - - - - -
- - Veuillez sélectionner toutes les cases qui s'appliquent : - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
-
- - -
-
- - -
-
- -
-
-
-

Merci de votre aide!

-

Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît contactez-nous.

-
-

Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.

-
-
-
-
diff --git a/sites/feedback/ajax/report-problem-v1-en.html b/sites/feedback/ajax/report-problem-v1-en.html deleted file mode 100644 index 5ffa139c12..0000000000 --- a/sites/feedback/ajax/report-problem-v1-en.html +++ /dev/null @@ -1,54 +0,0 @@ -
-
Report a problem on this page -
-
-
-
- Please select all that apply: -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
-

Thank you for your help!

-

You will not receive a reply. For enquiries, please contact us.

-
-
-
-
diff --git a/sites/feedback/ajax/report-problem-v1-fr.html b/sites/feedback/ajax/report-problem-v1-fr.html deleted file mode 100644 index e9a045d7a4..0000000000 --- a/sites/feedback/ajax/report-problem-v1-fr.html +++ /dev/null @@ -1,54 +0,0 @@ -
-
Signaler un problème ou une erreur sur cette page -
-
-
-
- Veuillez cocher toutes les réponses pertinentes : -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
-
-
-

Merci de votre aide!

-

Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît contactez-nous.

-
-
-
-
diff --git a/sites/feedback/feedback-aa-en.html b/sites/feedback/feedback-aa-en.html deleted file mode 100644 index 1420bce91a..0000000000 --- a/sites/feedback/feedback-aa-en.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -{ - "title": "Page feedback form using Analytics data attributes", - "language": "en", - "altLangPage": "feedback-aa-fr.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], - "secondlevel": false, - "dateModified": "2022-04-26", - "share": "true", - "feedbackPath": "ajax/report-problem-aa-en.html" -} ---- - -

This page feedback form is using analytics data attributes.

-

HTML code

-
<div data-ajax-replace="ajax/report-problem-aa-en.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-9 col-md-6 col-lg-5">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
-		</div>
-	</div>
-</div>
diff --git a/sites/feedback/feedback-aa-fr.html b/sites/feedback/feedback-aa-fr.html deleted file mode 100644 index 0de3a1b7d2..0000000000 --- a/sites/feedback/feedback-aa-fr.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -{ - "title": "Formulaire de commentaires de page utilisant les attributs de données analytiques", - "language": "fr", - "altLangPage": "feedback-aa-en.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], - "secondlevel": false, - "dateModified": "2022-04-26", - "share": "true", - "feedbackPath": "ajax/report-problem-aa-fr.html" -} ---- - -

Ce formulaire de commentaires de page utilise des attributs de données analytiques.

-

Le code HTML

-
<div data-ajax-replace="ajax/report-problem-aa-fr.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-11 col-md-7 col-lg-6">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème ou une erreur sur cette page </a>
-		</div>
-	</div>
-</div>
diff --git a/sites/feedback/feedback-docs-en.html b/sites/feedback/feedback-docs-en.html index 3b2176c3d9..a148b58b2b 100644 --- a/sites/feedback/feedback-docs-en.html +++ b/sites/feedback/feedback-docs-en.html @@ -1,397 +1,353 @@ --- { - "title": "Page feedback (RAP) - Documentation", + "title": "Feedback area - Documentation", "language": "en", "altLangPage": "feedback-docs-fr.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], "secondlevel": false, - "dateModified": "2022-04-26", - "share": true, - "feedbackPath": "ajax/report-problem-en.html" + "dateModified": "2023-01-10", + "share": true } ---
Status
Stable
+
Version
+
3.0.0
Type
Canada.ca site functionality
-
Last review
-
2022-04-26
-

Purpose

-

Displays the Page feedback form

+

Introduction

+

Purpose

+

Provide feedback on any given page through a form.

+

Evaluation and report

+

There is no evaluation and report available for this component.

+ +

Guidance

+ -

Working example

+

Variants

+

This component supports the following variants:

+
+

Note

+

All variants are comprised of two sub-components:

+ +
+ +

Variant 1: Page Feedback Tool (default)

+

Iteration 1

-

How to implement

+

Working example(s)

+ +

How to implement

+ +

For more information about Data Ajax plugin, please visit Data Ajax documentation page.

-

Evaluation and report

-

There is no evaluation and report available for this component.

+
GCWeb Jekyll specific
+

To apply this variant's optional attributes on any given page, you will need to do the following in the page's front-matter:

+ +

For example:

+
"feedbackData": {
+	"theme": "Theme",
+	"section": "Section"
+}
+ +

Code sample

+{%- highlight html -%} +
+
+ +
+
+{%- endhighlight -%} +
+ Ajaxed-in content + {%- highlight html -%} + {%- include_relative ajax/page-feedback-en.html -%} + {%- endhighlight -%} +
+ +

Variant 2: Page Feedback Tool With Contact Link

+

Iteration 1

+ +

Working example(s)

+ + +

How to implement

+ +

For more information about Data Ajax plugin, please visit Data Ajax documentation page.

+ +
GCWeb Jekyll specific
+

To apply this variant on any given page, you will need to do the following in the page's front-matter:

+ +

For example:

+
"feedbackPath": "ajax/page-feedback-contact-en.html",
+"feedbackContact": {
+	"link": "Contact link",
+	"url": "https://canada.ca"
+},
+"feedbackData": {
+	"theme": "Theme",
+	"section": "Section"
+}
-

API (Version 2.0)

+

Code sample

+{%- highlight html -%} +
+
+ +
+
+{%- endhighlight -%} +
+ Ajaxed-in content + {%- highlight html -%} + {%- include_relative ajax/page-feedback-contact-en.html -%} + {%- endhighlight -%} +
+

Variant 3: Report a Problem (RAP)

+

Iteration 4

+

Here is a list of changes that happened since the previous iteration:

- - - - + + + + + + - - - - + +
CSS ClassTemplateVisual renderingSchemaBreaking +
    +
  • Leveraging JSON Manager Extractor and Data JSON to generate hidden input fields
  • +
+
Additionsn/a
n.a.Version 2.0n.a.n.a.Fixesn/a
-

Template (latest: v2.0)

-

Template migration notes

-

Site template includes

-
-
-
Version 2.0
-

The html inserted by the Data Ajax plugin can be found on the following page: https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-en.html.

-
<div data-ajax-replace="ajax/report-problem-en.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-9 col-md-6 col-lg-5">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
-		</div>
-	</div>
-</div>
-
-
-
Before, version 1.0
-
<details class="brdr-0">
-	<summary class="btn btn-default text-center">Report a problem on this page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl" id="wb-auto-4">
-				{ feedback form }
-			</div>
-			<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide" id="wb-auto-5">
-				<h3>Thank you for your help!</h3>
-				<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-			</div>
-		</div>
-	</div>
-</details>
-
-
+

Working example(s)

+ -

Report a problem (RAP) form (feedback)

-

Implemented ajax files reference

+

How to implement

-
Version 4.0
-
<div class="row row-no-gutters">
-	<div class="col-sm-9 col-md-6 col-lg-5">
-		<details class="brdr-0">
-			<summary class="btn btn-default text-center">Report a problem on this page</summary>
-			<div class="well row">
-				<div class="gc-rprt-prblm">
-					<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-						<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback"
-							data-wb-postback='{
-								"success": ".success-message",
-								"failure": ".failure-message"}'
-							data-wb-jsonmanager='{
-								"name": "rap",
-								"extractor": [
-									{ "interface": "referer", "path": "externalReferer" },
-									{ "selector": "title", "path": "pageTitle" },
-									{ "interface": "locationHref", "path": "submissionPage" },
-									{ "selector": "html", "attr": "lang", "path": "lang" },
-									{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "pageOwner" },
-									{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "subject" }
-								]
-							}'>
-							<div data-wb-json='{
-								"url": "#[rap]",
-								"mapping": [
-									{ "selector": "input", "attr": "name", "value": "/@id" },
-									{ "selector": "input", "attr": "value", "value": "/@value" }
-								]
-							}'>
-								<template>
-									<input type="hidden" name=" value=" />
-								</template>
-							</div>
-							<fieldset>
-								<legend>
-									<span class="field-name">Please select all that apply:</span>
-								</legend>
-								<div class="checkbox">
-									<label for="problem1">
-										<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
-									</label>
-									<input name="problem1" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem2">
-										<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
-									</label>
-									<input name="problem2" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem3">
-										<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
-									</label>
-									<input name="problem3" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem4">
-										<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
-									</label>
-									<input name="problem4" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem5">
-										<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account
-									</label>
-									<input name="problem5" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem11">
-										<input name="problem11" id="problem11" type="checkbox" value="Yes" >I can't find what I'm looking for
-									</label>
-									<input name="problem11" type="hidden" value=">
-								</div>
-								<div class="checkbox">
-									<label for="problem12">
-										<input name="problem12" id="problem12" type="checkbox" value="Yes" >Other issue not in this list
-									</label>
-									<input name="problem12" type="hidden" value=">
-								</div>
-							</fieldset>
-							<button type="submit" class="btn btn-primary">Submit</button>
-						</form>
-					</div>
-					<div class="success-message hide">
-						<h3>Thank you for your help!</h3>
-						<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-					</div>
-					<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
-				</div>
-			</div>
-		</details>
-	</div>
+

For more information about Data Ajax plugin, please visit Data Ajax documentation page.

+
+ Adobe Analytics implementation +

To implement Adobe Analytics in the Report a problem form, simply add the attribute data-gc-analytics-rap to every checkbox with the value being the same as the current language's label, followed by a dash and followed by the other language's label.

+

For example:

+
<div class="checkbox">
+	<label for="problem2">
+		<input name="problem2" id="problem2" type="checkbox" value="Yes" data-gc-analytics-rap="It has a spelling mistake-Il y a une erreur d'orthographe ou de grammaire">It has a spelling mistake
+	</label>
+	<input name="problem2" type="hidden" value="">
 </div>
+
+ +
Hidden input fields
+

The Report a problem variant leverages JSON Manager and Data JSON to get information about the page and generate hidden input fields in the form.

+

Here is the list of tags that need to be present in the page:

+ + +
GCWeb Jekyll specific
+

To apply this variant on any given page, you will need to set the variable feedbackPath to "ajax/report-problem-en.html" in the page's front-matter or in the site configurations (_config.yml).

-
Previous versions
+

Code sample

+{%- highlight html -%} +
+ +
+{%- endhighlight -%}
- Version 3.0 -
<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{"success":".success-message","failure":".failure-message","content":".form-content"}" >
-		<fieldset>
-			<legend>
-				<span class="field-name">Please select all that apply:</span>
-			</legend>
-			<div class="checkbox">
-				<label for="problem1">
-					<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
-				</label>
-				<input name="problem1" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem2">
-					<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
-				</label>
-				<input name="problem2" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem3">
-					<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
-				</label>
-				<input name="problem3" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem4">
-					<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
-				</label>
-				<input name="problem4" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem5">
-					<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account
-				</label>
-				<input name="problem5" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem11">
-					<input name="problem11" id="problem11" type="checkbox" value="Yes" >I can't find what I'm looking for
-				</label>
-				<input name="problem11" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem12">
-					<input name="problem12" id="problem12" type="checkbox" value="Yes" >Other issue not in this list
-				</label>
-				<input name="problem12" type="hidden" value="">
-			</div>
-		</fieldset>
-		<strong><button type="submit" class="btn btn-primary">Submit</button></strong>
-	</form>
-	<div class="success-message hide">
-		<h3>Thank you for your help!</h3>
-		<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-	</div>
-	<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
+ Ajaxed-in content + {%- highlight html -%} + {%- include_relative ajax/report-problem-en.html -%} + {%- endhighlight -%}
+ +

Previous iterations

+
- Version 2.0 -
<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{"success":".success-message","failure":".failure-message","content":".form-content"}" >
-		<fieldset>
-			<legend>
-				<span class="field-name">Please select all that apply:</span>
-			</legend>
-			<div class="checkbox">
-				<label for="problem1">
-					<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
-				</label>
-				<input name="problem1" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem2">
-					<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
-				</label>
-				<input name="problem2" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem3">
-					<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
-				</label>
-				<input name="problem3" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem4">
-					<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
-				</label>
-				<input name="problem4" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem5">
-					<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account (e.g. My Service Canada Account)
-				</label>
-				<input name="problem5" type="hidden" value="">
-			</div>
-			<ul>
-				<li class="checkbox">
-					<label for="problem6a">
-						<input name="problem6" id="problem6a" type="checkbox" value="Yes" >GC Key access
-					</label>
-					<input name="problem6" type="hidden" value="">
-				</li>
-				<li class="checkbox">
-					<label for="problem7">
-						<input name="problem7" id="problem7" type="checkbox" value="Yes" >SecureKey Concierge (Banking Credential) access
-					</label>
-					<input name="problem7" type="hidden" value="">
-				</li>
-				<li class="checkbox">
-					<label for="problem8">
-						<input name="problem8" id="problem8" type="checkbox" value="Yes" >Personal Access Code (PAC) problems or EI Access Code (AC) problems
-					</label>
-					<input name="problem8" type="hidden" value="">
-				</li>
-				<li class="checkbox">
-					<label for="problem9">
-						<input name="problem9" id="problem9" type="checkbox" value="Yes" >Social Insurance Number (SIN) validation problems
-					</label>
-					<input name="problem9" type="hidden" value="">
-				</li>
-				<li class="checkbox">
-					<label for="problem10">
-						<input name="problem10" id="problem10" type="checkbox" value="Yes" >Other login error not in this list
-					</label>
-					<input name="problem10" type="hidden" value="">
-				</li>
-			</ul>
-			<div class="checkbox">
-				<label for="problem11">
-					<input name="problem11" id="problem11" type="checkbox" value="Yes" >I can't find what I'm looking for
-				</label>
-				<input name="problem11" type="hidden" value="">
-			</div>
-			<div class="checkbox">
-				<label for="problem12">
-					<input name="problem12" id="problem12" type="checkbox" value="Yes" >Other issue not in this list
-				</label>
-				<input name="problem12" type="hidden" value="">
-			</div>
-		</fieldset>
-		<strong><button type="submit" class="btn btn-primary">Submit</button></strong>
-	</form>
-	<div class="success-message hide">
-		<h3>Thank you for your help!</h3>
-		<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-	</div>
-	<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
+ Iteration 3 +

Here is a list of changes that happened since the previous iteration:

+ + + + + + + + + + + + + +
Breaking +
    +
  • Removed login error sub-options.
  • +
  • Renamed login error option.
  • +
+
Additionsn/a
Fixesn/a
+ +

Code sample

+ {%- highlight html -%} +
+ +
+ {%- endhighlight -%} +
+ Ajaxed-in content + {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v3-en.html -%} + {%- endhighlight -%} +
+ +
- Version 1.0 -
<form action="#">
-		<fieldset>
-			<legend><span class="field-name">Please select all that apply:</span></legend>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f1">
-					<input type="checkbox" name="problem1" value="Yes" id="gc-rprt-prblm-f1" />A link, button or video is not working
-				</label>
-				<input name="problem1" type="hidden" value="No" />
-			</div>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f2">
-					<input type="checkbox" name="problem2" value="Yes" id="gc-rprt-prblm-f2" />It has a spelling mistake
-				</label>
-				<input name="problem2" type="hidden" value="No" />
-			</div>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f3">
-					<input type="checkbox" name="problem3" value="Yes" id="gc-rprt-prblm-f3" />Information is missing
-				</label>
-				<input name="problem3" type="hidden" value="No" />
-			</div>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f4">
-					<input type="checkbox" name="problem4" value="Yes" id="gc-rprt-prblm-f4" />Information is outdated or wrong
-				</label>
-				<input name="problem4" type="hidden" value="No" />
-			</div>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f5">
-					<input type="checkbox" name="problem5" value="Yes" id="gc-rprt-prblm-f5" />I can't find what I'm looking for
-				</label>
-				<input name="problem5" type="hidden" value="No" />
-			</div>
-			<div class="checkbox">
-				<label for="gc-rprt-prblm-f6">
-					<input type="checkbox" name="problem6" value="Yes" id="gc-rprt-prblm-f6" />Other issue not in this list
-				</label>
-				<input name="problem6" type="hidden" value="No" />
-			</div>
-		</fieldset>
-		<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Submit</button>
-	</form>
+ Iteration 2 +

Here is a list of changes that happened since the previous iteration:

+ + + + + + + + + + + + + +
Breaking +
    +
  • Rework of the template to use data-ajax. Includes fallback for basic HTML version.
  • +
  • Updated form: +
      +
    • Now implements wb-postback for form validation and no longer uses data-toggle on submit.
    • +
    • Added login error options (problem 5 to problem 10).
    • +
    • Added error and success messages.
    • +
    +
  • +
+
Additionsn/a
Fixesn/a
+ +

Code sample

+ {%- highlight html -%} +
+
+ {%- endhighlight -%} +
+ Ajaxed-in content + {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v2-en.html -%} + {%- endhighlight -%} +
+
+
+ Iteration 1 +

Code sample

+ {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v1-en.html -%} + {%- endhighlight -%}
diff --git a/sites/feedback/feedback-docs-fr.html b/sites/feedback/feedback-docs-fr.html index e2f4452235..304b663e77 100644 --- a/sites/feedback/feedback-docs-fr.html +++ b/sites/feedback/feedback-docs-fr.html @@ -1,396 +1,349 @@ --- { - "title": "Commentaires de page (SUP) - Documentation", + "title": "Zone de rétroaction - Documentation", "language": "fr", "altLangPage": "feedback-docs-en.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], "secondlevel": false, - "dateModified": "2022-04-26", - "share": "true", - "feedbackPath": "ajax/report-problem-fr.html" - + "dateModified": "2023-01-10", + "share": "true" } --- -
Statut
Stable
+
Version
+
3.0.0
Type
-
Fonctionnalité du site Canada.ca
-
Dernière révision
-
2022-04-26
+
Fonctionnalité globale de site de Canada.ca
-

Objectif

-

Affiche le formulaire de commentaires sur la page

+

Introduction

+

Objectif

+

Obtenir une rétroaction des utilisateurs sur une page donnée via un formulaire.

-

Exemple pratique

+

Évaluation et rapport

+

Il n'y a pas d'évaluation ni de rapport disponible pour cette composante.

+ +

Orientation

+

Variantes

+

Ce composant prend en charge les variantes suivantes :

+ +
+

Note

+

Toutes les variantes sont composées de deux sous-composants :

+
    +
  • Le premier est utilisé pour l'intégration sur la page.
  • +
  • Le second est le formulaire qui est inséré dynamiquement via un appel Ajax.
  • +
+
-

Comment mettre en œuvre

+

Variante 1: Outil de rétroaction sur la page (par défaut)

+

Itération 1

+ +

Exemple(s) pratique(s)

+ +

Comment mettre en œuvre

+ +

Pour plus d'informations sur le plugin Data Ajax, veuillez visiter la page de documentation Data Ajax.

+ +
Spécifique à GCWeb Jekyll
+

Pour appliquer les attributs facultatifs de cette variante sur une page donnée, vous devrez procéder comme suit dans le front-matter de la page :

+ +

Par exemple :

+
"feedbackData": {
+	"theme": "Thème",
+	"section": "Section"
+}
+ +

Exemple de code

+{%- highlight html -%} +
+ +
+{%- endhighlight -%} +
+ Contenu ajouté via Ajax + {%- highlight html -%} + {%- include_relative ajax/page-feedback-fr.html -%} + {%- endhighlight -%} +
+ +

Variante 2: Outil de rétroaction sur la page avec lien de contact

+

Itération 1

+ +

Exemple(s) pratique(s)

+ -

Évaluation et rapport

-

Il n'y a pas d'évaluation ni de rapport disponible pour ce composant.

+

Comment mettre en œuvre

+ +

Pour plus d'informations sur le plugin Data Ajax, veuillez visiter la page de documentation Data Ajax.

-

API (version 2.0)

- +
Spécifique à GCWeb Jekyll
+

Pour appliquer cette variante sur une page donnée, vous devrez faire ce qui suit dans l'en-tête de la page :

+ +

Par exemple :

+
"feedbackPath": "ajax/page-feedback-contact-fr.html",
+"feedbackContact": {
+	"link": "Lien de contact",
+	"url": "https://canada.ca/fr"
+},
+"feedbackData": {
+	"theme": "Thème",
+	"section": "Section"
+}
+ +

Exemple de code

+{%- highlight html -%} +
+ +
+{%- endhighlight -%} +
+ Contenu ajouté via Ajax + {%- highlight html -%} + {%- include_relative ajax/page-feedback-contact-fr.html -%} + {%- endhighlight -%} +
+ +

Variante 3: Signaler un problème sur cette page (SUP)

+

Itération 4

+

Voici une liste des changements qui se sont produits depuis l'itération précédente :

+
+ + + + - - - - + + - - - - + +
Majeurs +
    +
  • Utilise JSON Manager Extractor et Data JSON pour générer des champs de saisie masqués
  • +
+
Classe CSSGabaritRendu visuelSchémaAdditionsn/a
n.d.Version 2.0n.d.n.d.Correctifsn/a
-

Gabarit (dernière : v.2.0)

-

Notes sur la migration du gabarit

-

Composant du gabarit de site

-
-
-
Version 2.0
-

Le html inséré par le plugiciel Data Ajax se trouve sur la page suivante : https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-fr.html.

-
<div data-ajax-replace="ajax/report-problem-fr.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-11 col-md-7 col-lg-6">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème ou une erreur sur cette page </a>
-		</div>
-	</div>
-</div>
-
-
-
Avant, la version 1.0
-
<details class="brdr-0">
-	<summary class="btn btn-default text-center">Signaler un problème sur cette page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl" >
-				{ formulaire de commentaires }
-			</div>
-			<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide" >
-				<h3>Merci pour votre aide !</h3>
-				<p>Vous ne recevrez pas de réponse. Pour toute demande, veuillez <a href="https://www.canada.ca/fr/contact.html">nous contacter</a>.</p>
-			</div>
-		</div>
-	</div>
-</details>
-
-
-

Formulaire de signalement d'un problème (SUP) (commentaires)

-

Référence des fichiers ajax implémentés

+

Exemple(s) pratique(s)

-
Version 4.0
-
<div class="row row-no-gutters"><div class="col-sm-11 col-md-7 col-lg-6">
-	<details class="brdr-0">
-		<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
-		<div class="well row">
-			<div class="gc-rprt-prblm">
-				<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-					<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback"
-						data-wb-postback='{
-							"success": ".success-message",
-							"failure": ".failure-message"}'
-						data-wb-jsonmanager='{
-							"name": "rap",
-							"extractor": [
-								{ "interface": "referer", "path": "externalReferer" },
-								{ "selector": "title", "path": "pageTitle" },
-								{ "interface": "locationHref", "path": "submissionPage" },
-								{ "selector": "html", "attr": "lang", "path": "lang" },
-								{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "pageOwner" },
-								{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "subject" }
-							]
-						}'>
-						<div data-wb-json='{
-							"url": "#[rap]",
-							"mapping": [
-								{ "selector": "input", "attr": "name", "value": "/@id" },
-								{ "selector": "input", "attr": "value", "value": "/@value" }
-							]
-						}'>
-							<template>
-								<input type="hidden" name=" value=" />
-							</template>
-						</div>
-						<fieldset>
-							<legend>
-								<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
-							</legend>
-							<div class="checkbox">
-								<label for="problem1">
-									<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
-								</label>
-								<input name="problem1" type="hidden" value=">
-							</div>
-							<div class="checkbox">
-								<label for="problem2">
-									<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
-								</label>
-								<input name="problem2" type="hidden" value=">
-							</div>
-							<div class="checkbox">
-								<label for="problem3">
-									<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
-								</label>
-								<input name="problem3" type="hidden" value=">
-							</div>
-							<div class="checkbox">
-								<label for="problem4">
-									<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
-								</label>
-								<input name="problem4" type="hidden" value=">
-							</div>
-							<div class="checkbox">
-								<label for="problem5">
-									<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
-								</label>
-								<input name="problem5" type="hidden" value=">
-							</div>
-							<div class="checkbox">
-								<label for="problem11">
-									<input name="problem11" id="problem11" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
-								</label>
-								<input name="problem11" type="hidden" value=">
-							</div>
-								<div class="checkbox">
-									<label for="problem12">
-										<input name="problem12" id="problem12" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
-									</label>
-								<input name="problem12" type="hidden" value=">
-							</div>
-						</fieldset>
-						<button type="submit" class="btn btn-primary">Soumettre</button>
-					</form>
-				</div>
-				<div class="success-message hide">
-					<h3>Merci de votre aide!</h3>
-					<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
-				</div>
-				<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
-			</div>
-		</div>
-	</details>
-	</div>
-</div>
-
+

Comment mettre en œuvre

+ +

Pour plus d'informations sur le plugin Data Ajax, veuillez visiter la page de documentation Data Ajax.

+
+ Implementation de Adobe Analytics +

Pour implémenter Adobe Analytics dans le formulaire Signaler un problème, ajoutez simplement l'attribut data-gc-analytics-rap à chaque case à cocher avec la valeur étant la même que le "label" de la langue actuelle, suivie d'un tiret et suivi par le "label" de l'autre langue.

+

Par exemple :

+
<div class="checkbox">
+	<label for="problem2">
+		<input name="problem2" id="problem2" type="checkbox" value="Yes" data-gc-analytics-rap="Il y a une erreur d'orthographe ou de grammaire-It has a spelling mistake">Il y a une erreur d'orthographe ou de grammaire
+	</label>
+	<input name="problem2" type="hidden" value="">
+</div>
+
-
Versions précédentes
+
Champs de saisie masqués
+

La variante Signaler un problème utilise JSON Manager et Data JSON pour obtenir des informations sur la page et générer des champs de saisie masqués dans le formulaire.

+

Voici la liste des balises qui doivent être présentes dans la page :

+ + +
Spécifique à GCWeb Jekyll
+

Pour appliquer cette variante sur une page donnée, vous devrez définir la variable feedbackPath à "ajax/report-problem-fr.html" dans l'en-tête de la page ou dans les configurations du site (_config.yml).

+ +

Exemple de code

+{%- highlight html -%} +
+ +
+{%- endhighlight -%}
- Version 3.0 -
<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{"success":".success-message","failure":".failure-message","content":".form-content"}">
-	<fieldset>
-		<legend>
-			<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
-		</legend>
-		<div class="checkbox">
-			<label for="problem1">
-				<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
-			</label>
-			<input name="problem1" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem2">
-				<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
-			</label>
-			<input name="problem2" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem3">
-				<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
-			</label>
-			<input name="problem3" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem4">
-				<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
-			</label>
-			<input name="problem4" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem5">
-				<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
-			</label>
-			<input name="problem5" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem11">
-				<input name="problem11" id="problem11" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
-			</label>
-			<input name="problem11" type="hidden" value="">
-		</div>
-			<div class="checkbox">
-				<label for="problem12">
-					<input name="problem12" id="problem12" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
-				</label>
-			<input name="problem12" type="hidden" value="">
-		</div>
-	</fieldset>
-	<strong><button type="submit" class="btn btn-primary">Soumettre</button></strong>
-</form><div class="success-message hide">
-	<h3>Merci de votre aide!</h3>
-	<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
-</div>
-<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
+ Contenu ajouté via Ajax + {%- highlight html -%} + {%- include_relative ajax/report-problem-fr.html -%} + {%- endhighlight -%}
+ +

Itérations précédentes

- Version 2.0 -
<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{"success":".success-message","failure":".failure-message","content":".form-content"}"  >
-	<fieldset>
-		<legend>
-			<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
-		</legend>
-		<div class="checkbox">
-			<label for="problem1">
-				<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
-			</label>
-			<input name="problem1" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem2">
-				<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
-			</label>
-			<input name="problem2" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem3">
-				<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
-			</label>
-			<input name="problem3" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem4">
-				<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
-			</label>
-			<input name="problem4" type="hidden" value="">
-		</div>
-		<div class="checkbox">
-			<label for="problem5">
-				<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte (ex. Mon dossier Service Canada)
-			</label>
-			<input name="problem5" type="hidden" value="">
-		</div>
-		<ul>
-			<li class="checkbox">
-				<label for="problem6a">
-					<input name="problem6" id="problem6a" type="checkbox" value="Yes" >Accès CléGC
-				</label>
-				<input name="problem6" type="hidden" value="">
-			</li>
-			<li class="checkbox">
-				<label for="problem7">
-					<input name="problem7" id="problem7" type="checkbox" value="Yes" >Accès SecureKey Service de Concierge (justificatifs d'identité bancaires)
-				</label>
-				<input name="problem7" type="hidden" value="">
-			</li>
-			<li class="checkbox">
-				<label for="problem8">
-					<input name="problem8" id="problem8" type="checkbox" value="Yes" >Problème avec le Code d'accès personnel (CAP) ou avec le Code d'accès (CA) de l'assurance emploi
-				</label>
-				<input name="problem8" type="hidden" value="">
-			</li>
-			<li class="checkbox">
-				<label for="problem9">
-					<input name="problem9" id="problem9" type="checkbox" value="Yes" >Problème lié à la validation du numéro d'assurance sociale (NAS)
-				</label>
-				<input name="problem9" type="hidden" value="">
-			</li>
-			<li class="checkbox">
-				<label for="problem10">
-					<input name="problem10" id="problem10" type="checkbox" value="Yes" >Autre erreur lors de l'ouverture de session qui ne figure pas sur cette liste
-				</label>
-				<input name="problem10" type="hidden" value="">
-			</li>
-		</ul>
-		<div class="checkbox">
-			<label for="problem11">
-				<input name="problem11" id="problem11" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
-			</label>
-			<input name="problem11" type="hidden" value="">
-		</div>
-			<div class="checkbox">
-				<label for="problem12">
-					<input name="problem12" id="problem12" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
-				</label>
-			<input name="problem12" type="hidden" value="">
-		</div>
-	</fieldset>
-	<strong><button type="submit" class="btn btn-primary">Soumettre</button></strong>
-</form><div class="success-message hide">
-	<h3>Merci de votre aide!</h3>
-	<p>Vous ne recevrez pas de réponse. Pour toute question, s'il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
-</div>
-<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
+ Itération 3 +

Voici une liste des changements qui se sont produits depuis l'itération précédente :

+ + + + + + + + + + + + + +
Majeurs +
    +
  • Suppression des sous-options d'erreur de connexion.
  • +
  • Option d'erreur de connexion renommée.
  • +
+
Additionsn/a
Correctifsn/a
+ +

Exemple de code

+ {%- highlight html -%} +
+ +
+ {%- endhighlight -%} +
+ Contenu ajouté via Ajax + {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v3-fr.html -%} + {%- endhighlight -%} +
+
- Version 1.0 -
<form action="#">
-	<fieldset>
-		<legend><span class="field-name">Veuillez cocher toutes les réponses pertinentes :</span></legend>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f1">
-				<input type="checkbox" name="problem1" value="Oui" id="gc-rprt-prblm-f1" />Un lien, un bouton ou une vidéo ne fonctionne pas
-			</label>
-			<input name="problem1" type="hidden" value="Non" />
-		</div>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f2">
-				<input type="checkbox" name="problem2" value="Oui" id="gc-rprt-prblm-f2" />Il y a une erreur d'orthographe ou de grammaire
-			</label>
-			<input name="problem2" type="hidden" value="Non" />
-		</div>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f3">
-				<input type="checkbox" name="problem3" value="Oui" id="gc-rprt-prblm-f3" />Les renseignements sont incomplets
-			</label>
-			<input name="problem3" type="hidden" value="Non" />
-		</div>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f4">
-				<input type="checkbox" name="problem4" value="Oui" id="gc-rprt-prblm-f4" />L'information n'est plus à jour ou est erronée
-			</label>
-			<input name="problem4" type="hidden" value="Non" />
-		</div>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f5">
-				<input type="checkbox" name="problem5" value="Oui" id="gc-rprt-prblm-f5" />Je n'arrive pas à trouver ce que je cherche
-			</label>
-			<input name="problem5" type="hidden" value="Non" />
-		</div>
-		<div class="checkbox">
-			<label for="gc-rprt-prblm-f6">
-				<input type="checkbox" name="problem6" value="Oui" id="gc-rprt-prblm-f6" />Autre problème qui ne figure pas sur cette liste
-			</label>
-			<input name="problem6" type="hidden" value="Non" />
-		</div>
-	</fieldset>
-	<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Soumettre</button>
-</form>
+ Itération 2 +

Here is a list of changes that happened since the previous itération:

+ + + + + + + + + + + + + +
Majeurs +
    +
  • Refonte du gabarit pour utiliser data-ajax. Inclut la solution de secours pour la version HTML de base.
  • +
  • Mise à jour du formulaire: +
      +
    • Implémente désormais wb-postback pour la validation des formulaires et n'utilise plus data-toggle lors de l'envoi.
    • +
    • Ajout d'options d'erreur de connexion (problème 5 à problème 10).
    • +
    • Ajout de messages d'erreur et de réussite.
    • +
    +
  • +
+
Additionsn/a
Correctifsn/a
+ +

Exemple de code

+ {%- highlight html -%} +
+
+ {%- endhighlight -%} +
+ Contenu ajouté via Ajax + {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v2-fr.html -%} + {%- endhighlight -%} +
+
+
+ Itération 1 +

Exemple de code

+ {%- highlight html -%} + {%- include_relative ajax/deprecated/report-problem-v1-fr.html -%} + {%- endhighlight -%}
diff --git a/sites/feedback/feedback-en.html b/sites/feedback/feedback-en.html deleted file mode 100644 index 81e81945a5..0000000000 --- a/sites/feedback/feedback-en.html +++ /dev/null @@ -1,31 +0,0 @@ ---- -{ - "title": "Page feedback form", - "language": "en", - "altLangPage": "feedback-fr.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], - "secondlevel": false, - "dateModified": "2022-04-26", - "share": "true", - "feedbackPath": "ajax/report-problem-en.html" -} ---- - -

This page feedback form leverage the version 2 of the page-details container which leverage the data ajax plugin.

-

Data ajax replace links:

- -

The version 2 of the page-details container leverage a progressive enhancement design and that is why a link element need be created to point at the report a problem form page: <a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>. You can experience that fallback through the basic HTML version mode.

-

HTML code

-
<div data-ajax-replace="ajax/report-problem-en.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-9 col-md-6 col-lg-5">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
-		</div>
-	</div>
-</div>
diff --git a/sites/feedback/feedback-fr.html b/sites/feedback/feedback-fr.html deleted file mode 100644 index fe2f3c9baa..0000000000 --- a/sites/feedback/feedback-fr.html +++ /dev/null @@ -1,31 +0,0 @@ ---- -{ - "title": "Formulaire de commentaires de la page", - "language": "fr", - "altLangPage": "feedback-en.html", - "breadcrumbs": [ - { "title": "Canada.ca", "link": "https://www.canada.ca/en.html" } - ], - "secondlevel": false, - "dateModified": "2022-04-26", - "share": "true", - "feedbackPath": "ajax/report-problem-fr.html" -} ---- - -

Ce formulaire de commentaires de page exploite la version 2 du conteneur page-details qui exploite le plugiciel data ajax.

-

Data ajax remplace les liens :

- -

La version 2 du conteneur page-details implique une conception d'amélioration progressive et c'est pourquoi un lien doit être créé pour pointer vers la page du formulaire de signalement d'un problème : <a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème sur cette page</a>. Vous pouvez faire l'expérience de ce repli via le mode de version HTML de base.

-

Le code HTML

-
<div data-ajax-replace="ajax/report-problem-fr.html">
-	<div class="row row-no-gutters">
-		<div class="col-sm-11 col-md-7 col-lg-6">
-			<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème ou une erreur sur cette page </a>
-		</div>
-	</div>
-</div>
diff --git a/sites/feedback/includes/feedback.html b/sites/feedback/includes/feedback.html index 7d15638f0b..6ca39d4d99 100644 --- a/sites/feedback/includes/feedback.html +++ b/sites/feedback/includes/feedback.html @@ -2,14 +2,20 @@ {%- if page.feedbackPath -%} {{ page.feedbackPath }} {%- elsif site.global.feedbackPath and site.global.feedbackPath.first -%} - {{ site.global.feedbackPath[ i18nText-lang ] | relative_url }} + {{ site.global.feedbackPath[ i18nText-lang ] }} {%- endif -%} {%- endcapture -%}
+ {%- endif -%} + {%- if page.feedbackContact -%} + data-feedback-link="{{page.feedbackContact.link}}" + data-feedback-url="{{page.feedbackContact.url}}" + {% endif %} + data-feedback-section="{{page.feedbackData.section}}" + data-feedback-theme="{{page.feedbackData.theme}}">
{%- if i18nText-lang == "en" -%}
diff --git a/sites/feedback/index.json-ld b/sites/feedback/index.json-ld index 355bb2467f..5ba3dad87c 100644 --- a/sites/feedback/index.json-ld +++ b/sites/feedback/index.json-ld @@ -7,39 +7,69 @@ "modified": "dct:modified" }, "title": { - "en": "Report a problem (RAP) - Feedback", - "fr": "Signaler un problème (SUP) - Commentaires" + "en": "Feedback area", + "fr": "Zone de rétroaction" }, "description": { - "en": "Documentation on how to use the page feedback form.", - "fr": "Documentation sur l'utilisation de formulaire de commentaires de page." + "en": "Documentation on how to use the elements of the feedback area.", + "fr": "Documentation sur l'utilisation des éléments de la zone commentaires." }, - "modified": "2022-04-26", + "modified": "2023-01-10", "componentName": "feedback", "status": "stable", "pages": { "docs": [ { - "title": "Documentation for Page feedback form", + "title": "Documentation for the feedback area", "language": "en", "path": "feedback-docs-en.html" }, { - "title": "Documentation pour formulaire de commentaire de page", + "title": "Documentation pour la zone de rétroaction", "language": "fr", "path": "feedback-docs-fr.html" } ], "examples": [ { - "title": "Page feedback form", + "title": "Page feedback tool", "language": "en", - "path": "feedback-en.html" + "path": "page-feedback-en.html" }, { - "title": "Formulaire de commentaire de page", + "title": "Outil de rétroaction sur la page", "language": "fr", - "path": "feedback-fr.html" + "path": "page-feedback-fr.html" + }, + { + "title": "Page feedback tool with contact link", + "language": "en", + "path": "page-feedback-contact-en.html" + }, + { + "title": "Outil de rétroaction sur la page avec lien de contact", + "language": "fr", + "path": "page-feedback-contact-fr.html" + }, + { + "title": "Page feedback tool without comment", + "language": "en", + "path": "page-feedback-no-form-en.html" + }, + { + "title": "Outil de rétroaction sur la page sans commentaire", + "language": "fr", + "path": "page-feedbac-no-formk-fr.html" + }, + { + "title": "Report a problem", + "language": "en", + "path": "report-problem-en.html" + }, + { + "title": "Signaler un problème", + "language": "fr", + "path": "report-problem-fr.html" } ] } diff --git a/sites/feedback/page-feedback-contact-en.html b/sites/feedback/page-feedback-contact-en.html new file mode 100644 index 0000000000..56e9a203a8 --- /dev/null +++ b/sites/feedback/page-feedback-contact-en.html @@ -0,0 +1,28 @@ +--- +{ + "altLangPage": "page-feedback-contact-fr.html", + "breadcrumbs": [ + { "title": "Feedback area - Documentation", "link": "sites/feedback/feedback-docs-en.html" } + ], + "dateModified": "2023-04-12", + "description": "Page feedback tool for Canada.ca", + "language": "en", + "title": "Page feedback tool with contact link", + "share": "true", + "feedbackPath": "ajax/page-feedback-contact-en.html", + "feedbackContact": { + "link": "Contact Service Name", + "url": "https://canada.ca" + }, + "feedbackData": { + "theme": "Theme", + "section": "Section" + } +} +--- +
+ +

HTML code

+{% highlight text %} +{% include_relative ajax/page-feedback-contact-en.html %} +{% endhighlight %} diff --git a/sites/feedback/page-feedback-contact-fr.html b/sites/feedback/page-feedback-contact-fr.html new file mode 100644 index 0000000000..43e0f3f513 --- /dev/null +++ b/sites/feedback/page-feedback-contact-fr.html @@ -0,0 +1,28 @@ +--- +{ + "altLangPage": "page-feedback-contact-en.html", + "breadcrumbs": [ + { "title": "Zone de rétroaction - Documentation", "link": "sites/feedback/feedback-docs-fr.html" } + ], + "dateModified": "2023-04-12", + "description": "Outil de rétroaction sur la page pour Canada.ca", + "language": "fr", + "title": "Outil de rétroaction sur la page avec lien de contact", + "share": "true", + "feedbackPath": "ajax/page-feedback-contact-fr.html", + "feedbackContact": { + "link": "Contacter Nom du service", + "url": "https://canada.ca/fr" + }, + "feedbackData": { + "theme": "Thème", + "section": "Section" + } +} +--- +
+ +

Code HTML

+{% highlight text %} +{% include_relative ajax/page-feedback-contact-fr.html %} +{% endhighlight %} diff --git a/sites/feedback/page-feedback-en.html b/sites/feedback/page-feedback-en.html new file mode 100644 index 0000000000..da91bee391 --- /dev/null +++ b/sites/feedback/page-feedback-en.html @@ -0,0 +1,24 @@ +--- +{ + "altLangPage": "page-feedback-fr.html", + "breadcrumbs": [ + { "title": "Feedback area - Documentation", "link": "sites/feedback/feedback-docs-en.html" } + ], + "dateModified": "2023-01-10", + "description": "Page feedback tool for Canada.ca", + "language": "en", + "title": "Page feedback tool", + "share": "true", + "feedbackPath": "ajax/page-feedback-en.html", + "feedbackData": { + "theme": "Theme", + "section": "Section" + } +} +--- +
+ +

HTML code

+{% highlight text %} +{% include_relative ajax/page-feedback-en.html %} +{% endhighlight %} diff --git a/sites/feedback/page-feedback-fr.html b/sites/feedback/page-feedback-fr.html new file mode 100644 index 0000000000..11ce819578 --- /dev/null +++ b/sites/feedback/page-feedback-fr.html @@ -0,0 +1,24 @@ +--- +{ + "altLangPage": "page-feedback-en.html", + "breadcrumbs": [ + { "title": "Zone de rétroaction - Documentation", "link": "sites/feedback/feedback-docs-fr.html" } + ], + "dateModified": "2023-01-10", + "description": "Outil de rétroaction sur la page pour Canada.ca", + "language": "fr", + "title": "Outil de rétroaction sur la page", + "share": "true", + "feedbackPath": "ajax/page-feedback-fr.html", + "feedbackData": { + "theme": "Thème", + "section": "Section" + } +} +--- +
+ +

Code HTML

+{% highlight text %} +{% include_relative ajax/page-feedback-fr.html %} +{% endhighlight %} diff --git a/sites/feedback/report-problem-en.html b/sites/feedback/report-problem-en.html new file mode 100644 index 0000000000..986a074e1b --- /dev/null +++ b/sites/feedback/report-problem-en.html @@ -0,0 +1,20 @@ +--- +{ + "title": "Report a problem", + "language": "en", + "altLangPage": "report-problem-fr.html", + "breadcrumbs": [ + { "title": "Feedback area - Documentation", "link": "sites/feedback/feedback-docs-en.html" } + ], + "secondlevel": false, + "dateModified": "2023-01-10", + "share": "true", + "feedbackPath": "ajax/report-problem-en.html" +} +--- +
+ +

Code HTML

+{% highlight text %} +{% include_relative ajax/report-problem-en.html %} +{% endhighlight %} diff --git a/sites/feedback/report-problem-fr.html b/sites/feedback/report-problem-fr.html new file mode 100644 index 0000000000..286e2a64af --- /dev/null +++ b/sites/feedback/report-problem-fr.html @@ -0,0 +1,20 @@ +--- +{ + "title": "Signaler un problème", + "language": "fr", + "altLangPage": "report-problem-en.html", + "breadcrumbs": [ + { "title": "Zone de rétroaction - Documentation", "link": "sites/feedback/feedback-docs-fr.html" } + ], + "secondlevel": false, + "dateModified": "2023-01-10", + "share": "true", + "feedbackPath": "ajax/report-problem-fr.html" +} +--- +
+ +

Code HTML

+{% highlight text %} +{% include_relative ajax/report-problem-fr.html %} +{% endhighlight %} diff --git a/sites/gc-page-feedback/gc-page-feedback-custom-en.html b/sites/gc-page-feedback/gc-page-feedback-custom-en.html deleted file mode 100644 index 00b0b2f1e8..0000000000 --- a/sites/gc-page-feedback/gc-page-feedback-custom-en.html +++ /dev/null @@ -1,29 +0,0 @@ ---- -{ - "altLangPage": "gc-page-feedback-custom-fr.html", - "breadcrumbs": [ - { "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" } - ], - "css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"], - "dateModified": "2022-12-06", - "description": "Page feedback tool for Canada.ca", - "language": "en", - "title": "Page feedback tool with custom parameters", - "pageFeedback": { - "institutionopt": "Custom institution", - "themeopt": "Custom theme", - "sectionopt": "Custom section", - "pageTitle": "true", - "language": "true", - "submissionPage": "true" - } -} ---- -
- -

HTML code

-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%} -{% include variable-core.liquid %} -{% highlight text %} -{% include_relative includes/gc-page-feedback.html %} -{% endhighlight %} diff --git a/sites/gc-page-feedback/gc-page-feedback-custom-fr.html b/sites/gc-page-feedback/gc-page-feedback-custom-fr.html deleted file mode 100644 index e2b493dc3d..0000000000 --- a/sites/gc-page-feedback/gc-page-feedback-custom-fr.html +++ /dev/null @@ -1,29 +0,0 @@ ---- -{ - "altLangPage": "gc-page-feedback-custom-en.html", - "breadcrumbs": [ - { "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" } - ], - "css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"], - "dateModified": "2022-12-06", - "description": "Outil de rétroaction sur la page pour Canada.ca", - "language": "fr", - "title": "Outil de rétroaction sur la page avec paramètres personnalisés", - "pageFeedback": { - "institutionopt": "Institution personnalisée", - "themeopt": "Thème personnalisé", - "sectionopt": "Section personnalisée", - "pageTitle": "true", - "language": "true", - "submissionPage": "true" - } -} ---- -
- -

Code HTML

-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%} -{% include variable-core.liquid %} -{% highlight text %} -{% include_relative includes/gc-page-feedback.html %} -{% endhighlight %} diff --git a/sites/gc-page-feedback/gc-page-feedback-en.html b/sites/gc-page-feedback/gc-page-feedback-en.html deleted file mode 100644 index 7bebd0b857..0000000000 --- a/sites/gc-page-feedback/gc-page-feedback-en.html +++ /dev/null @@ -1,23 +0,0 @@ ---- -{ - "altLangPage": "gc-page-feedback-fr.html", - "breadcrumbs": [ - { "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" } - ], - "css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"], - "dateModified": "2022-12-06", - "description": "Page feedback tool for Canada.ca", - "language": "en", - "title": "Page feedback tool", - "pageFeedback": "true", - "share": "true" -} ---- -
- -

HTML code

-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%} -{% include variable-core.liquid %} -{% highlight text %} -{% include_relative includes/gc-page-feedback.html %} -{% endhighlight %} diff --git a/sites/gc-page-feedback/gc-page-feedback-fr.html b/sites/gc-page-feedback/gc-page-feedback-fr.html deleted file mode 100644 index 636ff31190..0000000000 --- a/sites/gc-page-feedback/gc-page-feedback-fr.html +++ /dev/null @@ -1,23 +0,0 @@ ---- -{ - "altLangPage": "gc-page-feedback-en.html", - "breadcrumbs": [ - { "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" } - ], - "css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"], - "dateModified": "2022-12-06", - "description": "Outil de rétroaction sur la page pour Canada.ca", - "language": "fr", - "title": "Outil de rétroaction sur la page", - "pageFeedback": "true", - "share": "true" -} ---- -
- -

Code HTML

-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%} -{% include variable-core.liquid %} -{% highlight text %} -{% include_relative includes/gc-page-feedback.html %} -{% endhighlight %} diff --git a/sites/gc-page-feedback/includes/css.html b/sites/gc-page-feedback/includes/css.html deleted file mode 100644 index 6c703f0710..0000000000 --- a/sites/gc-page-feedback/includes/css.html +++ /dev/null @@ -1,121 +0,0 @@ - diff --git a/sites/gc-page-feedback/includes/gc-page-feedback.html b/sites/gc-page-feedback/includes/gc-page-feedback.html deleted file mode 100644 index 6acde9c185..0000000000 --- a/sites/gc-page-feedback/includes/gc-page-feedback.html +++ /dev/null @@ -1,62 +0,0 @@ -{%- include_relative includes/parameters.liquid -%} -{%- include_relative includes/strings.liquid -%} - -
-
-
-

{{ pft_h3 }}

-
- - - - - - -
- {{ pft_legend }} -
- -
-
- - -
-
-
-

{{ pft_why_note_nojs }}

-

{{ pft_why_note_js }}

-
-
- {{ pft_no_legend }} -
- -
-
- -
-
- -
-
- -
- -
-
- - -

{{ pft_problem6_note }}

-
- -
-
-
-
-

{{ pft_submit_message }}

-
-
-
-
diff --git a/sites/gc-page-feedback/includes/parameters.liquid b/sites/gc-page-feedback/includes/parameters.liquid deleted file mode 100644 index e17fb3b005..0000000000 --- a/sites/gc-page-feedback/includes/parameters.liquid +++ /dev/null @@ -1,57 +0,0 @@ -{%- comment -%} -Set parameter variables -{%- endcomment -%} - -{%- capture pft_institutionopt_value -%} - {%- if page.pageFeedback.institutionopt -%} - {{ page.pageFeedback.institutionopt }} - {%- else -%} - Institution - required - must use same abbreviation value EN and FR - {%- endif -%} -{%- endcapture -%} - -{%- capture pft_themeopt_value -%} - {%- if page.pageFeedback.themeopt -%} - {{ page.pageFeedback.themeopt }} - {%- else -%} - Theme - required - must use same value EN and FR - {%- endif -%} -{%- endcapture -%} - -{%- capture pft_sectionopt_value -%} - {%- if page.pageFeedback.sectionopt -%} - {{ page.pageFeedback.sectionopt }} - {%- else -%} - Section - required but can be blank - same value EN and FR - {%- endif -%} -{%- endcapture -%} - -{%- capture pft_pageTitle_value -%} - {%- if page.pageFeedback.pageTitle == "true" -%} - {{ page.title }} - {%- elsif page.pageFeedback.title -%} - {{ page.pageFeedback.pageTitle }} - {%- else -%} - Page title (EN) - required - {%- endif -%} -{%- endcapture -%} - -{%- capture pft_language_value -%} - {%- if page.pageFeedback.language == "true" -%} - {{ i18nText-lang }} - {%- elsif page.pageFeedback.language -%} - {{ page.pageFeedback.language }} - {%- else -%} - Language - required - use EN or FR - {%- endif -%} -{%- endcapture -%} - -{%- capture pft_submissionPage_value -%} - {%- if page.pageFeedback.submissionPage == "true" -%} - {{ page.url | absolute_url }} - {%- elsif page.pageFeedback.submissionPage -%} - {{ page.pageFeedback.submissionPage }} - {%- else -%} - Page URL - required - {%- endif -%} -{%- endcapture -%} diff --git a/sites/gc-page-feedback/includes/strings.liquid b/sites/gc-page-feedback/includes/strings.liquid deleted file mode 100644 index 20f8155e26..0000000000 --- a/sites/gc-page-feedback/includes/strings.liquid +++ /dev/null @@ -1,58 +0,0 @@ -{%- comment -%} -Set string variables -{%- endcomment -%} - -{%- assign pft_yes_en = "Yes" -%} -{%- assign pft_no_en = "No" -%} -{%- assign pft_problem1_label_en = "I can’t find the information" -%} -{%- assign pft_problem2_label_en = "The information is hard to understand" -%} -{%- assign pft_problem3_label_en = "There was an error or something didn’t work" -%} -{%- assign pft_problem4_label_en = "Other reason" -%} - -{%- assign pft_yes_fr = "Oui" -%} -{%- assign pft_no_fr = "Non" -%} -{%- assign pft_problem1_label_fr = "Je ne peux pas trouver l’information" -%} -{%- assign pft_problem2_label_fr = "L’information est difficile à comprendre" -%} -{%- assign pft_problem3_label_fr = "Il y avait une erreur ou quelque chose ne fonctionnait pas" -%} -{%- assign pft_problem4_label_fr = "Autre raison" -%} - -{%- assign pft_yes_value = pft_yes_en | append: "-" | append: pft_yes_fr -%} -{%- assign pft_no_value = pft_no_en | strip_html | append: "-" | append: pft_no_fr | strip_html -%} -{%- assign pft_problem1_value = pft_problem1_label_en | strip_html | append: "-" | append: pft_problem1_label_fr | strip_html -%} -{%- assign pft_problem2_value = pft_problem2_label_en | strip_html | append: "-" | append: pft_problem2_label_fr | strip_html -%} -{%- assign pft_problem3_value = pft_problem3_label_en | strip_html | append: "-" | append: pft_problem3_label_fr | strip_html -%} -{%- assign pft_problem4_value = pft_problem4_label_en | strip_html | append: "-" | append: pft_problem4_label_fr | strip_html -%} - -{%- if i18nText-lang == "en" -%} - {%- assign pft_h3 = "Page feedback" -%} - {%- assign pft_legend = "Did you find what you were looking for?" -%} - {%- assign pft_yes = pft_yes_en -%} - {%- assign pft_no = pft_no_en -%} - {%- assign pft_why_note_nojs = "If not, tell us why below:" -%} - {%- assign pft_why_note_js = "Tell us why below:" -%} - {%- assign pft_no_legend = "What was wrong?" -%} - {%- assign pft_problem1_label = pft_problem1_label_en -%} - {%- assign pft_problem2_label = pft_problem2_label_en -%} - {%- assign pft_problem3_label = pft_problem3_label_en -%} - {%- assign pft_problem4_label = pft_problem4_label_en -%} - {%- assign pft_problem6_label = "Please provide more details (maximum 300 characters)" -%} - {%- assign pft_problem6_note = "You will not receive a reply. Telephone numbers and email addresses will be removed." -%} - {%- assign pft_submit = "Submit" -%} - {%- assign pft_submit_message = "Thank you for your feedback." -%} -{%- elsif i18nText-lang == "fr" -%} - {%- assign pft_h3 = "Rétroaction sur la page" -%} - {%- assign pft_legend = "Avez-vous trouvé ce que vous cherchiez?" -%} - {%- assign pft_yes = pft_yes_fr -%} - {%- assign pft_no = pft_no_fr -%} - {%- assign pft_why_note_nojs = "Sinon, dites nous pourquoi ci-dessous :" -%} - {%- assign pft_why_note_js = "Dites nous pourquoi ci-dessous :" -%} - {%- assign pft_no_legend = "Qu’est-ce qui n’allait pas?" -%} - {%- assign pft_problem1_label = pft_problem1_label_fr -%} - {%- assign pft_problem2_label = pft_problem2_label_fr -%} - {%- assign pft_problem3_label = pft_problem3_label_fr -%} - {%- assign pft_problem4_label = pft_problem4_label_fr -%} - {%- assign pft_problem6_label = "Veuillez fournir plus de détails (maximum de 300 caractères)" -%} - {%- assign pft_problem6_note = "Vous ne recevrez aucune réponse. Les numéros de téléphone et les adresses électroniques seront supprimés." -%} - {%- assign pft_submit = "Soumettre" -%} - {%- assign pft_submit_message = "Merci de vos commentaires." -%} -{%- endif -%} diff --git a/sites/gc-page-feedback/index.json-ld b/sites/gc-page-feedback/index.json-ld deleted file mode 100644 index b9e019806d..0000000000 --- a/sites/gc-page-feedback/index.json-ld +++ /dev/null @@ -1,44 +0,0 @@ -{ - "@context": { - "@version": 1.1, - "dct": "http://purl.org/dc/terms/", - "title": { "@id": "dct:title", "@container": "@language" }, - "description": { "@id": "dct:description", "@container": "@language" }, - "modified": "dct:modified" - }, - "title": { - "en": "Page feedback tool", - "fr": "Outil de rétroaction sur la page" - }, - "description": { - "en": "Page feedback tool for Canada.ca", - "fr": "Outil de rétroaction sur la page pour Canada.ca" - }, - "modified": "2022-12-06", - "componentName": "gc-page-feedback", - "status": "stable", - "pages": { - "examples": [ - { - "title": "Page feedback tool", - "language": "en", - "path": "gc-page-feedback-en.html" - }, - { - "title": "Outil de rétroaction sur la page", - "language": "fr", - "path": "gc-page-feedback-fr.html" - }, - { - "title": "Page feedback tool with custom parameters", - "language": "en", - "path": "gc-page-feedback-custom-en.html" - }, - { - "title": "Outil de rétroaction sur la page avec paramètres personnalisés", - "language": "fr", - "path": "gc-page-feedback-custom-fr.html" - } - ] - } -} diff --git a/sites/includes/metadata.html b/sites/includes/metadata.html index d74f5c5463..9b2ed7824c 100644 --- a/sites/includes/metadata.html +++ b/sites/includes/metadata.html @@ -5,5 +5,6 @@ + diff --git a/sites/page-details/includes/footer.html b/sites/page-details/includes/footer.html index 76b3e36c9b..1a189a7e18 100644 --- a/sites/page-details/includes/footer.html +++ b/sites/page-details/includes/footer.html @@ -2,7 +2,7 @@

{{ i18nText-pageDetails }}

{% assign col-modified = "col-xs-12" %} - {%- if page.pageFeedback or page.noReportProblem != true -%} + {%- if page.noFeedback != true -%} {% assign col-feedback = "col-sm-8 col-md-9 col-lg-9" %} {%- if page.share -%} {% assign col-share = "col-sm-4 col-md-3" %} @@ -15,15 +15,9 @@

{{ i18nText-pageDetails }}

{%- endif -%}
- {%- if page.pageFeedback or page.noReportProblem != true -%} + {%- if page.noFeedback != true -%} {%- endif -%} {%- if page.share -%} diff --git a/sites/page-details/page-details-without-buttons-en.html b/sites/page-details/page-details-without-buttons-en.html index a8418c98f0..6868bf8b8f 100644 --- a/sites/page-details/page-details-without-buttons-en.html +++ b/sites/page-details/page-details-without-buttons-en.html @@ -8,7 +8,7 @@ ], "secondlevel": false, "dateModified": "2022-04-14", - "noReportProblem": true + "noFeedback": true } --- diff --git a/sites/page-details/page-details-without-buttons-fr.html b/sites/page-details/page-details-without-buttons-fr.html index 93d8c6046f..ffc66742c0 100644 --- a/sites/page-details/page-details-without-buttons-fr.html +++ b/sites/page-details/page-details-without-buttons-fr.html @@ -8,7 +8,7 @@ ], "secondlevel": false, "dateModified": "2022-04-14", - "noReportProblem": true + "noFeedback": true } --- diff --git a/sites/page-details/page-details-without-report-btn-en.html b/sites/page-details/page-details-without-report-btn-en.html index 2309601b8b..20e32ccfe1 100644 --- a/sites/page-details/page-details-without-report-btn-en.html +++ b/sites/page-details/page-details-without-report-btn-en.html @@ -9,7 +9,7 @@ "secondlevel": false, "dateModified": "2022-04-14", "share": true, - "noReportProblem": true + "noFeedback": true } --- diff --git a/sites/page-details/page-details-without-report-btn-fr.html b/sites/page-details/page-details-without-report-btn-fr.html index 94944df349..66aace63cf 100644 --- a/sites/page-details/page-details-without-report-btn-fr.html +++ b/sites/page-details/page-details-without-report-btn-fr.html @@ -9,7 +9,7 @@ "secondlevel": false, "dateModified": "2022-04-14", "share": true, - "noReportProblem": true + "noFeedback": true } --- diff --git a/sites/theme.scss b/sites/theme.scss index eb1999684e..4a73cfd8ba 100644 --- a/sites/theme.scss +++ b/sites/theme.scss @@ -74,7 +74,7 @@ @import "search/base"; @import "secondary-menu/base"; @import "page-details/base"; -@import "gc-page-feedback/base"; +@import "feedback/base"; @import "gcweb-menu/base"; @import "authentication/base"; @import "header/base"; @@ -369,7 +369,7 @@ @import "search/screen-sm-min-to-screen-sm-max"; @import "page-details/screen-sm-min"; - @import "gc-page-feedback/screen-sm-min"; + @import "feedback/screen-sm-min"; @import "../templates/campaign/screen-sm-min-to-screen-sm-max"; } @@ -410,7 +410,7 @@ @import "search/print"; @import "secondary-menu/print"; @import "page-details/print"; - @import "gc-page-feedback/print"; + @import "feedback/print"; @import "wet-boew/src/plugins/footnotes/print"; @import "wet-boew/src/plugins/geomap/print"; diff --git a/templates/home/home-en.html b/templates/home/home-en.html index c4af65ddcc..cb6114e013 100644 --- a/templates/home/home-en.html +++ b/templates/home/home-en.html @@ -4,7 +4,7 @@ altLangPage: home-fr.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true breadcrumbs: false --- diff --git a/templates/home/home-fr.html b/templates/home/home-fr.html index becf0d7ff1..f597052c41 100644 --- a/templates/home/home-fr.html +++ b/templates/home/home-fr.html @@ -4,7 +4,7 @@ altLangPage: home-en.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true breadcrumbs: false --- diff --git a/templates/thematic/dark-theme-home-en.html b/templates/thematic/dark-theme-home-en.html index 8978dddd08..9df0df8e23 100644 --- a/templates/thematic/dark-theme-home-en.html +++ b/templates/thematic/dark-theme-home-en.html @@ -4,7 +4,7 @@ altLangPage: dark-theme-home-fr.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true share: true pageclass: provisional dark-theme --- diff --git a/templates/thematic/dark-theme-home-fr.html b/templates/thematic/dark-theme-home-fr.html index 7f6d9ec55e..8398d74ae9 100644 --- a/templates/thematic/dark-theme-home-fr.html +++ b/templates/thematic/dark-theme-home-fr.html @@ -4,7 +4,7 @@ altLangPage: dark-theme-home-en.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true share: true pageclass: provisional dark-theme --- diff --git a/templates/thematic/pink-day-home-en.html b/templates/thematic/pink-day-home-en.html index c87c1a9d81..313b7d6ba2 100644 --- a/templates/thematic/pink-day-home-en.html +++ b/templates/thematic/pink-day-home-en.html @@ -4,7 +4,7 @@ altLangPage: pink-day-home-fr.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true share: true pageclass: provisional pnkDy-theme --- diff --git a/templates/thematic/pink-day-home-fr.html b/templates/thematic/pink-day-home-fr.html index aec32142c2..fac217ff70 100644 --- a/templates/thematic/pink-day-home-fr.html +++ b/templates/thematic/pink-day-home-fr.html @@ -4,7 +4,7 @@ altLangPage: pink-day-home-en.html dateModified: 2021-07-07 layout: home -noReportProblem: true +noFeedback: true share: true pageclass: provisional pnkDy-theme ---