aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Hudson2009-04-02 08:32:55 -0700
committerRob Hudson2009-04-02 08:32:55 -0700
commit1228a99da10a71c97b82c240350ee8b00c0c2d0c (patch)
treef6fe1a1f0071dc241ec5727ad71bec71fd6f1d6a
parentb9b0cbe718c6a1736af1fa86452ffc4af28b64f4 (diff)
downloaddjango-debug-toolbar-1228a99da10a71c97b82c240350ee8b00c0c2d0c.tar.bz2
Moving media so they are "namespaced" like templates.
-rw-r--r--debug_toolbar/media/debug_toolbar/Makefile (renamed from debug_toolbar/media/Makefile)0
-rw-r--r--debug_toolbar/media/debug_toolbar/jquery.cookie.js (renamed from debug_toolbar/media/jquery.cookie.js)0
-rw-r--r--debug_toolbar/media/debug_toolbar/jquery.js (renamed from debug_toolbar/media/jquery.js)0
-rw-r--r--debug_toolbar/media/debug_toolbar/toolbar.css (renamed from debug_toolbar/media/toolbar.css)0
-rw-r--r--debug_toolbar/media/debug_toolbar/toolbar.js (renamed from debug_toolbar/media/toolbar.js)0
-rw-r--r--debug_toolbar/media/debug_toolbar/toolbar.min.css (renamed from debug_toolbar/media/toolbar.min.css)0
-rw-r--r--debug_toolbar/media/debug_toolbar/toolbar.min.js (renamed from debug_toolbar/media/toolbar.min.js)0
-rw-r--r--debug_toolbar/views.py4
8 files changed, 2 insertions, 2 deletions
diff --git a/debug_toolbar/media/Makefile b/debug_toolbar/media/debug_toolbar/Makefile
index a2d6abb..a2d6abb 100644
--- a/debug_toolbar/media/Makefile
+++ b/debug_toolbar/media/debug_toolbar/Makefile
diff --git a/debug_toolbar/media/jquery.cookie.js b/debug_toolbar/media/debug_toolbar/jquery.cookie.js
index 6df1fac..6df1fac 100644
--- a/debug_toolbar/media/jquery.cookie.js
+++ b/debug_toolbar/media/debug_toolbar/jquery.cookie.js
diff --git a/debug_toolbar/media/jquery.js b/debug_toolbar/media/debug_toolbar/jquery.js
index 82b98e1..82b98e1 100644
--- a/debug_toolbar/media/jquery.js
+++ b/debug_toolbar/media/debug_toolbar/jquery.js
diff --git a/debug_toolbar/media/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index 9ef6dc3..9ef6dc3 100644
--- a/debug_toolbar/media/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
diff --git a/debug_toolbar/media/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js
index 40e1a58..40e1a58 100644
--- a/debug_toolbar/media/toolbar.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.js
diff --git a/debug_toolbar/media/toolbar.min.css b/debug_toolbar/media/debug_toolbar/toolbar.min.css
index c172fbd..c172fbd 100644
--- a/debug_toolbar/media/toolbar.min.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.min.css
diff --git a/debug_toolbar/media/toolbar.min.js b/debug_toolbar/media/debug_toolbar/toolbar.min.js
index 7f8658f..7f8658f 100644
--- a/debug_toolbar/media/toolbar.min.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.min.js
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 0fb4168..9123a00 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -18,12 +18,12 @@ class InvalidSQLError(Exception):
self.value = value
def __str__(self):
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')
+ root = os.path.join(parent, 'media', 'debug_toolbar')
return django.views.static.serve(request, path, root)
def sql_select(request):