fix autoclose (#984) and bookmarklet mode

[github/wallabag/wallabag.git] / themes / default / _head.twig

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index d2a637fb01f57989a8806af3e814f147756d9142..277e383346a25678dbb44de0dd5b7f9bd2543388 100755 (executable)
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,5 +1,3 @@
-        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
-
         <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
         <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon-152.png" sizes="152x152">
 
@@ -24,13 +22,15 @@
         <link rel="apple-touch-icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
         <link rel="icon" type="image/png" href="{{ poche_url }}themes/_global/img/appicon/apple-touch-icon.png">
 
+        <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}themes/_global/img/appicon/favicon.ico">
+
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/knacss.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/style.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print">
-        <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script>
-        <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script>
         <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
-        <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
-        <script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script>
+        <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script>