X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=0f88901a5c0102cfaf10eba2b000711452d97f12;hb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;hp=a6cba6cebec848f6a402a9985fcdbb2aebf81d4f;hpb=e62d27ff9b3f07f09a77e075653c6a650860f5ec;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 a6cba6ce..0f88901a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -12,107 +12,62 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - {% block css %}{% endblock %} + {% block css %} + {% endblock %} {% block scripts %} - - - - - - - {% endblock %} - {% block title %}{% endblock %} - wallabag + 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 %} -
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.
+ {% block footer %}{% endblock %} + + {% if craue_setting('piwik_enabled') %} + {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} + {% endif %}