moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #939 from jsit/globaljs 

_global-izing some more js & css
This commit is contained in:
Nicolas Lœuillet 2014-11-24 13:23:53 +01:00
parent 7b8bb75228 6062f74c6b
commit 485d57972e
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
themes/default/css/jquery-ui-1.10.4.custom.css → themes/_global/css/jquery-ui-1.10.4.custom.css vendored
View File

0
themes/default/css/jquery-ui-1.10.4.custom.min.css → themes/_global/css/jquery-ui-1.10.4.custom.min.css vendored
View File

0
themes/default/js/autoClose.js → themes/_global/js/autoClose.js
View File

0
themes/default/js/autoCompleteTags.js → themes/_global/js/autoCompleteTags.js
View File

0
themes/default/js/jquery-2.0.3.min.js → themes/_global/js/jquery-2.0.3.min.js vendored
View File

0
themes/default/js/jquery-ui-1.10.4.custom.js → themes/_global/js/jquery-ui-1.10.4.custom.js vendored
View File

0
themes/default/js/jquery-ui-1.10.4.custom.min.js → themes/_global/js/jquery-ui-1.10.4.custom.min.js vendored
View File

0
themes/default/js/popupForm.js → themes/_global/js/popupForm.js
View File

0
themes/default/js/restoreScroll.js → themes/_global/js/restoreScroll.js
View File

0
themes/default/js/saveLink.js → themes/_global/js/saveLink.js
View File

8
themes/baggy/_head.twig
View File

@ -30,10 +30,10 @@
<link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/css/messages.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}themes/{{theme}}/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/{{theme}}/js/jquery.cookie.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/init.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>
<script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>

6
themes/baggy/edit-tags.twig
View File

@ -5,9 +5,9 @@
{% endblock %}
{% block content %}
<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
<div id="article">
<h2>{{ entry.title|raw }}</21>

2
themes/baggy/view.twig
View File

@ -33,7 +33,7 @@
{{ content | raw }}
</article>
</div>
<script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
<script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
<script type="text/javascript">
$(document).ready(function() {

4
themes/courgette/_view.twig
View File

@ -25,7 +25,7 @@
{{ content | raw }}
</article>
</div>
<script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
<script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
<script type="text/javascript">
$(document).ready(function() {
@ -44,4 +44,4 @@
});
});
</script>
{% endblock %}
{% endblock %}

8
themes/default/_head.twig
View File

@ -29,8 +29,8 @@
<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>

6
themes/default/edit-tags.twig
View File

@ -5,9 +5,9 @@
{% endblock %}
{% block content %}
<script src="{{ poche_url }}themes/default/js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="{{ poche_url }}themes/default/js/autoCompleteTags.js"></script>
<link rel="stylesheet" href="{{ poche_url }}themes/default/css/jquery-ui-1.10.4.custom.min.css" media="all">
<script src="{{ poche_url }}themes/_global/js/jquery-ui-1.10.4.custom.min.js"></script>
<script src="{{ poche_url }}themes/_global/js/autoCompleteTags.js"></script>
<link rel="stylesheet" href="{{ poche_url }}themes/_global/css/jquery-ui-1.10.4.custom.min.css" media="all">
<div id="article">
<header class="mbm">

2
themes/default/view.twig
View File

@ -36,7 +36,7 @@
</article>
{{ block('tags') }}
</div>
<script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script>
<script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script>
<script type="text/javascript">
$(document).ready(function() {