X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=0f88901a5c0102cfaf10eba2b000711452d97f12;hb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;hp=9e515a178057bb51669d09a80289ee57d74e8032;hpb=30d81a47c689e1d7d963fcd3fd42af9958805e31;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 9e515a17..0f88901a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -38,14 +38,12 @@
 
             <link rel="shortcut icon" type="image/x-icon" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/favicon.ico') }}">
 
-            {% block css %}{% endblock %}
+            {% block css %}
+            {% endblock %}
             {% block scripts %}
-                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery-2.0.3.min.js') }}"></script>
-                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/jquery.cookie.js') }}"></script>
-                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/bookmarklet.js') }}"></script>
             {% endblock %}
 
-            <title>{% block title %}{% endblock %}</title>
+            <title>wallabag - {% block title %}{% endblock %}</title>
         {% endblock %}
     </head>
 
@@ -68,10 +66,8 @@
 
         {% block footer %}{% endblock %}
 
-        {% if warning_message %}
-        <div id="warning_message">
-            {{ warning_message | raw }}
-        </div>
+        {% if craue_setting('piwik_enabled') %}
+            {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
         {% endif %}
     </body>
 </html>