From c390145abfaa65e051caceb494068af9625641cd Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Tue, 17 Nov 2020 11:50:07 -0500
Subject: [PATCH] ISTWCMS-4199: fixing header menu links
---
.../menu/menu--header/menu--header.twig | 51 +++++++------------
1 file changed, 17 insertions(+), 34 deletions(-)
diff --git a/source/_patterns/04-components/menu/menu--header/menu--header.twig b/source/_patterns/04-components/menu/menu--header/menu--header.twig
index cbe24fb6..6df93bf1 100644
--- a/source/_patterns/04-components/menu/menu--header/menu--header.twig
+++ b/source/_patterns/04-components/menu/menu--header/menu--header.twig
@@ -1,63 +1,46 @@
{% set submenu = [] %}
-{% set submenu = submenu|merge
- (
+{% set submenu = submenu|merge([
{
'title': 'Admissions',
'url': 'https://uwaterloo.ca/admissions/',
'in_active_trail': false
- }
- )
-%}
-
-{% set submenu = submenu|merge
- (
+ },
{
'title': 'About Waterloo',
'url': 'https://uwaterloo.ca/about/',
'in_active_trail': false
- }
- )
-%}
-
-{% set submenu = submenu|merge
- (
+ },
{
'title': 'Faculties & Academics',
'url': 'https://uwaterloo.ca/faculties-academics/',
'in_active_trail': false
- }
- )
-%}
-
-{% set submenu = submenu|merge
- (
+ },
{
'title': 'Offices & Services',
'url': 'https://uwaterloo.ca/offices-services/',
'in_active_trail': false
- }
- )
-%}
-
-{% set submenu = submenu|merge
- (
+ },
{
'title': 'Support Waterloo',
'url': 'https://uwaterloo.ca/support/',
'in_active_trail': false
- },
- )
-%}
-{% set items = [] %}
-{% set items = items|merge({'title': 'Jump to', 'url': '#', 'in_active_trail': 'false', 'submenu': submenu}) %}
-
+ }
+]) %}
+{% set items = [] %}
+{% set items = items|merge([
+ {
+ 'title': 'Jump to',
+ 'url': '#',
+ 'in_active_trail': 'false',
+ 'submenu': submenu
+ }
+]) %}
<div class="uw-header-menu" aria-label="">
{% include "@components/menu/menu--horizontal/menu--horizontal.twig" with {
- 'items': items,
- 'is_demo': true
+ 'items': items
}%}
</div>
--
GitLab