Merge branch 'master' into tax

2013-09-25 15:58:43 +02:00
parent 1ffcaa7dd4 1e571ffbc5
commit 24467edd29
10 changed files with 248 additions and 6 deletions
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -228,8 +228,16 @@
 	{* -- Javascript section ------------------------------------------------ *}

 	{block name="before-javascript-include"}{/block}
+    <script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>
+    <script>
+        if (typeof jQuery == 'undefined') {
+            {javascripts file='assets/js/libs/jquery.js'}
+            document.write(unescape("%3Cscript src='{$asset_url}' %3E%3C/script%3E"));
+            {/javascripts}
+        }
+    </script>
+

-	<script src="http://code.jquery.com/jquery-2.0.3.min.js"></script>

    {debugbar_renderjs}
    {debugbar_renderresult}