Merge branch 'release/v0.8.5'

Author: robhudson

NEWS

@@ -1,6 +1,28 @@
 News for django-debug-toolbar
 =============================
 
+0.8.5 (2011 Apr 25)
+-------------------
+
+* Ensure if we're overriding the urlconf that we're resetting handler404/500.
+
+* Updated middleware logic to avoid work if content-type isn't right.
+
+* Change .load() calls to GET to avoid CSRF protection.
+
+* Updated SQL panel to match Django's which now includes logging.
+
+* Added basic multi-db support.
+
+* Some HTML validation fixes.
+
+* Added support for `executemany`. Thanks to postal2600.
+
+* Added support for LogBook. Thanks to Vincent Driessen.
+
+* Added clean_params method to DatabaseStatTracker to scrub non-unicode
+  data for displaying on the sql panel. Thanks to Matthew J Morrison
+
 0.8.4 (2010 Nov 8)
 ------------------
 

README.rst

@@ -16,7 +16,7 @@ Currently, the following panels have been written and are working:
 - Templates and context used, and their template paths
 - SQL queries including time to execute and links to EXPLAIN each query
 - List of signals, their args and receivers
-- Logging output via Python's built-in logging module
+- Logging output via Python's built-in logging, or via the `logbook <http://logbook.pocoo.org>`_ module
 
 There is also one Django management command currently:
 

debug_toolbar/__init__.py

@@ -1,2 +1,2 @@
-VERSION = (0, 8, 4)
+VERSION = (0, 8, 5)
 __version__ = '.'.join(map(str, VERSION))

debug_toolbar/media/debug_toolbar/css/toolbar.css

@@ -394,3 +394,9 @@
 #djDebug .highlight .nv { color:#333 } /* Name.Variable */
 #djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */
 #djDebug .highlight .cp { color:#333 } /* Comment.Preproc */
+
+@media print {
+    #djDebug {
+        display: none;
+    }
+}

debug_toolbar/media/debug_toolbar/css/toolbar.min.css

@@ -44,7 +44,11 @@
 				return false;
 			});
 			$('#djDebug a.remoteCall').click(function() {
-				$('#djDebugWindow').load(this.href, {}, function() {
+				$('#djDebugWindow').load(this.href, function(response, status, xhr) {
+					if (status == "error") {
+						var message = '<div class="djDebugPanelTitle"><a class="djDebugClose djDebugBack" href="">Back</a><h3>'+xhr.status+': '+xhr.statusText+'</h3></div>';
+						$('#djDebugWindow').html(message);
+					}
 					$('#djDebugWindow a.djDebugBack').click(function() {
 						$(this).parent().parent().hide();
 						return false;