Skip to content
Snippets Groups Projects
Commit 7e0d9ba8 authored by Lily Yan's avatar Lily Yan
Browse files

Merge branch 'feature/ISTWCMS-4719-ibiki-global-message' into '8.x-3.x'

ISTWCMS-4719: Adding global message to pattern lab.

See merge request !42
parents 574f15b2 06f227cd
No related branches found
No related tags found
1 merge request!42ISTWCMS-4719: Adding global message to pattern lab.
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
} }
]) %} ]) %}
{% set headerbar_form_items = [] %} {% set headerbar_form_items = [] %}
{% set headerbar_form_items = headerbar_form_items|merge([ {% set headerbar_form_items = headerbar_form_items|merge([
{ {
...@@ -59,15 +58,16 @@ ...@@ -59,15 +58,16 @@
} }
]) %} ]) %}
{% if is_demo_header %} {% if is_demo_header %}
{% set faculty = faculty ? faculty : 'org-art' %} {% set faculty = faculty ? faculty : 'org-art' %}
{% endif %} {% endif %}
<header class="uw-header {{ faculty }}" role="banner"> <header class="uw-header {{ faculty }}" role="banner">
{% if global_message %}
<div id="global-message">
{{ global_message|render }}
</div>
{% endif %}
<div class="uw-header__masthead"> <div class="uw-header__masthead">
{% include '@components/site-logo/site-logo.twig' %} {% include '@components/site-logo/site-logo.twig' %}
...@@ -87,7 +87,6 @@ ...@@ -87,7 +87,6 @@
'form_items':form_items 'form_items':form_items
}%} }%}
{% include "@components/search/search--wcms-headerbar/search--wcms-headerbar.twig" with { {% include "@components/search/search--wcms-headerbar/search--wcms-headerbar.twig" with {
'form_action': 'https://uwaterloo.ca/search', 'form_action': 'https://uwaterloo.ca/search',
'form_autocomplete': 'off', 'form_autocomplete': 'off',
...@@ -133,4 +132,3 @@ ...@@ -133,4 +132,3 @@
</div> </div>
</nav> </nav>
</header> </header>
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
is_demo_header: true is_demo_header: true
header_modifier_classes: 'header' header_modifier_classes: 'header'
menu_name: 'horizontal' menu_name: 'horizontal'
global_message: '<p>Visit our <a href="http://uwaterloo.ca/coronavirus">COVID-19 information website</a> to learn how Warriors protect Warriors.</p>'
header_items: header_items:
- title: 'Jump To' - title: 'Jump To'
url: '#' url: '#'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment