diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-11-24 13:23:53 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2014-11-24 13:23:53 +0100 |
commit | 485d57972ee3c3219652454ff6d7d82a3602bd34 (patch) | |
tree | 9f765654886b8fba8c1d8159fff6adc2b4b5aefc /themes | |
parent | 7b8bb75228fff2a629388313a3d12cd63c846ad6 (diff) | |
parent | 6062f74c6b9344473c36b9b290aa9dece0464854 (diff) | |
download | wallabag-485d57972ee3c3219652454ff6d7d82a3602bd34.tar.gz wallabag-485d57972ee3c3219652454ff6d7d82a3602bd34.tar.zst wallabag-485d57972ee3c3219652454ff6d7d82a3602bd34.zip |
Merge pull request #939 from jsit/globaljs
_global-izing some more js & css
Diffstat (limited to 'themes')
-rw-r--r-- | themes/_global/css/jquery-ui-1.10.4.custom.css (renamed from themes/default/css/jquery-ui-1.10.4.custom.css) | 0 | ||||
-rw-r--r-- | themes/_global/css/jquery-ui-1.10.4.custom.min.css (renamed from themes/default/css/jquery-ui-1.10.4.custom.min.css) | 0 | ||||
-rw-r--r-- | themes/_global/js/autoClose.js (renamed from themes/default/js/autoClose.js) | 0 | ||||
-rwxr-xr-x | themes/_global/js/autoCompleteTags.js (renamed from themes/default/js/autoCompleteTags.js) | 0 | ||||
-rw-r--r-- | themes/_global/js/jquery-2.0.3.min.js (renamed from themes/default/js/jquery-2.0.3.min.js) | 0 | ||||
-rw-r--r-- | themes/_global/js/jquery-ui-1.10.4.custom.js (renamed from themes/default/js/jquery-ui-1.10.4.custom.js) | 0 | ||||
-rw-r--r-- | themes/_global/js/jquery-ui-1.10.4.custom.min.js (renamed from themes/default/js/jquery-ui-1.10.4.custom.min.js) | 0 | ||||
-rw-r--r-- | themes/_global/js/popupForm.js (renamed from themes/default/js/popupForm.js) | 0 | ||||
-rw-r--r-- | themes/_global/js/restoreScroll.js (renamed from themes/default/js/restoreScroll.js) | 0 | ||||
-rwxr-xr-x | themes/_global/js/saveLink.js (renamed from themes/default/js/saveLink.js) | 0 | ||||
-rwxr-xr-x | themes/baggy/_head.twig | 8 | ||||
-rwxr-xr-x | themes/baggy/edit-tags.twig | 6 | ||||
-rwxr-xr-x | themes/baggy/view.twig | 2 | ||||
-rwxr-xr-x | themes/courgette/_view.twig | 4 | ||||
-rwxr-xr-x | themes/default/_head.twig | 8 | ||||
-rwxr-xr-x | themes/default/edit-tags.twig | 6 | ||||
-rwxr-xr-x | themes/default/view.twig | 2 |
17 files changed, 18 insertions, 18 deletions
diff --git a/themes/default/css/jquery-ui-1.10.4.custom.css b/themes/_global/css/jquery-ui-1.10.4.custom.css index 5690172f..5690172f 100644 --- a/themes/default/css/jquery-ui-1.10.4.custom.css +++ b/themes/_global/css/jquery-ui-1.10.4.custom.css | |||
diff --git a/themes/default/css/jquery-ui-1.10.4.custom.min.css b/themes/_global/css/jquery-ui-1.10.4.custom.min.css index 4dba92a8..4dba92a8 100644 --- a/themes/default/css/jquery-ui-1.10.4.custom.min.css +++ b/themes/_global/css/jquery-ui-1.10.4.custom.min.css | |||
diff --git a/themes/default/js/autoClose.js b/themes/_global/js/autoClose.js index e9145b7e..e9145b7e 100644 --- a/themes/default/js/autoClose.js +++ b/themes/_global/js/autoClose.js | |||
diff --git a/themes/default/js/autoCompleteTags.js b/themes/_global/js/autoCompleteTags.js index 90bc982c..90bc982c 100755 --- a/themes/default/js/autoCompleteTags.js +++ b/themes/_global/js/autoCompleteTags.js | |||
diff --git a/themes/default/js/jquery-2.0.3.min.js b/themes/_global/js/jquery-2.0.3.min.js index a4dd0a2f..a4dd0a2f 100644 --- a/themes/default/js/jquery-2.0.3.min.js +++ b/themes/_global/js/jquery-2.0.3.min.js | |||
diff --git a/themes/default/js/jquery-ui-1.10.4.custom.js b/themes/_global/js/jquery-ui-1.10.4.custom.js index 6f599fca..6f599fca 100644 --- a/themes/default/js/jquery-ui-1.10.4.custom.js +++ b/themes/_global/js/jquery-ui-1.10.4.custom.js | |||
diff --git a/themes/default/js/jquery-ui-1.10.4.custom.min.js b/themes/_global/js/jquery-ui-1.10.4.custom.min.js index 31635026..31635026 100644 --- a/themes/default/js/jquery-ui-1.10.4.custom.min.js +++ b/themes/_global/js/jquery-ui-1.10.4.custom.min.js | |||
diff --git a/themes/default/js/popupForm.js b/themes/_global/js/popupForm.js index d233e600..d233e600 100644 --- a/themes/default/js/popupForm.js +++ b/themes/_global/js/popupForm.js | |||
diff --git a/themes/default/js/restoreScroll.js b/themes/_global/js/restoreScroll.js index 331c9e19..331c9e19 100644 --- a/themes/default/js/restoreScroll.js +++ b/themes/_global/js/restoreScroll.js | |||
diff --git a/themes/default/js/saveLink.js b/themes/_global/js/saveLink.js index a7acd84c..a7acd84c 100755 --- a/themes/default/js/saveLink.js +++ b/themes/_global/js/saveLink.js | |||
diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index 1c319aca..a88d4186 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig | |||
@@ -30,10 +30,10 @@ | |||
30 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> | 30 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all"> |
31 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> | 31 | <link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/print.css" media="print"> |
32 | 32 | ||
33 | <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script> | 33 | <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script> |
34 | <script src="{{ poche_url }}themes/default/js/autoClose.js"></script> | 34 | <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script> |
35 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> | 35 | <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> |
36 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> | 36 | <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> |
37 | <script src="{{ poche_url }}themes/default/js/saveLink.js"></script> | 37 | <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script> |
38 | <script src="{{ poche_url }}themes/default/js/popupForm.js"></script> | 38 | <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script> |
39 | <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> | 39 | <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> |
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index d7c15033..15f15560 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig | |||
@@ -5,9 +5,9 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | 7 | ||
8 | <script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> | 8 | <script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script> |
9 | <script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script> | 9 | <script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script> |
10 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> | 10 | <link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all"> |
11 | 11 | ||
12 | <div id="article"> | 12 | <div id="article"> |
13 | <h2>{{ entry.title|raw }}</21> | 13 | <h2>{{ entry.title|raw }}</21> |
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index ee964031..c8196885 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig | |||
@@ -33,7 +33,7 @@ | |||
33 | {{ content | raw }} | 33 | {{ content | raw }} |
34 | </article> | 34 | </article> |
35 | </div> | 35 | </div> |
36 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> | 36 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> |
37 | <script type="text/javascript"> | 37 | <script type="text/javascript"> |
38 | $(document).ready(function() { | 38 | $(document).ready(function() { |
39 | 39 | ||
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index 5234f766..ffb329ac 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig | |||
@@ -25,7 +25,7 @@ | |||
25 | {{ content | raw }} | 25 | {{ content | raw }} |
26 | </article> | 26 | </article> |
27 | </div> | 27 | </div> |
28 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> | 28 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> |
29 | <script type="text/javascript"> | 29 | <script type="text/javascript"> |
30 | $(document).ready(function() { | 30 | $(document).ready(function() { |
31 | 31 | ||
@@ -44,4 +44,4 @@ | |||
44 | }); | 44 | }); |
45 | }); | 45 | }); |
46 | </script> | 46 | </script> |
47 | {% endblock %} \ No newline at end of file | 47 | {% endblock %} |
diff --git a/themes/default/_head.twig b/themes/default/_head.twig index 81dde56f..277e3833 100755 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig | |||
@@ -29,8 +29,8 @@ | |||
29 | <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> | 29 | <link rel="stylesheet" href="{{ poche_url }}themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> |
30 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all"> | 30 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/messages.css" media="all"> |
31 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print"> | 31 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/print.css" media="print"> |
32 | <script src="{{ poche_url }}themes/default/js/jquery-2.0.3.min.js"></script> | 32 | <script src="{{ poche_url }}themes/_global/js/jquery-2.0.3.min.js"></script> |
33 | <script src="{{ poche_url }}themes/default/js/autoClose.js"></script> | 33 | <script src="{{ poche_url }}themes/_global/js/autoClose.js"></script> |
34 | <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script> | 34 | <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script> |
35 | <script src="{{ poche_url }}themes/default/js/saveLink.js"></script> | 35 | <script src="{{ poche_url }}themes/_global/js/saveLink.js"></script> |
36 | <script src="{{ poche_url }}themes/default/js/popupForm.js"></script> | 36 | <script src="{{ poche_url }}themes/_global/js/popupForm.js"></script> |
diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index 89c746ec..c29427e0 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig | |||
@@ -5,9 +5,9 @@ | |||
5 | {% endblock %} | 5 | {% endblock %} |
6 | {% block content %} | 6 | {% block content %} |
7 | 7 | ||
8 | <script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script> | 8 | <script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script> |
9 | <script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script> | 9 | <script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script> |
10 | <link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all"> | 10 | <link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all"> |
11 | 11 | ||
12 | <div id="article"> | 12 | <div id="article"> |
13 | <header class="mbm"> | 13 | <header class="mbm"> |
diff --git a/themes/default/view.twig b/themes/default/view.twig index b3507cef..99e0e3c3 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig | |||
@@ -36,7 +36,7 @@ | |||
36 | </article> | 36 | </article> |
37 | {{ block('tags') }} | 37 | {{ block('tags') }} |
38 | </div> | 38 | </div> |
39 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> | 39 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> |
40 | <script type="text/javascript"> | 40 | <script type="text/javascript"> |
41 | $(document).ready(function() { | 41 | $(document).ready(function() { |
42 | 42 | ||