X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fbase.html.twig;h=1742b4aa664e4f78bfc6b7479aa303a7fa272a37;hb=4ead9c648f34f49d2d1249413694e6a57f33ef04;hp=c94c004414300314994562936ea8502ef614d554;hpb=16dabc326311f084d671be188c7941bbb3c341c9;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 c94c0044..1742b4aa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -12,37 +12,37 @@
             <meta http-equiv="X-UA-Compatible" content="IE=10">
             <![endif]-->
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
 
-            <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
-            <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+            <link rel="apple-touch-icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon.png') }}">
+            <link rel="icon" type="image/png" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/apple-touch-icon.png') }}">
 
-            <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
+            <link rel="shortcut icon" type="image/x-icon" href="{{ asset('bundles/wallabagcore/themes/_global/img/appicon/favicon.ico') }}">
 
             {% block css %}{% endblock %}
             {% block scripts %}
-                <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
-                <script src="{{ asset('themes/_global/js/jquery.cookie.js') }}"></script>
-                <script src="{{ asset('themes/_global/js/bookmarklet.js') }}"></script>
+                <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>
@@ -68,10 +68,8 @@
 
         {% block footer %}{% endblock %}
 
-        {% if warning_message %}
         <div id="warning_message">
-            {{ warning_message | raw }}
+            You're trying wallabag v2, which is in alpha 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 if necessary</a>
         </div>
-        {% endif %}
     </body>
 </html>