Merge pull request #1601 from wallabag/v2-import-from-v2

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Resources / views / themes / baggy / layout.html.twig

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index de4ed2e78e199527986a5a9c27d6a966ab1fcbcb..3aead49756d0503d33e47243d9ace117f1a45f65 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -3,28 +3,28 @@
 {% block css %}
     {{ parent() }}
 
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
-    <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/ratatouille.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/font.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/main.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/messages.css') }}" media="all">
+    <link rel="stylesheet" href="{{ asset('bundles/wallabagcore/themes/baggy/css/print.css') }}" media="print">
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
 
-    <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/autoClose.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/saveLink.js') }}"></script>
-    <script src="{{ asset('themes/baggy/js/popupForm.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/init.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/closeMessage.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/autoClose.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/saveLink.js') }}"></script>
+    <script src="{{ asset('bundles/wallabagcore/themes/baggy/js/popupForm.js') }}"></script>
 {% endblock %}
 
 {% block header %}
     <header class="w600p center mbm">
         <h1 class="logo">
             {% block logo %}
-                <img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
+                <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />
             {% endblock %}
         </h1>
     </header>
@@ -51,6 +51,8 @@
             </div>
         </li>
         <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
+        <li><a href="{{ path('import') }}">{% trans %}import{% endtrans %}</a></li>
+        <li><a href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
         <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
         <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
     </ul>