diff options
| author | Aymeric Augustin | 2014-04-25 18:53:00 +0200 |
|---|---|---|
| committer | Aymeric Augustin | 2014-04-25 18:53:00 +0200 |
| commit | 727b4e05f59c15904f7b08388220b7bfc76d59b2 (patch) | |
| tree | f2333fac278510e5e68b5c47b1fa741c94693d63 /debug_toolbar/templates | |
| parent | 6ce52b2532afaccca9932b7087533609fd239a9b (diff) | |
| download | django-debug-toolbar-727b4e05f59c15904f7b08388220b7bfc76d59b2.tar.bz2 | |
Make the pain go away.
Fix #581, #544, #541, #535 and a few others.
Diffstat (limited to 'debug_toolbar/templates')
| -rw-r--r-- | debug_toolbar/templates/debug_toolbar/base.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 8ce7a0e..6bc017a 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -3,9 +3,12 @@ @media print { #djDebug {display:none;}} </style> <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" /> -<script>//<![CDATA[ -if(!window.jQuery) document.write('<scr'+'ipt src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></scr'+'ipt>'); -//]]></script> +{% if toolbar.config.JQUERY_URL %} +<script src="{{ toolbar.config.JQUERY_URL }}"></script> +<script>var djdt = {jQuery: jQuery.noConflict(true)};</script> +{% else %} +<script>var djdt = {jQuery: jQuery};</script> +{% endif %} <script src="{% static 'debug_toolbar/js/toolbar.js' %}"></script> <div id="djDebug" style="display:none;" dir="ltr" data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}" |