Skip to content
Snippets Groups Projects
Commit d2bc0a30 authored by Kevin Paxman's avatar Kevin Paxman
Browse files

Merge branch 'feature/ISTWCMS-6171-ebremner-page-display-options' into '1.0.x'

ISTWCMS-6171: adding page display additional options for nodes

See merge request !95
parents 33023c4d 66dced4b
No related branches found
No related tags found
1 merge request!95ISTWCMS-6171: adding page display additional options for nodes
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
{% set faculty = faculty ? faculty : 'org-art' %} {% set faculty = faculty ? faculty : 'org-art' %}
{% endif %} {% endif %}
{% if not uw_option %}
{% set uw_option = 'all' %}
{% endif %}
<header class="uw-header {{ faculty }}" role="banner"> <header class="uw-header {{ faculty }}" role="banner">
{% if global_message %} {% if global_message %}
<div id="global-message"> <div id="global-message">
...@@ -12,7 +16,7 @@ ...@@ -12,7 +16,7 @@
<div class="uw-header__masthead"> <div class="uw-header__masthead">
{% include '@components/site-logo/site-logo.twig' %} {% include '@components/site-logo/site-logo.twig' %}
{% if branding_level == 'full' %} {% if branding_level == 'full' and uwoption != 'none' %}
{% include "@components/menu/menu--header/menu--header.twig" with { {% include "@components/menu/menu--header/menu--header.twig" with {
'modifier_classes': 'header', 'modifier_classes': 'header',
'include_home': false, 'include_home': false,
...@@ -29,34 +33,41 @@ ...@@ -29,34 +33,41 @@
'faculty': faculty 'faculty': faculty
}%} }%}
{% endif %} {% endif %}
<!-- Main header horizontal navigation -->
<nav class="uw-header__nav">
<div class="uw-header__center">
<div class="uw-header__site-name">
{% include '@components/site-name/site-name.twig' with {
'site_name': site_name,
'home_link': home_link
} %}
</div>
<button class="uw-navigation-button" aria-controls="uw-header__navigation" aria-expanded="false">
<span class="uw-navigation-button__text">Menu</span>
<span class="uw-navigation-button__lines"></span>
</button>
</div>
<div id="uw-header__navigation" class="uw-header__navigation">
{% include "@components/menu/menu--horizontal/menu--horizontal.twig" with {
'modifier_classes': 'main',
'menu_name': 'horizontal',
'items': nav_items,
'home_link': home_link,
'include_home': true,
}%}
{% include "@components/menu/menu--secondary/menu--secondary.twig" with { {% if uw_option != 'none' %}
'modifier_classes': 'secondary', <!-- Main header horizontal navigation -->
'items': secondary_items, <nav class="uw-header__nav">
'include_home': false, <div class="uw-header__center">
}%} <div class="uw-header__site-name">
</div> {% include '@components/site-name/site-name.twig' with {
</nav> 'site_name': site_name,
'home_link': home_link
} %}
</div>
{% if uw_option == 'all' %}
<button class="uw-navigation-button" aria-controls="uw-header__navigation" aria-expanded="false">
<span class="uw-navigation-button__text">Menu</span>
<span class="uw-navigation-button__lines"></span>
</button>
{% endif %}
</div>
{% if uw_option == 'all' %}
<div id="uw-header__navigation" class="uw-header__navigation">
{% include "@components/menu/menu--horizontal/menu--horizontal.twig" with {
'modifier_classes': 'main',
'menu_name': 'horizontal',
'items': nav_items,
'home_link': home_link,
'include_home': true,
}%}
{% include "@components/menu/menu--secondary/menu--secondary.twig" with {
'modifier_classes': 'secondary',
'items': secondary_items,
'include_home': false,
}%}
</div>
{% endif %}
</nav>
{% endif %}
</header> </header>
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