update theme to reflect custom site FIP and link

NRCan · Jul 28, 2023 · 5c4c4a1 · 5c4c4a1
1 parent 2e0af5b
commit 5c4c4a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/html/themes/custom/nrcan_wxt/src/Plugin/Preprocess/Block.php b/html/themes/custom/nrcan_wxt/src/Plugin/Preprocess/Block.php
@@ -60,12 +60,13 @@ public function preprocess(array &$variables, $hook, array $info) {
     $site_fip = $splash_config->get('site_fip.'.$language);
 
     $variables['nrwxt_logo'] = FALSE;
-    if ($site_fip) {
+    if (!empty($site_fip)) {
       $variables['nrwxt_logo'] = TRUE;
       $variables['logo'] = $site_fip;
       $variables['logo_svg'] = $site_fip;
       $variables['site_name'] = $site_name;
       $variables['site_link'] = \Drupal::urlGenerator()->generateFromRoute('<front>', [], ['absolute' => TRUE]);
+      $variables['logo_home_link'] = \Drupal::urlGenerator()->generateFromRoute('<front>', [], ['absolute' => TRUE]);
     }
 
     if (isset($variables['plugin_id']) && $variables['plugin_id'] == 'wxt_language_block:language_interface') {

diff --git a/...stom/nrcan_wxt/templates/block/block--banner--gcweb--wxt-bootstrap-sitebranding.html.twig b/...stom/nrcan_wxt/templates/block/block--banner--gcweb--wxt-bootstrap-sitebranding.html.twig
@@ -17,13 +17,13 @@
 #}
 {% block content %}
   <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" />
+    <a href="{{ logo_home_link }}" property="url">
+      <img id="header-logo" src='{{ logo_svg }}' alt="{{ site_name }}" 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="name" content="{{ site_name }}">
     <meta property="areaServed" typeof="Country" content="Canada">
     <link property="logo" href="/libraries/theme-gcweb/assets/wmms-blk.svg">
   </div>