From 32da2a70ef278bd42f66eb82c3fbf1905a417b87 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 23 Feb 2015 22:55:06 +0100 Subject: Add LiipThemeBundle Re-defined the config / user relation to be OneToOne bidirectionnal. ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle Force sqlite for test In case of people use a different driver in parameter.yml (yes I do :)) --- .../CoreBundle/Resources/views/layout.html.twig | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/layout.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig index e9ccc58c..1cf871d6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig @@ -14,19 +14,16 @@ {% include "WallabagCoreBundle::_head.html.twig" %} - {% include "WallabagCoreBundle::_top.html.twig" %} -
- {% block menu %}{% endblock %} - {% block precontent %}{% endblock %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- {{ flashMessage }} +

DEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULTDEFAULT

+ {% include "WallabagCoreBundle::_top.html.twig" %} +
+ {% block menu %}{% endblock %} + {% block precontent %}{% endblock %} + {{ include("WallabagCoreBundle::_messages.html.twig", {'flashMessages': app.session.flashbag.get('notice')}) }} +
+ {% block content %}{% endblock %}
- {% endfor %} -
- {% block content %}{% endblock %}
-
- {% include "WallabagCoreBundle::_footer.html.twig" %} + {% include "WallabagCoreBundle::_footer.html.twig" %} -- cgit v1.2.3