X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=289458d4f922faa941041bbe92235868631f73c0;hb=e042a5d78fc7676eb399f61d199e8ec0045fbd1f;hp=4c0d4fee99470d5f5b078700acef030346bbdb9e;hpb=df814148c328b8c1185ad22944afe8e3c1a289fc;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 4c0d4fee..289458d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -41,13 +41,11 @@
             {% 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>
+            <script src="{{ asset('bundles/fosjsrouting/js/router.js') }}"></script>
+            <script src="{{ path('fos_js_routing_js', { callback: 'fos.Router.setData' }) }}"></script>
             {% endblock %}
 
-            <title>{% block title %}{% endblock %}</title>
+            <title>{% block title %}{% endblock %} – wallabag</title>
         {% endblock %}
     </head>
 
@@ -70,10 +68,6 @@
 
         {% block footer %}{% endblock %}
 
-        <div id="warning_message">
-            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 %}