copy more theme changes from wxt_bootstrap

NRCan · Mar 1, 2023 · 210213a · 210213a
1 parent 92456b4
commit 210213a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 30 deletions.
diff --git a/...s/custom/nrcan_wxt/templates/block/block--banner--gcweb--nrcan_wxt-sitebranding.html.twig b/...s/custom/nrcan_wxt/templates/block/block--banner--gcweb--nrcan_wxt-sitebranding.html.twig
@@ -16,9 +16,15 @@
  */
 #}
 {% block content %}
-  <div class="brand col-xs-5 col-md-4">
-    <a href="{{ site_link }}">
-      <img id="header-logo" src='{{ logo_svg }}' alt="{{ site_name }}" />
+  <div class="brand" property="publisher" typeof="GovernmentOrganization">
+    <a href="https://canada.ca/{{ language_prefix }}.html" property="url">
+      <img id="header-logo" src='{{ logo_svg }}' alt="{{ 'Government of Canada'|t }}" property="logo" />
+      <span class="wb-inv"> /
+        <span lang="{{ language_opposite }}">{{ label_opposite }}</span>
+      </span>
     </a>
+    <meta property="name" content="{{ 'Government of Canada'|t }}">
+    <meta property="areaServed" typeof="Country" content="Canada">
+    <link property="logo" href="/libraries/theme-gcweb/assets/wmms-blk.svg">
   </div>
 {% endblock %}
diff --git a/...themes/custom/nrcan_wxt/templates/block/block--branding--gcweb--nrcan_wxt-brand.html.twig b/...themes/custom/nrcan_wxt/templates/block/block--branding--gcweb--nrcan_wxt-brand.html.twig
@@ -34,13 +34,13 @@
  */
 #}
 {% set heading_id = attributes.id ~ '-menu'|clean_id %}
-<nav role="navigation" aria-labelledby="{{ heading_id }}"{{ attributes.addClass('col-md-10', 'ftr-urlt-lnk')|without('role', 'aria-labelledby') }}>
+<nav aria-labelledby="{{ heading_id }}"{{ attributes.addClass('col-md-10', 'ftr-urlt-lnk')|without('role', 'aria-labelledby') }}>
   {# Label. If not displayed, we still provide it for screen readers. #}
   {% if not configuration.label_display %}
     {% set title_attributes = title_attributes.addClass('visually-hidden') %}
   {% endif %}
   {{ title_prefix }}
-  <h2{{ title_attributes.addClass('wb-inv').setAttribute('id', heading_id) }}>{{ configuration.label }}</h2>
+  <h3{{ title_attributes.addClass('wb-inv').setAttribute('id', heading_id) }}>{{ configuration.label }}</h3>
   {{ title_suffix }}
 
   {# Menu. #}

diff --git a/.../themes/custom/nrcan_wxt/templates/block/block--footer--gcweb--nrcan_wxt-footer.html.twig b/.../themes/custom/nrcan_wxt/templates/block/block--footer--gcweb--nrcan_wxt-footer.html.twig
@@ -35,19 +35,22 @@
 #}
 {%
   set classes = [
-    'visible-sm',
-    'visible-md',
-    'visible-lg',
-    'wb-navcurr',
-  ]
+  'container',
+  'wb-navcurr',
+  'pad-tp-0',
+]
 %}
-<nav{{ attributes.addClass(classes) }}>
-  {{ title_prefix }}
-  <h2>{{ 'About this site'|t }}</h2>
-  {{ title_suffix }}
-  {% block content %}
-    <ul class="list-unstyled colcount-sm-2 colcount-md-3">
-    {{ content }}
-    </ul>
-  {% endblock %}
-</nav>
+<div class="gc-main-footer">
+  <nav{{ attributes.addClass(classes) }}>
+    {{ title_prefix }}
+    <h4>
+      <span class="wb-inv">{{ 'Themes and topics'|t }}</span>
+    </h4>
+    {{ title_suffix }}
+    {% block content %}
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+        {{ content }}
+      </ul>
+    {% endblock %}
+  </nav>
+</div>
diff --git a/.../custom/nrcan_wxt/templates/block/block--search--gcweb--nrcan_wxt-wxtsearchform.html.twig b/.../custom/nrcan_wxt/templates/block/block--search--gcweb--nrcan_wxt-wxtsearchform.html.twig
@@ -34,7 +34,7 @@
  * @see template_preprocess_block()
  */
 #}
-<section {{ attributes.setAttribute('id', 'wb-srch').addClass('block', 'clearfix', 'col-lg-8', 'text-right', 'visible-md', 'visible-lg') }}>
+<section {{ attributes.setAttribute('id', 'wb-srch').addClass('block', 'clearfix', 'text-right') }}>
   {{ title_prefix }}
   {% if label %}
     <h2{{ title_attributes.addClass('block-title') }}>{{ label }}</h2>

diff --git a/html/themes/custom/nrcan_wxt/templates/block/block--system-branding-block.html.twig b/html/themes/custom/nrcan_wxt/templates/block/block--system-branding-block.html.twig
@@ -29,16 +29,21 @@
 #}
 {% block content %}
   {% if nrwxt_logo == true %}
-    <a href="{{ site_link }}" property="url" class="brand">
-      <img src="{{ logo_svg }}" class="logo-{{ language }}" alt="{{ site_name }}" property="logo">
-    </a>
-    <link property="logo" href="{{ logo_svg }}">
-  {% else %}
-  <a href="{{ logo_home_link }}" property="url" class="brand">
-    <img src="{{ logo_svg }}" class="logo-{{ language }}" alt="{{ 'Government of Canada'|t }}" property="logo"><span class="wb-inv"> / <span lang="fr">Gouvernement du Canada</span></span>
+  <a href="{{ site_link }}" property="url" class="brand">
+    <img src="{{ logo_svg }}" class="logo-{{ language }}" alt="{{ site_name }}" property="logo">
   </a>
-  <meta property="name" content="Government of Canada">
-  <meta property="areaServed" typeof="Country" content="Canada">
   <link property="logo" href="{{ logo_svg }}">
+  {% else %}
+  {% if site_logo %}
+    <a class="logo navbar-btn pull-left" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
+      <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
+    </a>
+  {% endif %}
+  {% endif %}
+  {% if site_name %}
+    <a class="name navbar-brand" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a>
+  {% endif %}
+  {% if site_slogan %}
+    <p class="navbar-text">{{ site_slogan }}</p>
   {% endif %}
 {% endblock %}