Skip to content
Snippets Groups Projects

wxt_bootstrap-3496030: Block header used two times, needs to be fixed.

Open wxt_bootstrap-3496030: Block header used two times, needs to be fixed.
issue/wxt_bootstrap-3496030:wxt_bootstrap-3496030 into 8.x-8.x
Open Alok Singh requested to merge issue/wxt_bootstrap-3496030:wxt_bootstrap-3496030 into 8.x-8.x
Compare
and
2 files
+ 165
− 122
Compare changes
  • Side-by-side
  • Inline
Files
2
templates/system/page.html.twig
+ 116
− 122
@@ -60,70 +60,71 @@
{# Navbar #}
{% if page.navigation or page.navigation_collapsible %}
{% block navbar %}
{% block navbar %}
{%
{%
set navbar_classes = [
'navbar',
theme.settings.navbar_inverse ? 'navbar-inverse' : 'navbar-default',
theme.settings.navbar_position ? 'navbar-' ~ theme.settings.navbar_position|clean_class : '',
]
%}
<header{{ navbar_attributes.addClass(navbar_classes) }} id="navbar">
<div id="wb-bnr">
<div id="wb-bar">
<div class="container">
<div class="row">
<section id="wb-lng" class="visible-md visible-lg">
<h2>Language selection</h2>
{{ page.language_toggle }}
</section>
<section class="wb-mb-links col-xs-12 visible-sm visible-xs" id="wb-glb-mn">
<h2>{{ 'Search and menus'|t }}</h2>
<ul class="pnl-btn list-inline text-right">
<li>
<a href="#mb-pnl" title="Search and menus" aria-controls="mb-pnl" class="overlay-lnk btn btn-sm btn-default" role="button">
<span class="glyphicon glyphicon-search">
<span class="glyphicon glyphicon-th-list">
<span class="wb-inv">{{ 'Search and menus'|t }}</span>
</span>
</span>
</a>
</li>
</ul>
<div id="mb-pnl"></div>
</section>
</div>
</div>
</div>
<div class="container">
<div class="row">
{{ page.banner }}
{{ page.search }}
</div>
</div>
</div>
{{ page.navigation }}
{{ page.breadcrumb }}
</header>
{% endblock %}
<header{{navbar_attributes.addClass(navbar_classes)}} id="navbar">
<div id="wb-bnr">
<div id="wb-bar">
<div class="container">
<div class="row">
<section id="wb-lng" class="visible-md visible-lg">
<h2>Language selection</h2>
{{ page.language_toggle }}
</section>
<section class="wb-mb-links col-xs-12 visible-sm visible-xs" id="wb-glb-mn">
<h2>{{ 'Search and menus'|t }}</h2>
<ul class="pnl-btn list-inline text-right">
<li>
<a href="#mb-pnl" title="Search and menus" aria-controls="mb-pnl" class="overlay-lnk btn btn-sm btn-default" role="button">
<span class="glyphicon glyphicon-search">
<span class="glyphicon glyphicon-th-list">
<span class="wb-inv">{{ 'Search and menus'|t }}</span>
</span>
</span>
</a>
</li>
</ul>
<div id="mb-pnl"></div>
</section>
</div>
</div>
</div>
<div class="container">
<div class="row">
{{ page.banner }}
{{ page.search }}
</div>
</div>
</div>
{{ page.navigation }}
{{ page.breadcrumb }}
</header>
{% endblock %}
{% endif %}
{# Main #}
{% block main %}
<div class="{{ container }}">
<div class="row">
<div class="{{ container }}">
<div
class="row">
{# Header #}
{% if page.header %}
{% block header %}
{{ page.header }}
{% endblock %}
{% endif %}
{# Header #}
{% if page.header %}
{% block header %}
{{ page.header }}
{% endblock %}
{% endif %}
{# Content #}
{%
{# Content #}
{%
set content_classes = [
page.sidebar_first and page.sidebar_second ? 'col-md-6 col-md-push-3',
page.sidebar_first and page.sidebar_second is empty ? 'col-md-9 col-md-push-3',
@@ -131,92 +132,85 @@
page.sidebar_first is empty and page.sidebar_second is empty ? 'col-md-12'
]
%}
<main property="mainContentOfPage" {{ content_attributes.addClass(content_classes, 'main-container', container, 'js-quickedit-main-content') }}>
{# Header #}
{% if page.header %}
{% block header %}
{{ page.header }}
{% endblock %}
{% endif %}
<section>
{# Breadcrumbs #}
{% if breadcrumb %}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
{% endif %}
{# Action Links #}
{% if action_links %}
{% block action_links %}
<ul class="action-links">{{ action_links }}</ul>
{% endblock %}
{% endif %}
{# Help #}
{% if page.help %}
{% block help %}
{{ page.help }}
{% endblock %}
{% endif %}
{# Content #}
{% block content %}
<a id="main-content"></a>
{{ page.content }}
{{ page.content_footer }}
{% endblock %}
</section>
</main>
{# Sidebar First #}
{%
<main property="mainContentOfPage" {{ content_attributes.addClass(content_classes, 'main-container', container, 'js-quickedit-main-content') }}>
<section>
{# Breadcrumbs #}
{% if breadcrumb %}
{% block breadcrumb %}
{{ breadcrumb }}
{% endblock %}
{% endif %}
{# Action Links #}
{% if action_links %}
{% block action_links %}
<ul class="action-links">{{ action_links }}</ul>
{% endblock %}
{% endif %}
{# Help #}
{% if page.help %}
{% block help %}
{{ page.help }}
{% endblock %}
{% endif %}
{# Content #}
{% block content %}
<a id="main-content"></a>
{{ page.content }}
{{ page.content_footer }}
{% endblock %}
</section>
</main>
{# Sidebar First #}
{%
set sidebar_first_classes = [
page.sidebar_first and page.sidebar_second ? 'col-md-3 col-md-pull-6',
page.sidebar_first and page.sidebar_second is empty ? 'col-md-3 col-md-pull-9',
page.sidebar_second and page.sidebar_first is empty ? 'col-md-3 col-md-pull-9'
]
%}
{# Sidebar First #}
{% if page.sidebar_first %}
{% block sidebar_first %}
<nav{{ attributes.addClass(sidebar_first_classes) }}>
{{ page.sidebar_first }}
</nav>
{% endblock %}
{% endif %}
{# Sidebar Second #}
{%
{# Sidebar First #}
{% if page.sidebar_first %}
{% block sidebar_first %}
<nav{{attributes.addClass(sidebar_first_classes)}}>
{{ page.sidebar_first }}
</nav>
{% endblock %}
{% endif %}
{# Sidebar Second #}
{%
set sidebar_second_classes = [
page.sidebar_first and page.sidebar_second ? 'col-md-3',
page.sidebar_first and page.sidebar_second is empty ? 'col-md-3',
page.sidebar_second and page.sidebar_first is empty ? 'col-md-3'
]
%}
{# Sidebar Second #}
{% if page.sidebar_second %}
{% block sidebar_second %}
<nav{{ attributes.removeClass(sidebar_first_classes).addClass(sidebar_second_classes) }}>
{{ page.sidebar_second }}
</nav>
{% endblock %}
{% endif %}
</div>
</div>
{# Sidebar Second #}
{% if page.sidebar_second %}
{% block sidebar_second %}
<nav{{attributes.removeClass(sidebar_first_classes).addClass(sidebar_second_classes)}}>
{{ page.sidebar_second }}
</nav>
{% endblock %}
{% endif %}
</div>
</div>
{% endblock %}
{% if page.footer %}
{% block footer %}
<footer class="visible-sm visible-md visible-lg wb-navcurr" id="wb-info">
<div class="{{ container }}">
{{ page.footer }}
</div>
</footer>
{% endblock %}
{% block footer %}
<footer class="visible-sm visible-md visible-lg wb-navcurr" id="wb-info">
<div class="{{ container }}">
{{ page.footer }}
</div>
</footer>
{% endblock %}
{% endif %}