From 19c283140ef7f489c67d7debe4dd431e7cfefd4b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 20:43:02 +0200 Subject: [PATCH] Cleanup base layout --- .../CoreBundle/Resources/views/base.html.twig | 52 ++----------------- .../views/themes/baggy/layout.html.twig | 51 ++++++++++++++++++ 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index b9184f45..152c5c28 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -50,54 +50,15 @@ - {% block header %} -
-

- {% block logo %} - wallabag logo - {% endblock %} -

-
- {% endblock %} + {% block header %}{% endblock %}
- {% block menu %} - - - {% endblock %} + {% block menu %}{% endblock %}
{% block precontent %}{% endblock %} - {% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage }}

-
- {% endfor %} - {% endblock %} + {% block messages %}{% endblock %}
{% block content %}{% endblock %} @@ -105,11 +66,8 @@
- {% block footer %} - - {% endblock %} + {% block footer %}{% endblock %} + {% if warning_message %}
{{ warning_message | raw }} 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 229c5a34..3d573eaa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -19,3 +19,54 @@ {% endblock %} + +{% block header %} +
+

+ {% block logo %} + wallabag logo + {% endblock %} +

+
+{% endblock %} + +{% block menu %} + + +{% endblock %} + +{% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} +
+ × +

{{ flashMessage }}

+
+ {% endfor %} +{% endblock %} + +{% block footer %} + +{% endblock %} -- 2.41.0