25 files changed, 7 insertions, 16 deletions
diff --git a/debug_toolbar/media/debug_toolbar/css/toolbar.css b/debug_toolbar/static/debug_toolbar/css/toolbar.css
index 65e7c92..65e7c92 100644
--- a/debug_toolbar/media/debug_toolbar/css/toolbar.css
+++ b/debug_toolbar/static/debug_toolbar/css/toolbar.css
diff --git a/debug_toolbar/media/debug_toolbar/css/toolbar.min.css b/debug_toolbar/static/debug_toolbar/css/toolbar.min.css
index cdb92ba..cdb92ba 100644
--- a/debug_toolbar/media/debug_toolbar/css/toolbar.min.css
+++ b/debug_toolbar/static/debug_toolbar/css/toolbar.min.css
diff --git a/debug_toolbar/media/debug_toolbar/img/back.png b/debug_toolbar/static/debug_toolbar/img/back.png
index 6ac8a52..6ac8a52 100644
--- a/debug_toolbar/media/debug_toolbar/img/back.png
+++ b/debug_toolbar/static/debug_toolbar/img/back.png
diff --git a/debug_toolbar/media/debug_toolbar/img/back_hover.png b/debug_toolbar/static/debug_toolbar/img/back_hover.png
index 452b673..452b673 100644
--- a/debug_toolbar/media/debug_toolbar/img/back_hover.png
+++ b/debug_toolbar/static/debug_toolbar/img/back_hover.png
diff --git a/debug_toolbar/media/debug_toolbar/img/close.png b/debug_toolbar/static/debug_toolbar/img/close.png
index c0e8135..c0e8135 100644
--- a/debug_toolbar/media/debug_toolbar/img/close.png
+++ b/debug_toolbar/static/debug_toolbar/img/close.png
diff --git a/debug_toolbar/media/debug_toolbar/img/close_hover.png b/debug_toolbar/static/debug_toolbar/img/close_hover.png
index 5b2c812..5b2c812 100644
--- a/debug_toolbar/media/debug_toolbar/img/close_hover.png
+++ b/debug_toolbar/static/debug_toolbar/img/close_hover.png
diff --git a/debug_toolbar/media/debug_toolbar/img/djdt_vertical.png b/debug_toolbar/static/debug_toolbar/img/djdt_vertical.png
index 000c60f..000c60f 100644
--- a/debug_toolbar/media/debug_toolbar/img/djdt_vertical.png
+++ b/debug_toolbar/static/debug_toolbar/img/djdt_vertical.png
diff --git a/debug_toolbar/media/debug_toolbar/img/dot.gif b/debug_toolbar/static/debug_toolbar/img/dot.gif
index 9009f29..9009f29 100644
--- a/debug_toolbar/media/debug_toolbar/img/dot.gif
+++ b/debug_toolbar/static/debug_toolbar/img/dot.gif
diff --git a/debug_toolbar/media/debug_toolbar/img/indicator.png b/debug_toolbar/static/debug_toolbar/img/indicator.png
index 1a2c578..1a2c578 100644
--- a/debug_toolbar/media/debug_toolbar/img/indicator.png
+++ b/debug_toolbar/static/debug_toolbar/img/indicator.png
diff --git a/debug_toolbar/media/debug_toolbar/img/panel_bg.png b/debug_toolbar/static/debug_toolbar/img/panel_bg.png
index 73add17..73add17 100644
--- a/debug_toolbar/media/debug_toolbar/img/panel_bg.png
+++ b/debug_toolbar/static/debug_toolbar/img/panel_bg.png
diff --git a/debug_toolbar/media/debug_toolbar/js/jquery.cookie.js b/debug_toolbar/static/debug_toolbar/js/jquery.cookie.js
index 6df1fac..6df1fac 100644
--- a/debug_toolbar/media/debug_toolbar/js/jquery.cookie.js
+++ b/debug_toolbar/static/debug_toolbar/js/jquery.cookie.js
diff --git a/debug_toolbar/media/debug_toolbar/js/jquery.js b/debug_toolbar/static/debug_toolbar/js/jquery.js
index 74ce411..74ce411 100644
--- a/debug_toolbar/media/debug_toolbar/js/jquery.js
+++ b/debug_toolbar/static/debug_toolbar/js/jquery.js
diff --git a/debug_toolbar/media/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
index 6ec7218..6ec7218 100644
--- a/debug_toolbar/media/debug_toolbar/js/toolbar.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.js
diff --git a/debug_toolbar/media/debug_toolbar/js/toolbar.min.js b/debug_toolbar/static/debug_toolbar/js/toolbar.min.js
index 1a1ca35..1a1ca35 100644
--- a/debug_toolbar/media/debug_toolbar/js/toolbar.min.js
+++ b/debug_toolbar/static/debug_toolbar/js/toolbar.min.js
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index b6ec842..8e91f60 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,9 +1,9 @@
 {% load i18n %}
 <style type="text/css">
 @media print { #djDebug {display:none;}}
-{{ css }}
 </style>
-<script type="text/javascript">{{ js }}</script>
+<link rel="stylesheet" href="{{ STATIC_URL }}debug_toolbar/css/toolbar.min.css" type="text/css">
+<script type="text/javascript" src="{{ STATIC_URL }}debug_toolbar/css/toolbar.min.js"></script>
 <div id="djDebug" style="display:none;" dir="ltr">
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py
index 02a558d..ac42f3b 100644
--- a/debug_toolbar/toolbar/loader.py
+++ b/debug_toolbar/toolbar/loader.py
@@ -60,8 +60,6 @@ class DebugToolbar(object):
         context = self.template_context.copy()
         context.update({
             'panels': self.panels,
-            'js': mark_safe(open(os.path.join(media_path, 'js', 'toolbar.min.js'), 'r').read()),
-            'css': mark_safe(open(os.path.join(media_path, 'css', 'toolbar.min.css'), 'r').read()),
         })
 
         return render_to_string('debug_toolbar/base.html', context)
diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py
index 986b78e..1446d99 100644
--- a/debug_toolbar/urls.py
+++ b/debug_toolbar/urls.py
@@ -9,7 +9,6 @@ from django.conf.urls.defaults import *
 _PREFIX = '__debug__'
 
 urlpatterns = patterns('',
-    url(r'^%s/m/(.*)$' % _PREFIX, 'debug_toolbar.views.debug_media'),
     url(r'^%s/sql_select/$' % _PREFIX, 'debug_toolbar.views.sql_select', name='sql_select'),
     url(r'^%s/sql_explain/$' % _PREFIX, 'debug_toolbar.views.sql_explain', name='sql_explain'),
     url(r'^%s/sql_profile/$' % _PREFIX, 'debug_toolbar.views.sql_profile', name='sql_profile'),
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 3fa809a..be917ff 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -23,14 +23,6 @@ class InvalidSQLError(Exception):
         return repr(self.value)
 
 
-def debug_media(request, path):
-    root = getattr(settings, 'DEBUG_TOOLBAR_MEDIA_ROOT', None)
-    if root is None:
-        parent = os.path.abspath(os.path.dirname(__file__))
-        root = os.path.join(parent, 'media', 'debug_toolbar')
-    return django.views.static.serve(request, path, root)
-
-
 def sql_select(request):
     """
     Returns the output of the SQL SELECT statement.
diff --git a/example/settings.py b/example/settings.py
index c421a62..6fa3e56 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -17,6 +17,8 @@ INSTALLED_APPS = (
 INTERNAL_IPS = ('127.0.0.1',)
 MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
 MEDIA_URL = '/media'
+STATIC_ROOT = os.path.join(HOME_ROOT, 'staticfiles')
+STATIC_URL = '/static/'
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
diff --git a/example/media/js/jquery.js b/example/static/js/jquery.js
index fa5132b..fa5132b 100644
--- a/example/media/js/jquery.js
+++ b/example/static/js/jquery.js
diff --git a/example/media/js/mootools.js b/example/static/js/mootools.js
index 0098571..0098571 100644
--- a/example/media/js/mootools.js
+++ b/example/static/js/mootools.js
diff --git a/example/media/js/prototype.js b/example/static/js/prototype.js
index 9fe6e12..9fe6e12 100644
--- a/example/media/js/prototype.js
+++ b/example/static/js/prototype.js
diff --git a/example/templates/jquery/index.html b/example/templates/jquery/index.html
index 61b3cbe..9cab242 100644
--- a/example/templates/jquery/index.html
+++ b/example/templates/jquery/index.html
@@ -6,7 +6,7 @@
 	.hide {display:none;}
 	#v {font-weight:bold;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/jquery.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/jquery.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('p.hide').show();
diff --git a/example/templates/mootools/index.html b/example/templates/mootools/index.html
index fa12abe..dde019d 100644
--- a/example/templates/mootools/index.html
+++ b/example/templates/mootools/index.html
@@ -5,7 +5,7 @@
 	<style>
 	.hide {display:none;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/mootools.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/mootools.js"></script>
 	<script type="text/javascript">
 		window.addEvent('domready', function() {
 			$$('p.hide').setStyle('display', 'block');
diff --git a/example/templates/prototype/index.html b/example/templates/prototype/index.html
index bcc3141..bf3d0a5 100644
--- a/example/templates/prototype/index.html
+++ b/example/templates/prototype/index.html
@@ -5,7 +5,7 @@
 	<style>
 	.hide {display:none;}
 	</style>
-	<script type="text/javascript" charset="utf-8" src="{{ MEDIA_URL }}/js/prototype.js"></script>
+	<script type="text/javascript" charset="utf-8" src="{{ STATIC_URL }}/js/prototype.js"></script>
 	<script type="text/javascript">
 		document.observe('dom:loaded', function() {
 			$('showme').removeClassName('hide');