Merge branch 'master' into js_closure

Author: robhudson

debug_toolbar/media/debug_toolbar/toolbar.css

@@ -133,7 +133,6 @@
 	display:block;
 	font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
 	white-space:pre;
-	background-color:#ffffff;
 	overflow:auto;
 }
 
@@ -169,6 +168,11 @@
 	height:50px;
 }
 
+#djDebug .djDebugPanelTitle code {
+	display:inline;
+	font-size:inherit;
+}
+
 #djDebug .djDebugPanelContent {
 	position:absolute;
 	top:50px;
@@ -225,6 +229,10 @@
 	padding-right:.5em;
 }
 
+#djDebug .djTemplateHideContextDiv {
+	background-color:#fff;
+}
+
 /*
 #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover {
 	color:#111;

debug_toolbar/media/debug_toolbar/toolbar.min.css

@@ -146,14 +146,30 @@ def template_source(request):
     Return the source of a template, syntax-highlighted by Pygments if
     it's available.
     """
-    from django.template.loader import find_template_source
+    from django.template import TemplateDoesNotExist
     from django.utils.safestring import mark_safe
+    from django.conf import settings
 
     template_name = request.GET.get('template', None)
     if template_name is None:
         return HttpResponseBadRequest('"template" key is required')
 
-    source, origin = find_template_source(template_name)
+    try: # Django 1.2 ...
+        from django.template.loader import find_template_loader, make_origin
+        loaders = []
+        for loader_name in settings.TEMPLATE_LOADERS:
+            loader = find_template_loader(loader_name)
+            if loader is not None:
+                loaders.append(loader)
+        for loader in loaders:
+            try:
+                source, display_name = loader.load_template_source(template_name)
+                origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
+            except TemplateDoesNotExist:
+                source = "Template Does Not Exist: %s" % (template_name,)
+    except ImportError: # Django 1.1 ...
+        from django.template.loader import find_template_source
+        source, origin = find_template_source(template_name)
 
     try:
         from pygments import highlight

debug_toolbar/views.py

@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+    import settings # Assumed to be in the same directory.
+except ImportError:
+    import sys
+    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+    sys.exit(1)
+
+if __name__ == "__main__":
+    execute_manager(settings)