composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Fix iTopWebPage's header / footer API layout

Browse Source
This commit is contained in:
Molkobain
2020-11-24 13:29:24 +01:00
parent 7b937016d0
commit ad19a89fc5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/layouts/page-content/layout.html.twig
View File

@@ -1,6 +1,11 @@
<div id="ibo-center-container" class="ibo-center-container {% block iboPageCenterContainerExtraClasses %}{% endblock %}">
{% block iboPageCenterContainer %}
<main id="ibo-main-content">
{# Note: The header is inside the main content div to avoid glitches with other layouts (eg. in a side content layout) #}
{% block iboPageHeader %}
{{ include('pages/backoffice/extension-blocks/header.html.twig') }}
{% endblock %}
{% block iboPageMainContent %}
{% for oSubBlock in oUIBlock.GetMainBlocks() %}
{{ render_block(oSubBlock, {aPage: aPage}) }}
@@ -9,6 +14,11 @@
{% block iboPageExtraHtml %}
{{ oUIBlock.GetExtraHtmlContent()|raw }}
{% endblock %}
{# Note: The footer is inside the main content div to avoid glitches with other layouts (eg. in a side content layout) #}
{% block iboPageFooter %}
{{ include('pages/backoffice/extension-blocks/footer.html.twig') }}
{% endblock %}
</main>
{% endblock %}
</div>

4
templates/pages/backoffice/itopwebpage/layout.html.twig
View File

@@ -9,9 +9,7 @@
{{ include('pages/backoffice/extension-blocks/banner.html.twig') }}
{{ render_block(aLayouts.oTopBar, {aPage: aPage}) }}
</div>
{{ include('pages/backoffice/extension-blocks/header.html.twig') }}
{{ render_block(aLayouts.oPageContent, {aPage: aPage}) }}
{{ include('pages/backoffice/extension-blocks/footer.html.twig') }}
{{ render_block(aLayouts.oPageContent, {aPage: aPage, aLayouts: aLayouts}) }}
{# TODO: Remove this when modal development is done #}
<div id="at_the_end">{{ aPage.sDeferredContent|raw }}</div>