Skip to content

Change User layout to use ::base layout instead of frontLayout (which… #306

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

Merged
merged 1 commit into from
Dec 18, 2015
Merged

Change User layout to use ::base layout instead of frontLayout (which… #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion Bundle/UserBundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
{% extends '::frontLayout.html.twig' %}
{% extends '::base.html.twig' %}


{% block head_style %}
{% stylesheets filter='less, cssrewrite' injector="victoire-edit, alertify-codrops-notification" %}
<link href="{{ asset_url }}" type="text/css" rel="stylesheet" media="screen" />
{% endstylesheets %}
{% endblock head_style %}

{% block head_script %}
<!-- HEAD_SCRIPT -->
{% javascripts injector="victoire-head" %}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}
<!-- END HEAD_SCRIPT -->

{{ parent() }}
{% endblock head_script %}

{% block body %}
{% block content %}
Expand Down
1 change: 1 addition & 0 deletions Tests/Functionnal/app/Resources/views/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{% extends 'VictoireCoreBundle::base.html.twig' %}