X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=152c5c28746dbb03c01625257057d5accc4cd316;hb=db96045a0ae96cfe67bc98d49596fde31c9124fc;hp=4f27f413fc23a7fef1449d48555299a288b618d4;hpb=495aecfe7417918c45d8ea32b1ee8903018449cd;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 4f27f413..152c5c28 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -41,12 +41,8 @@ {% block css %}{% endblock %} {% block scripts %} - - - - {% endblock %} {% block title %}{% endblock %} - wallabag @@ -54,62 +50,28 @@ - {% block header %} -
-

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

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

{{ flashMessage }}

-
- {% endfor %} - {% endblock %} + {% block messages %}{% endblock %} -
- {% block content %}{% endblock %} -
+
+ {% block content %}{% endblock %} +
+
- {% block footer %} - - {% endblock %} + {% block footer %}{% endblock %} + + {% if warning_message %} +
+ {{ warning_message | raw }} +
+ {% endif %}