X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=aa388bcbcbd3d5a2e062f8e1f5ab122822435589;hb=fbdc665487bc5ea9fd46502be06a13ebc3e2fb4f;hp=3ad776b99c3f8a8cae8d5423df9c2009b48a0f5e;hpb=89659c9eae338cd29e5919b5ffde6924189a59ca;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 3ad776b9..aa388bcb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -3,7 +3,7 @@ - + {% block head %} @@ -12,112 +12,66 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - {% block css %}{% endblock %} + + + {% block css %} + {% endblock %} {% 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 %}