diff --git a/templates/regions/region--footer.html.twig b/templates/regions/region--footer.html.twig index 4555804c4896429b1ef850474c4b7610c170ece5..44ef2753de30d735bf6a6e957894f1c367b3e567 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 eeed07b6fe41b3354d90cd9b9abcf0f4a72461bf..a4d0dc49b069e78dbabb43a044ca143b39ec8e1d 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(); }