Skip to content

Commit

Permalink
Minor - Page details: remove share this page (wet-boew#2377)
Browse files Browse the repository at this point in the history
  • Loading branch information
Garneauma authored Jul 2, 2024
1 parent 86db609 commit ae17e09
Show file tree
Hide file tree
Showing 20 changed files with 492 additions and 382 deletions.
252 changes: 126 additions & 126 deletions _data/sites.json

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions _includes/sites/page-details/page-details-4-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 col-lg-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-4-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 col-lg-9">
[Composant Outil de rétroaction sur la page version 2.0 ou plus récente]
</div>
</div>
[Composant Date de modification]
</section>
</div>
58 changes: 58 additions & 0 deletions sites/page-details/demoted/page-details-v3-en.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
{
"layout": null,
"title": "Content page including complete page details version 3.0 (demoted)",
"language": "en",
"altLangPage": "page-details-v3-fr.html",
"secondlevel": false,
"dateModified": "2024-06-21",
"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 3.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;div class="wb-share col-sm-4 col-md-3" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'>&lt;/div>
&lt;div class="col-xs-12">
&lt;dl id="wb-dtmd">
&lt;dt>Date modified:&lt;/dt>
&lt;dd>&lt;time property="dateModified">2024-06-21&lt;/time>&lt;/dd>
&lt;/dl>
&lt;/div>
&lt;/div>
&lt;/section></code></pre>
{% include page-details/footer-3.0.html %}
</main>
{% include footers/footer.html %}
{% include resources-inc/footer.html %}
</body>
</html>
58 changes: 58 additions & 0 deletions sites/page-details/demoted/page-details-v3-fr.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---
{
"layout": null,
"title": "Page de contenu comprenant les détails de la page version 3.0 (rétrogradé)",
"language": "fr",
"altLangPage": "page-details-v3-en.html",
"secondlevel": false,
"dateModified": "2024-06-21",
"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 3.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;div class="wb-share col-sm-4 col-md-3" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'>&lt;/div>
&lt;div class="col-xs-12">
&lt;dl id="wb-dtmd">
&lt;dt>Date de modification&nbsp;:&lt;/dt>
&lt;dd>&lt;time property="dateModified">2024-06-21&lt;/time>&lt;/dd>
&lt;/dl>
&lt;/div>
&lt;/div>
&lt;/section></code></pre>
{% include page-details/footer-3.0.html %}
</main>
{% include footers/footer.html %}
{% include resources-inc/footer.html %}
</body>
</html>
30 changes: 30 additions & 0 deletions sites/page-details/includes/footer-3.0.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<section class="pagedetails{% if include.addContainer %} container{% endif %}">
<h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>

{% assign col-modified = "col-xs-12" %}
{%- if page.feedback and page.feedback != "" -%}
{%- if page.share -%}
{% assign col-share = "col-sm-4 col-md-3" %}
{%- endif -%}
{%- else -%}
{%- if page.share -%}
{% assign col-share = "col-sm-4 col-md-3 col-sm-push-8 col-md-push-9" %}
{% assign col-modified = "col-sm-6 col-md-5 col-lg-4 col-sm-pull-4 col-md-pull-3" %}
{%- endif -%}
{%- endif -%}

<div class="row">
{%- if page.feedback and page.feedback != "" -%}
<div class="col-sm-8 col-md-9 col-lg-9">
{% include feedback/feedback.html %}
</div>
{%- endif -%}
{%- if page.share -%}
<div class="wb-share {{ col-share }}" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div>
{%- endif -%}

<div class="{{ col-modified }}">
{%- include date-modified/date-modified.html -%}
</div>
</div>
</section>
26 changes: 4 additions & 22 deletions sites/page-details/includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,12 @@
<section class="pagedetails{% if include.addContainer %} container{% endif %}">
<h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>

{% assign col-modified = "col-xs-12" %}
{%- if page.feedback and page.feedback != "" -%}
{%- if page.share -%}
{% assign col-share = "col-sm-4 col-md-3" %}
{%- endif -%}
{%- else -%}
{%- if page.share -%}
{% assign col-share = "col-sm-4 col-md-3 col-sm-push-8 col-md-push-9" %}
{% assign col-modified = "col-sm-6 col-md-5 col-lg-4 col-sm-pull-4 col-md-pull-3" %}
{%- endif -%}
{%- endif -%}

<div class="row">
{%- if page.feedback and page.feedback != "" -%}
<div class="col-sm-8 col-md-9 col-lg-9">
{% include feedback/feedback.html %}
</div>
{%- endif -%}
{%- if page.share -%}
<div class="wb-share {{ col-share }}" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div>
{%- endif -%}

<div class="{{ col-modified }}">
{%- include date-modified/date-modified.html -%}
<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>
Loading

0 comments on commit ae17e09

Please sign in to comment.