From 26a3480c70cdedb40657739964d9be5554002e66 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Wed, 5 Jun 2024 13:15:42 -0400
Subject: [PATCH] ISTWCMS-6910: using new service to get out menus
---
templates/regions/region--footer.html.twig | 4 +---
uw_fdsu_theme_resp.theme | 20 ++++++++++++++++++--
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/templates/regions/region--footer.html.twig b/templates/regions/region--footer.html.twig
index 4555804c..44ef2753 100644
--- a/templates/regions/region--footer.html.twig
+++ b/templates/regions/region--footer.html.twig
@@ -12,13 +12,11 @@
* @see template_preprocess_region()
*/
#}
-{% set social_media = simplify_menu('uw-menu-global-social-media') %}
-{% set footer_menu = simplify_menu('uw-menu-global-footer') %}
{% embed '@layouts/footer/footer.twig' with {
"social_media": social_media,
"social_media_placement": "global-site-footer",
- "footer_menu": footer_menu.menu_tree
+ "footer_menu": footer_menu
} %}
{% block content %}
diff --git a/uw_fdsu_theme_resp.theme b/uw_fdsu_theme_resp.theme
index eeed07b6..a4d0dc49 100644
--- a/uw_fdsu_theme_resp.theme
+++ b/uw_fdsu_theme_resp.theme
@@ -192,10 +192,10 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) {
$variables['home_link'] = Url::fromRoute('<front>')->setAbsolute()->toString();
// Set the main menu variable.
- $variables['main_menu'] = \Drupal::service('uw_cfg_common.uw_service')->uwGetMenu('main', TRUE, TRUE);
+ $variables['main_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')->getMenuTree('main', TRUE, TRUE);
// Set the secondary menu variable.
- $variables['secondary_menu'] = \Drupal::service('uw_cfg_common.uw_service')->uwGetMenu('uw-menu-audience-menu', TRUE, TRUE);
+ $variables['secondary_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')->getMenuTree('uw-menu-audience-menu', TRUE, TRUE);
// The class that is used for the header.
$variables['classes'][] = 'uw-header';
@@ -249,6 +249,22 @@ function uw_fdsu_theme_resp_preprocess_region(&$variables) {
$variables['classes'][] = 'uw-contained-width';
}
}
+
+ if ($region == 'footer') {
+ $variables['social_media'] = \Drupal::service('uw_cfg_common.uw_menu_items')
+ ->getMenuTree(
+ 'uw-menu-global-social-media',
+ FALSE
+ );
+
+ $variables['footer_menu'] = \Drupal::service('uw_cfg_common.uw_menu_items')
+ ->getMenuTree(
+ 'uw-menu-global-footer',
+ FALSE
+ );
+ $test = '';
+ }
+
$variables['language'] = \Drupal::languageManager()->getCurrentLanguage();
}
--
GitLab