From a6523cfe86a4555df4f02622db74e4df77f895c2 Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Sat, 8 Aug 2015 00:16:14 +0300 Subject: [PATCH] fix #1281 --- .../CoreBundle/Resources/views/base.html.twig | 28 ++-- .../views/themes/material/base.html.twig | 140 ------------------ .../views/themes/material/layout.html.twig | 69 ++++++++- 3 files changed, 76 insertions(+), 161 deletions(-) delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 4f27f413..f17feedd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -90,20 +90,22 @@ {% endblock %} - {% block precontent %}{% endblock %} - - {% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage }}

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

{{ flashMessage }}

+
+ {% endfor %} + {% endblock %} -
- {% block content %}{% endblock %} -
+
+ {% block content %}{% endblock %} +
+
{% block footer %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig deleted file mode 100644 index 773a3729..00000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - {% block head %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% block css %}{% endblock %} - {% block scripts %} - - - - - - - - {% endblock %} - - {% block title %}{% endblock %} - wallabag - {% endblock %} - - - - {% block header %} - {% endblock %} - -
- {% block menu %} - - {% endblock %} - -
- - {% block precontent %}{% endblock %} - - {% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} -
- × -

{{ flashMessage }}

-
- {% endfor %} - {% endblock %} - -
- {% block content %}{% endblock %} -
- -
-
- - {% block footer %} - - {% endblock %} - - diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig index 632f8c8b..8a49190e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig @@ -18,6 +18,67 @@ {% block header %} {% endblock %} +{% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} + + {% endfor %} +{% endblock %} + +{% block menu %} + +{% endblock %} + {% block footer %} -{% endblock %} - -{% block messages %} - {% for flashMessage in app.session.flashbag.get('notice') %} - - {% endfor %} {% endblock %} \ No newline at end of file -- 2.41.0