Skip to content
Permalink
Browse files

fix show_footer and show_header tpl BT#11338

  • Loading branch information...
aragonc committed Jun 30, 2016
1 parent b708d16 commit 1edb8e4af0a095893d0a06d86c25edaaa6b611b0
@@ -32,5 +32,5 @@ var disconnect_lang = '{{ "ChatDisconnected"|get_lang }}';
{% include template ~ '/layout/header.js.tpl' %}

{{ css_custom_file_to_string }}
{{ css_style_print }}11
{{ css_style_print }}
{{ header_extra_content }}

This file was deleted.

@@ -1,4 +1,4 @@
{# Actions #}

{% if actions != '' %}
<div class="actions">
{{ actions }}
@@ -10,17 +10,13 @@
{% endif %}
{{ flash_messages }}
<span id="js_alerts"></span>

{# Page header #}
{% if header != '' %}
<div class="section-page">
<div class="page-header">
<h3>{{ header }}</h3>
</div>
</div>
{% endif %}

{# Show messages #}
{% if message != '' %}
<section id="messages">
{{ message}}
@@ -1,26 +1,6 @@
{#
show_header and show_footer templates are only called when using the
Display::display_header and Display::display_footer
for backward compatibility we suppose that the default layout is one column
which means using a div with class span12
#}
{% if show_header == true %}
</section>
</div>
{% endif %}

{# Plugin bottom #}
{% if plugin_content_bottom is not null %}
<div id="plugin_content_bottom" class="col-md-12">
{{ plugin_content_bottom}}
</div>
{% endif %}

{% if show_footer == true %}
</div> <!-- end of #col" -->
</div> <!-- end of #row" -->
</div> <!-- end of #container" -->

{% endif %}

{% include template ~ "/layout/main_footer.tpl" %}
</section>
{% include template ~ "/layout/page-footer.tpl" %}
</div>
</body>
</html>
@@ -1,17 +1,38 @@
{% include template ~ "/layout/main_header.tpl" %}
{#
show_header and show_footer templates are only called when using the
Display::display_header and Display::display_footer
for backward compatibility we suppose that the default layout is one column
which means using a div with class span12
#}
{% if show_header == true %}
{% if plugin_content_top is not null %}
<div id="plugin_content_top" class="col-md-12">
{{ plugin_content_top }}
</div>
{% endif %}
<div class="col-md-12">
{% include template ~ "/layout/page_body.tpl" %}
<section id="main_content">
<!DOCTYPE html>
<!--[if lt IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html lang="{{ document_language }}" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html lang="{{ document_language }}" class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!-->
<html lang="{{ document_language }}" class="no-js"> <!--<![endif]-->
<head>
{% block head %}
{% include template ~ "/layout/head.tpl" %}
{% endblock %}
</head>
<body dir="{{ text_direction }}" class="{{ section_name }} {{ login_class }}">
<noscript>{{ "NoJavascript"|get_lang }}</noscript>
<div class="wrap">
{% if displayCookieUsageWarning == true %}
<!-- Display Cookies validation -->
<div class="toolbar-cookie alert-warning">
<form onSubmit="$(this).toggle('slow')" action="" method="post">
<input value=1 type="hidden" name="acceptCookies"/>
<div class="cookieUsageValidation">
{{ "YouAcceptCookies" | get_lang }}
<span style="margin-left:20px;" onclick="$(this).next().toggle('slow'); $(this).toggle('slow')">
({{"More" | get_lang }})
</span>
<div style="display:none; margin:20px 0;">
{{ "HelpCookieUsageValidation" | get_lang}}
</div>
<span style="margin-left:20px;" onclick="$(this).parent().parent().submit()">
({{"Accept" | get_lang }})
</span>
</div>
</form>
</div>
{% endif %}
{% include template ~ "/layout/page-header.tpl" %}
<section id="content-section">
<div class="container">

0 comments on commit 1edb8e4

Please sign in to comment.
You can’t perform that action at this time.