Merge pull request #1738 from wallabag/v2-prepare-beta1

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / views / base.html.twig

diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 9e515a178057bb51669d09a80289ee57d74e8032..4c0d4fee99470d5f5b078700acef030346bbdb9e 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -38,11 +38,13 @@
 
             <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>
+                <script src="{{ asset('bundles/wallabagcore/themes/_global/js/annotator.min.js') }}"></script>
             {% endblock %}
 
             <title>{% block title %}{% endblock %}</title>
@@ -68,10 +70,12 @@
 
         {% block footer %}{% endblock %}
 
-        {% if warning_message %}
         <div id="warning_message">
-            {{ warning_message | raw }}
+            You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new one if necessary</a>.
         </div>
+
+        {% if craue_setting('piwik_enabled') %}
+            {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }}
         {% endif %}
     </body>
 </html>