diff --git a/source/_patterns/03-layouts/footer/footer.yml b/source/_patterns/03-layouts/footer/footer.yml
index ffffee6445647b45f6dc5aec89f73567c2f613ff..b8e38a5bdcfb5013c613a20e60c4db45b391b614 100644
--- a/source/_patterns/03-layouts/footer/footer.yml
+++ b/source/_patterns/03-layouts/footer/footer.yml
@@ -1,4 +1,3 @@
----
menu_name: 'uw-footer'
items:
- title: 'Contact Waterloo'
diff --git a/source/_patterns/03-layouts/navigation/navigation.twig b/source/_patterns/03-layouts/navigation/navigation.twig
new file mode 100644
index 0000000000000000000000000000000000000000..7c9083e88064cd2775f0764efff01111562576fb
--- /dev/null
+++ b/source/_patterns/03-layouts/navigation/navigation.twig
@@ -0,0 +1,6 @@
+<nav class="uw-main-navigation">
+ {% include '@components/menu/menu.twig' with {
+ 'menu_name': 'main',
+ 'items': items
+ } %}
+</nav>
\ No newline at end of file
diff --git a/source/_patterns/03-layouts/navigation/navigation.yml b/source/_patterns/03-layouts/navigation/navigation.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fe21bd3f98ec2463f04b872c1b93c9e48bf489e0
--- /dev/null
+++ b/source/_patterns/03-layouts/navigation/navigation.yml
@@ -0,0 +1,37 @@
+items:
+ - text: 'Home'
+ url: '/front'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - text: 'Link #1'
+ url: 'https://uwaterloo.ca/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ submenu:
+ - text: 'Link #1-1'
+ url: '/front'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - text: 'Link #1-2'
+ url: '/front'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - text: 'Link #2'
+ url: 'https://uwaterloo.ca/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
\ No newline at end of file
diff --git a/source/_patterns/03-layouts/site-container/site-container.twig b/source/_patterns/03-layouts/site-container/site-container.twig
index b6f407012376cdd749714ffdc3fc468115f77af8..8d867322c24bec9126559adbc99722002abc9c93 100644
--- a/source/_patterns/03-layouts/site-container/site-container.twig
+++ b/source/_patterns/03-layouts/site-container/site-container.twig
@@ -1,5 +1,12 @@
<div class="uw-site-container">
{% block site_content %}
- {% include "@layouts/header/header.twig" %}
+ {% include "@layouts/header/header.twig" with {
+ 'menu_name': header_menu_name,
+ 'items': header_items
+ } %}
+ {% include "@layouts/footer/footer.twig" with {
+ 'menu_name': footer_menu_name,
+ 'items': footer_items
+ }%}
{% endblock %}
</div>
diff --git a/source/_patterns/03-layouts/site-container/site-container.yml b/source/_patterns/03-layouts/site-container/site-container.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b5464326a4975c80ce0cf9279d686166a30ba01b
--- /dev/null
+++ b/source/_patterns/03-layouts/site-container/site-container.yml
@@ -0,0 +1,118 @@
+header_menu_name: 'header'
+header_items:
+ - title: 'Admissions'
+ url: https://uwaterloo.ca/admissions/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'About Waterloo'
+ url: 'https://uwaterloo.ca/about/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Faculties & Academics'
+ url: 'https://uwaterloo.ca/faculties-academics/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Offices & Services'
+ url: 'https://uwaterloo.ca/offices-services/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Support Waterloo'
+ url: 'https://uwaterloo.ca/support/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+classes:
+ - 'uw-header'
+ - 'default'
+footer_menu_name: 'uw-footer'
+footer_items:
+ - title: 'Contact Waterloo'
+ url: 'https://uwaterloo.ca/about/contact-us'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Maps & Directions'
+ url: 'https://uwaterloo.ca/map/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Watsafe'
+ url: 'https://uwaterloo.ca/watsafe/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Accessibility'
+ url: 'https://uwaterloo.ca/human-resources/accessibility'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Privacy'
+ url: 'https://uwaterloo.ca/privacy/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Copyright'
+ url: 'https://uwaterloo.ca/copyright'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Media'
+ url: 'https://uwaterloo.ca/news/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Careers'
+ url: 'https://uwaterloo.ca/careers/'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+ - title: 'Careers'
+ url: 'https://uwaterloo.ca/about/contact-us/contact-form'
+ original_link:
+ options:
+ attributes:
+ class: ''
+ in_active_trail: false
+social_media:
+ menu_tree:
+ - text: "Facebook"
+ url: "https://www.facebook.com/university.waterloo"
+ - text: "Twitter"
+ url: "https://twitter.com/uWaterloo"
+ - text: "YouTube"
+ url: "https://www.youtube.com/user/uwaterloo"
+ - text: "Instagram"
+ url: "https://www.instagram.com/uofwaterloo/"
+ - text: "LinkedIn"
+ url: "https://www.linkedin.com/edu/school?id=10875"
+social_media_placement: "global-site-footer"
\ No newline at end of file
diff --git a/source/_patterns/04-components/menu/menu--main/menu--main.yml b/source/_patterns/04-components/menu/menu--main/menu--main.yml
index 46c51146f249948a9e9f27ce91328807a0666da7..77b2e5873e65265f099c01055a6015746514315f 100644
--- a/source/_patterns/04-components/menu/menu--main/menu--main.yml
+++ b/source/_patterns/04-components/menu/menu--main/menu--main.yml
@@ -1,236 +1,37 @@
----
-menu_name: 'main'
items:
- - title: 'Main Link 1'
- url: '#'
+ - text: 'Home'
+ url: '/front'
original_link:
options:
attributes:
class: ''
in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Main Link 2'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Main Link 3'
- url: '#'
+ - text: 'Link #1'
+ url: 'https://uwaterloo.ca/'
original_link:
options:
attributes:
class: ''
in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
+ submenu:
+ - text: 'Link #1-1'
+ url: '/front'
original_link:
options:
attributes:
class: ''
in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
+ - text: 'Link #1-2'
+ url: '/front'
original_link:
options:
attributes:
class: ''
in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Main Link 4'
- url: '#'
+ - text: 'Link #2'
+ url: 'https://uwaterloo.ca/'
original_link:
options:
attributes:
class: ''
- in_active_trail: false
- below:
- - title: 'Submenu item one'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item two'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
- - title: 'Submenu item three'
- url: '#'
- original_link:
- options:
- attributes:
- class: ''
- in_active_trail: false
-menu_class:
- - 'primary-nav'
-item_class:
- - 'primary-nav__item'
-link_class:
- - 'primary-nav__link'
- - 'special-link-class'
+ in_active_trail: false
\ No newline at end of file