Merge commit 'rob/master'

12 files changed, 5 insertions, 7 deletions

diff --git a/README.rst b/README.rst
index 068fea2..1e56894 100644
--- a/README.rst
+++ b/README.rst
@@ -15,7 +15,6 @@ Currently, the following panels have been written and are working:
 - GET/POST/cookie/session variable display
 - Templates and context used, and their template paths
 - SQL queries including time to execute and links to EXPLAIN each query
-- Cache stats
 - Logging output via Python's built-in logging module
 
 If you have ideas for other panels please let us know.
@@ -73,7 +72,6 @@ The debug toolbar has two settings that can be set in `settings.py`:
 	    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
 	    'debug_toolbar.panels.template.TemplateDebugPanel',
 	    'debug_toolbar.panels.sql.SQLDebugPanel',
-	    'debug_toolbar.panels.cache.CacheDebugPanel',
 	    'debug_toolbar.panels.logger.LoggingPanel',
 	)
 
diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py
index 9603d9e..e2fa70b 100644
--- a/debug_toolbar/__init__.py
+++ b/debug_toolbar/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 0, 1)
+VERSION = (0, 7, 0)
 __version__ = '.'.join(map(str, VERSION))
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/toolbar/loader.py b/debug_toolbar/toolbar/loader.py
index 2422f3d..39fb4c6 100644
--- a/debug_toolbar/toolbar/loader.py
+++ b/debug_toolbar/toolbar/loader.py
@@ -20,7 +20,7 @@ class DebugToolbar(object):
             'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
             'debug_toolbar.panels.sql.SQLDebugPanel',
             'debug_toolbar.panels.template.TemplateDebugPanel',
-            'debug_toolbar.panels.cache.CacheDebugPanel',
+            #'debug_toolbar.panels.cache.CacheDebugPanel',
             'debug_toolbar.panels.logger.LoggingPanel',
         )
         self.load_panels()
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):
diff --git a/setup.py b/setup.py
index 1d3f939..073e5e6 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     author='Rob Hudson',
     author_email='rob@cogit8.org',
     url='http://rob.cogit8.org/blog/2008/Sep/19/introducing-django-debug-toolbar/',
-    #download_url='http://github.com/robhudson/django-debug-toolbar/tree/master',
+    download_url='http://github.com/robhudson/django-debug-toolbar/downloads',
     license='BSD',
     packages=find_packages(exclude=['ez_setup']),
     include_package_data=True,