Skip to content

Commit

Permalink
Page details: Remove col-lg-9 class
Browse files Browse the repository at this point in the history
There's no need for it. The col-md-9 class it was paired with already fulfills the same purpose (has the same grid width and scales up to larger views).

WIP, todos:
* Finish updating JSON-LD files
* Sort out version 3.1 identifiers in file names...
  * Superseded iteration is currently denoted as v4/v4.0 in file names/references and content
  * Some files/vars use v# and/or v#.#... unsure how to reconcile them since there's no precedence for v#.# iterations
* Add migration tips into JSON-LD file (similar to implement_pd_3to4 in https://wet-boew.github.io/GCWeb/sites/page-details/page-details-docs-en.html)
  • Loading branch information
EricDunsworth committed Jul 12, 2024
1 parent 6e4a488 commit 993123d
Show file tree
Hide file tree
Showing 11 changed files with 207 additions and 5 deletions.
2 changes: 1 addition & 1 deletion _data/sites.json
Original file line number Diff line number Diff line change
Expand Up @@ -2348,7 +2348,7 @@
"en": "Documentation on how to use the page details section.",
"fr": "Documentation sur l'utilisation de la section des détails de la page."
},
"version": "3.1",
"version": "3.2",
"modified": "2024-06-03",
"componentName": "page-details",
"componentType": "container",
Expand Down
20 changes: 20 additions & 0 deletions _includes/sites/page-details/page-details-5-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Default Page details -->
<div id="default">
<section class="pagedetails">
<h2 class="wb-inv">Page details</h2>
[Date modified component]
</section>
</div>

<!-- Page details with Page feedback tool -->
<div id="pft">
<section class="pagedetails">
<h2 class="wb-inv">Page details</h2>
<div class="row">
<div class="col-sm-8 col-md-9">
[Page feedback tool component version 2.0 or newer]
</div>
</div>
[Date modified component]
</section>
</div>
20 changes: 20 additions & 0 deletions _includes/sites/page-details/page-details-5-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Default Détails de la page -->
<div id="default">
<section class="pagedetails">
<h2 class="wb-inv">Détails de la page</h2>
[Composant Date de modification]
</section>
</div>

<!-- Détails de la page with Page feedback tool -->
<div id="pft">
<section class="pagedetails">
<h2 class="wb-inv">Détails de la page</h2>
<div class="row">
<div class="col-sm-8 col-md-9">
[Composant Outil de rétroaction sur la page version 2.0 ou plus récente]
</div>
</div>
[Composant Date de modification]
</section>
</div>
4 changes: 2 additions & 2 deletions docs/static-header-footer/bootstrap-3.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h1>Static header and footer - Bootstrap 3 - Update to header to come...</h1>

<!-- Main content footer starts -->
<footer class="pagedetails">
<h2 class="wb-inv">Page details</h2><div class="row"><div class="col-sm-8 col-md-9 col-lg-9">
<h2 class="wb-inv">Page details</h2><div class="row"><div class="col-sm-8 col-md-9">
<div data-ajax-replace="/GCWeb/sites/feedback/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>
Expand All @@ -124,7 +124,7 @@ <h2 class="wb-inv">Page details</h2><div class="row"><div class="col-sm-8 col-md
</div><div class="wb-share col-sm-4 col-md-3" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div><div class="col-xs-12">
<dl id="wb-dtmd">
<dt>Date modified:</dt>
<dd><time property="dateModified">2022-10-18</time></dd>
<dd><time property="dateModified">2024-07-12</time></dd>
</dl>
</div>
</div>
Expand Down
55 changes: 55 additions & 0 deletions sites/page-details/demoted/page-details-v4-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
{
"layout": null,
"title": "Content page including complete page details version 4.0 (demoted)",
"language": "en",
"altLangPage": "page-details-v4-fr.html",
"secondlevel": false,
"dateModified": "2024-07-12",
"share": "true",
"feedback": "true"
}
---
{%- include variable-core.liquid -%}
{%- capture page-title -%}
{%- if page.title -%}
{{ page.title }}
{%- else -%}
Page untitled
{%- endif -%}
{%- endcapture -%}
<!DOCTYPE html>
<html class="no-js" lang="{{ i18nText-lang | default: 'en' }}" dir="{{ i18nText-langDir | default: 'ltr' }}">
<head>
<meta charset="utf-8">
{% include license.html %}
<title>{{ page-title }} - {{ i18nText-siteTitle }}</title>
<meta content="width=device-width, initial-scale=1" name="viewport">
{% include metadata.html %}
{% include resources-inc/head.html %}
</head>
<body {% if page.pageclass %}class="{{ page.pageclass }}" {% endif %}vocab="http://schema.org/" typeof="WebPage">
{% include skiplinks/skiplinks.html %}
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<div class="wb-prettify all-pre hidden"></div>
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>This is version 4.0 (demoted) of the page details.</p>
<pre><code>&lt;section class="pagedetails">
&lt;h2 class="wb-inv">Page details&lt;/h2>
&lt;div class="row">
&lt;div class="col-sm-8 col-md-9 col-lg-9">
&lt;div data-ajax-replace="https://www.canada.ca/etc/designs/canada/wet-boew/assets/feedback/page-feedback-en.html" class="wb-disable-allow">&lt;!-- Will always be replaced by data-ajax -->&lt;/div>
&lt;/div>
&lt;dl id="wb-dtmd">
&lt;dt>Date modified:&lt;/dt>
&lt;dd>&lt;time property="dateModified">2024-07-12&lt;/time>&lt;/dd>
&lt;/dl>
&lt;/div>
&lt;/section></code></pre>
{% include page-details/footer-4.0.html %}
</main>
{% include footers/footer.html %}
{% include resources-inc/footer.html %}
</body>
</html>
55 changes: 55 additions & 0 deletions sites/page-details/demoted/page-details-v4-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
---
{
"layout": null,
"title": "Page de contenu comprenant les détails de la page version 4.0 (rétrogradé)",
"language": "fr",
"altLangPage": "page-details-v4-en.html",
"secondlevel": false,
"dateModified": "2024-07-12",
"share": "true",
"feedback": "true"
}
---
{%- include variable-core.liquid -%}
{%- capture page-title -%}
{%- if page.title -%}
{{ page.title }}
{%- else -%}
Page untitled
{%- endif -%}
{%- endcapture -%}
<!DOCTYPE html>
<html class="no-js" lang="{{ i18nText-lang | default: 'en' }}" dir="{{ i18nText-langDir | default: 'ltr' }}">
<head>
<meta charset="utf-8">
{% include license.html %}
<title>{{ page-title }} - {{ i18nText-siteTitle }}</title>
<meta content="width=device-width, initial-scale=1" name="viewport">
{% include metadata.html %}
{% include resources-inc/head.html %}
</head>
<body {% if page.pageclass %}class="{{ page.pageclass }}" {% endif %}vocab="http://schema.org/" typeof="WebPage">
{% include skiplinks/skiplinks.html %}
{% include header/header.html %}
<main class="container" property="mainContentOfPage" resource="#wb-main" typeof="WebPageElement">
<div class="wb-prettify all-pre hidden"></div>
<h1 id="wb-cont" property="name">{{ page-title }}</h1>
<p>Il s'agit de la version 4.0 (rétrogradée) des détails de la page.</p>
<pre><code>&lt;section class="pagedetails">
&lt;h2 class="wb-inv">Détails de la page&lt;/h2>
&lt;div class="row">
&lt;div class="col-sm-8 col-md-9 col-lg-9">
&lt;div data-ajax-replace="https://www.canada.ca/etc/designs/canada/wet-boew/assets/feedback/page-feedback-fr.html" class="wb-disable-allow">&lt;!-- Sera toujours remplacé par data-ajax -->&lt;/div>
&lt;/div>
&lt;dl id="wb-dtmd">
&lt;dt>Date de modification&nbsp;:&lt;/dt>
&lt;dd>&lt;time property="dateModified">2024-07-12&lt;/time>&lt;/dd>
&lt;/dl>
&lt;/div>
&lt;/section></code></pre>
{% include page-details/footer-4.0.html %}
</main>
{% include footers/footer.html %}
{% include resources-inc/footer.html %}
</body>
</html>
12 changes: 12 additions & 0 deletions sites/page-details/includes/footer-4.0.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<section class="pagedetails{% if include.addContainer %} container{% endif %}">
<h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>

{%- if page.feedback and page.feedback != "" -%}
<div class="row">
<div class="col-sm-8 col-md-9 col-lg-9">
{% include feedback/feedback.html %}
</div>
</div>
{%- endif -%}
{%- include date-modified/date-modified.html -%}
</section>
2 changes: 1 addition & 1 deletion sites/page-details/includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ <h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>

{%- if page.feedback and page.feedback != "" -%}
<div class="row">
<div class="col-sm-8 col-md-9 col-lg-9">
<div class="col-sm-8 col-md-9">
{% include feedback/feedback.html %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion sites/page-details/index.json-ld
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"en": "Documentation on how to use the page details section.",
"fr": "Documentation sur l'utilisation de la section des détails de la page."
},
"version": "3.1",
"version": "3.2",
"modified": "2024-06-03",
"componentName": "page-details",
"componentType": "container",
Expand Down
20 changes: 20 additions & 0 deletions sites/page-details/samples/page-details-5-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Default Page details -->
<div id="default">
<section class="pagedetails">
<h2 class="wb-inv">Page details</h2>
[Date modified component]
</section>
</div>

<!-- Page details with Page feedback tool -->
<div id="pft">
<section class="pagedetails">
<h2 class="wb-inv">Page details</h2>
<div class="row">
<div class="col-sm-8 col-md-9">
[Page feedback tool component version 2.0 or newer]
</div>
</div>
[Date modified component]
</section>
</div>
20 changes: 20 additions & 0 deletions sites/page-details/samples/page-details-5-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- Default Détails de la page -->
<div id="default">
<section class="pagedetails">
<h2 class="wb-inv">Détails de la page</h2>
[Composant Date de modification]
</section>
</div>

<!-- Détails de la page with Page feedback tool -->
<div id="pft">
<section class="pagedetails">
<h2 class="wb-inv">Détails de la page</h2>
<div class="row">
<div class="col-sm-8 col-md-9">
[Composant Outil de rétroaction sur la page version 2.0 ou plus récente]
</div>
</div>
[Composant Date de modification]
</section>
</div>

0 comments on commit 993123d

Please sign in to comment.