Merge pull request #939 from jsit/globaljs

_global-izing some more js & css

diff --git a/themes/default/css/jquery-ui-1.10.4.custom.css b/themes/_global/css/jquery-ui-1.10.4.custom.css
similarity index 100%
rename from themes/default/css/jquery-ui-1.10.4.custom.css
rename to 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
similarity index 100%
rename from themes/default/css/jquery-ui-1.10.4.custom.min.css
rename to 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
similarity index 100%
rename from themes/default/js/autoClose.js
rename to themes/_global/js/autoClose.js

diff --git a/themes/default/js/autoCompleteTags.js b/themes/_global/js/autoCompleteTags.js
similarity index 100%
rename from themes/default/js/autoCompleteTags.js
rename to 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
similarity index 100%
rename from themes/default/js/jquery-2.0.3.min.js
rename to 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
similarity index 100%
rename from themes/default/js/jquery-ui-1.10.4.custom.js
rename to 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
similarity index 100%
rename from themes/default/js/jquery-ui-1.10.4.custom.min.js
rename to 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
similarity index 100%
rename from themes/default/js/popupForm.js
rename to themes/_global/js/popupForm.js

diff --git a/themes/default/js/restoreScroll.js b/themes/_global/js/restoreScroll.js
similarity index 100%
rename from themes/default/js/restoreScroll.js
rename to themes/_global/js/restoreScroll.js

diff --git a/themes/default/js/saveLink.js b/themes/_global/js/saveLink.js
similarity index 100%
rename from themes/default/js/saveLink.js
rename to themes/_global/js/saveLink.js

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 1c319aca9d23379d9f05cdf23024315c43808d0a..a88d4186f466feeb0a7f2b75d0c061f91b6ee0cb 100755 (executable)
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -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>

diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index d7c150333b3f79c9b76a98fd953059f61c3f5767..15f15560fa52941268203eee7b5cafbbb833d451 100755 (executable)
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -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>

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index ee96403134d259ec14954b7acef15e8ec305e44e..c8196885d630e4ca87cabbd6a2bcd7e0416b8a25 100755 (executable)
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -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() {
         

diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig
index 5234f7667a7a71908239063834ff7bc64595c0a5..ffb329ac4fae8baf90f4cf8f050f474153b7ec3c 100755 (executable)
--- a/themes/courgette/_view.twig
+++ b/themes/courgette/_view.twig
@@ -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 %}
\ No newline at end of file
+{% endblock %}

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 81dde56f71b31a66c89f08931b4ec55cfbae8dab..277e383346a25678dbb44de0dd5b7f9bd2543388 100755 (executable)
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -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>

diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index 89c746ecaff047e4632810222013ca31b39a04b2..c29427e0a0cabe4e0c910b0bb04ab80f119b59e8 100755 (executable)
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -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">

diff --git a/themes/default/view.twig b/themes/default/view.twig
index b3507cef0869656cd1584478d30ea8721342a3cc..99e0e3c3662446af3e2b859a5a5bc44a0ffbf82b 100755 (executable)
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -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() {