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 :)) --- .../Resources/views/themes/baggy/layout.html.twig | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig new file mode 100644 index 00000000..16070c7f --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -0,0 +1,43 @@ + + + + + + + + + + + {% block title %}{% endblock %} - wallabag + {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %} + + + + + + + + + + + + + + + + + + {% 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 %} +
+
+ {% include "WallabagCoreBundle::_footer.html.twig" %} + + -- cgit v1.2.3 From 495aecfe7417918c45d8ea32b1ee8903018449cd Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 1 Mar 2015 08:22:29 +0100 Subject: Cleanup & simplify theme --- .../Resources/views/themes/baggy/layout.html.twig | 56 ++++++---------------- 1 file changed, 15 insertions(+), 41 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 16070c7f..dffea036 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -1,43 +1,17 @@ - - - - - - - - - - - {% block title %}{% endblock %} - wallabag - {% include "WallabagCoreBundle:themes:_global/_head_icon.html.twig" %} +{% extends "WallabagCoreBundle::base.html.twig" %} - - - - - +{% block css %} + {{ parent() }} - - - - - - - - - - - {% 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 %} -
-
- {% include "WallabagCoreBundle::_footer.html.twig" %} - - + + + + + +{% endblock %} + +{% block scripts %} + {{ parent() }} + + +{% endblock %} -- cgit v1.2.3