X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=a1a9a1368949178e9d649fe92f7a3e3348bd58c7;hb=cf9ee2fbd07265c2c64766d026502a4fdbdfeec1;hp=162fb463dbb5e3560d25537a14604cfdcd04885c;hpb=0e654f62730e233f586a4efee0d654311a498b9e;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 162fb463..a1a9a136 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -12,106 +12,62 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - {% 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 %} + {% block footer %}{% endblock %} + + {% if craue_setting('piwik_enabled') %} + {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} + {% endif %}