X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=1742b4aa664e4f78bfc6b7479aa303a7fa272a37;hb=27c837dcd1640a7f5f0ed197e882eefd53ba8273;hp=e27aceae492e658ade3ff47f2ed08802f3410836;hpb=fdab81e910f65babd1945e67c74b8bb541bcbfb3;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 e27aceae..1742b4aa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -12,111 +12,64 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + {% block css %}{% endblock %} {% block scripts %} - - - - - - - + + + {% endblock %} - {% block title %}{% endblock %} - wallabag + {% block title %}{% endblock %} {% endblock %} - {% 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 %}
- {% block footer %} - - {% endblock %} - {% if warning_message %} + {% block footer %}{% endblock %} +
- {{ warning_message | raw }} + You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to our issues list and open a new if necessary
- {% endif %}