Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed deprecated blocks from base_layout.html.twig #1594

Merged
merged 3 commits into from
Sep 7, 2022
Merged

Removed deprecated blocks from base_layout.html.twig #1594

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e902279
Removed deprecated blocks from base_layout.html.twig
eerison Sep 6, 2022
4aa3d13
Fix the indentation
eerison Sep 6, 2022
be247fd
Added upgrade notes for template changes
eerison Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions src/Resources/views/base_layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,14 @@ file that was distributed with this source code.
{% endblock %}
{% block sonata_page_head %}
<head {{ sonata_seo_head_attributes() }}>

<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
{{ sonata_seo_title() }}
{{ sonata_seo_metadatas() }}

{% block sonata_page_stylesheets %}
{% block page_stylesheets %} {# Deprecated block #}
<link rel="stylesheet" href="{{ asset('bundles/sonatapage/frontend.css') }}" media="all">
{% endblock %}
<link rel="stylesheet" href="{{ asset('bundles/sonatapage/frontend.css') }}" media="all">
{% endblock %}

{% block sonata_page_javascripts %}
{% block page_javascripts %} {# Deprecated block #}
{% endblock %}
{% endblock %}
{% block sonata_page_javascripts %}{% endblock %}
</head>
{% endblock %}

Expand All @@ -37,7 +30,6 @@ file that was distributed with this source code.
{% endblock %}

{% block sonata_page_top_bar %}
{% block page_top_bar %} {# Deprecated block #}
{% if sonata_page.isEditor or ( app.user and is_granted('ROLE_PREVIOUS_ADMIN') ) %}
eerison marked this conversation as resolved.
Show resolved Hide resolved
<header class="sonata-bc sonata-page-top-bar navbar navbar-inverse navbar-fixed-top" role="banner">
<div class="container">
Expand Down Expand Up @@ -99,15 +91,11 @@ file that was distributed with this source code.
</div>
</header>
{% endif %}
{% endblock %}
{% endblock %}

{% block sonata_page_container %}
{% block page_container %}{% endblock %} {# Deprecated block #}
{% endblock %}
{% block sonata_page_container %}{% endblock %}

{% block sonata_page_asset_footer %}
{% block page_asset_footer %} {# Deprecated block #}
{% if page is defined %}
eerison marked this conversation as resolved.
Show resolved Hide resolved
{% if page.javascript is not empty %}
<script>
Expand All @@ -126,9 +114,6 @@ file that was distributed with this source code.
#}
{{ sonata_block_include_stylesheets('screen', app.request.basePath) }}
{{ sonata_block_include_javascripts('screen', app.request.basePath) }}
{% endblock %}
{% endblock %}

<!-- monitoring:3e9fda56df2cdd3b039f189693ab7844fbb2d4f6 -->
</body>
</html>