X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=2486172d5f6be810376cab683ecd0bb6248e3d29;hb=33e3eeaec851158289e1a236cfe08a475cc6364a;hp=b9184f4581c2972b2fa05efc9a8497da84bc6619;hpb=89ee994f772554b035e8033ee49c389f0f7786ba;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 b9184f45..2486172d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -1,119 +1,82 @@ - - - - - +{% set lang = app.request.locale|default('') -%} + + + + + {% block head %} + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - {% block css %}{% endblock %} + + + {% block css %} + {% endblock %} + {% if asset_file_exists('custom.css') %} + + {% endif %} {% block scripts %} - - - + + {% endblock %} - {% block title %}{% endblock %} - wallabag + {% block title %}{% endblock %} – wallabag {% 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 %} -
- {{ warning_message | raw }} -
+ {% block footer %}{% endblock %} + + {% if craue_setting('piwik_enabled') %} + {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} {% endif %}