merging in changes from ui-rf and fixing conflicts in templates

19 files changed, 738 insertions, 555 deletions

diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po
index 5bd3db8..66a9d72 100644
--- a/debug_toolbar/locale/es/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 13:27-0700\n"
+"POT-Creation-Date: 2009-08-21 15:26-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,6 +75,15 @@ msgstr ""
 msgid "Breakdown"
 msgstr ""
 
+#: templates/debug_toolbar/panels/cache.html:39
+#: templates/debug_toolbar/panels/logger.html:8
+#: templates/debug_toolbar/panels/sql.html:6
+#: templates/debug_toolbar/panels/sql_explain.html:7
+#: templates/debug_toolbar/panels/sql_profile.html:7
+#: templates/debug_toolbar/panels/sql_select.html:7
+msgid "Time"
+msgstr "Tiempo"
+
 #: templates/debug_toolbar/panels/cache.html:40
 msgid "Type"
 msgstr "Tipo"
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.mo b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..e94f840
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po
new file mode 100644
index 0000000..d97b08e
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po
@@ -0,0 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-24 22:59-0500\n"
+"PO-Revision-Date: 2009-08-24 23:08-0600\n"
+"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/debug_toolbar/base.html:24
+msgid "Hide"
+msgstr "הסתיר"
+
+#: templates/debug_toolbar/base.html:55
+msgid "Close"
+msgstr "סגור"
+
+#: templates/debug_toolbar/panels/cache.html:14
+msgid "Total Calls"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:16
+msgid "Total Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:18
+msgid "Hits"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:20
+msgid "Misses"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:35
+msgid "Breakdown"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:39
+#: templates/debug_toolbar/panels/logger.html:8
+#: templates/debug_toolbar/panels/sql.html:6
+#: templates/debug_toolbar/panels/sql_explain.html:10
+#: templates/debug_toolbar/panels/sql_profile.html:10
+#: templates/debug_toolbar/panels/sql_select.html:10
+msgid "Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:40
+msgid "Type"
+msgstr "סוג"
+
+#: templates/debug_toolbar/panels/cache.html:41
+msgid "Parameters"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:42
+msgid "Function"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:6
+msgid "Key"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:7
+#: templates/debug_toolbar/panels/request_vars.html:13
+#: templates/debug_toolbar/panels/request_vars.html:41
+#: templates/debug_toolbar/panels/request_vars.html:65
+#: templates/debug_toolbar/panels/request_vars.html:89
+#: templates/debug_toolbar/panels/settings_vars.html:7
+#: templates/debug_toolbar/panels/timer.html:11
+msgid "Value"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:7
+msgid "Level"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:9
+msgid "Message"
+msgstr "הודעה"
+
+#: templates/debug_toolbar/panels/logger.html:10
+msgid "Location"
+msgstr "מקום"
+
+#: templates/debug_toolbar/panels/logger.html:25
+msgid "No messages logged"
+msgstr "אין הודעות"
+
+#: templates/debug_toolbar/panels/request_vars.html:12
+#: templates/debug_toolbar/panels/request_vars.html:40
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:88
+msgid "Variable"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:26
+msgid "No COOKIE data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:54
+msgid "No SESSION data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:78
+msgid "No GET data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:102
+msgid "No POST data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/settings_vars.html:6
+msgid "Setting"
+msgstr ""
+
+#: templates/debug_toolbar/panels/signals.html:6
+msgid "Signal"
+msgstr "סימן"
+
+#: templates/debug_toolbar/panels/sql.html:7
+msgid "Action"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql.html:31
+msgid "Line"
+msgstr "שורה"
+
+#: templates/debug_toolbar/panels/sql.html:32
+msgid "Method"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql.html:33
+msgid "File"
+msgstr "קובץ"
+
+#: templates/debug_toolbar/panels/sql_explain.html:3
+#: templates/debug_toolbar/panels/sql_profile.html:3
+#: templates/debug_toolbar/panels/sql_select.html:3
+#: templates/debug_toolbar/panels/template_source.html:3
+msgid "Back"
+msgstr "חזרה"
+
+#: templates/debug_toolbar/panels/sql_explain.html:8
+#: templates/debug_toolbar/panels/sql_profile.html:8
+#: templates/debug_toolbar/panels/sql_select.html:8
+msgid "Executed SQL"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql_select.html:33
+msgid "Empty set"
+msgstr ""
+
+#: templates/debug_toolbar/panels/templates.html:15
+msgid "Template"
+msgstr ""
+
+#: templates/debug_toolbar/panels/timer.html:10
+msgid "Resource"
+msgstr ""
+
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index 6156fb7..9da3f32 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
@@ -15,20 +15,21 @@
 #djDebug legend{color:#000;}
 #djDebug input,#djDebug button,#djDebug textarea,#djDebug select,#djDebug optgroup,#djDebug option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}
 #djDebug input,#djDebug button,#djDebug textarea,#djDebug select{*font-size:100%;}
+
 #djDebug * {
-	color: #000;
-	float: none;
-	margin: 0;
-	padding: 0;
-	position: static;
-	text-align: left;
+	color:#000;
+	float:none;
+	margin:0;
+	padding:0;
+	position:static;
+	text-align:left;
 	font-family:sans-serif;
 }
 
 #djDebugToolbar {
-	background: #111;
-	width: 200px;
-	z-index: 100000000;
+	background:#111;
+	width:200px;
+	z-index:100000000;
 	position:absolute;
 	top:0;
 	bottom:0;
@@ -40,278 +41,269 @@
 	color:#999;
 }
 
-#djDebugToolbarHandle {
-	position:absolute;
-	background: #111;
-	top:0;
-	right:0;
-	height: 25px;
-	width: 25px;
-	z-index: 100000000;
-}
-
-#djDebugToolbarHandle ul li {
-	list-style-type:none;
-	padding: 0;
-}
-
-#djDebugToolbarHandle ul li a {
-	display: block;
-	width: 100%;
-	font-size: 16px;
-	line-height: 25px;
-	font-weight: bold;
-	text-decoration: none;
-	color: #daf7ff;
-	text-align: center;
-}
-
-#djDebugToolbarHandle ul li a:hover {
-	color: #111;
-	background-color: #9fbb54;
-}
-
 #djDebugToolbar ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
+	margin:0;
+	padding:0;
+	list-style:none;
 }
 
 #djDebugToolbar li {
-	border-bottom: 1px solid #222;
-	color: #fff;
-	display: block;
-	font-weight: bold;
-	float: none;
-	margin: 0;
-	padding: 0;
-	position: relative;
-	width: auto;
+	border-bottom:1px solid #222;
+	color:#fff;
+	display:block;
+	font-weight:bold;
+	float:none;
+	margin:0;
+	padding:0;
+	position:relative;
+	width:auto;
 }
 
 #djDebugToolbar li>a,
 #djDebugToolbar li>div.contentless  {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: small-caps;
-	text-decoration: none;
-	display: block;
-	font-size: 16px;
-	padding: 10px 10px 5px 25px;
-	color: #fff;
+	font-weight:normal;
+	font-style:normal;
+	font-variant:small-caps;
+	text-decoration:none;
+	display:block;
+	font-size:16px;
+	padding:10px 10px 5px 25px;
+	color:#fff;
 }
 
 #djDebugToolbar li a:hover {
-	color: #111;
-	background-color: #c6d6da;
-	border-right: 10px solid #fff;
+	color:#111;
+	background-color:#c6d6da;
+	border-right:10px solid #fff;
 }
 
 #djDebugToolbar li.active {
-	background-image: url(indicator.png);
-	background-repeat: no-repeat;
-	background-position: left center;
+	background-image:url(indicator.png);
+	background-repeat:no-repeat;
+	background-position:left center;
 }
 
 #djDebugToolbar li.active a:hover {
-	background-color: #111;
-	background-image: inherit;
-	background-position: inherit;
-	background-repeat: inherit;
-	color: #b36a60;
-	border: none;
+	background-color:#111;
+	background-image:inherit;
+	background-position:inherit;
+	background-repeat:inherit;
+	color:#b36a60;
+	border:none;
 }
 
 #djDebugToolbar li small {
-	font-size: 12px;
-	color: #999;
-	font-style: italic;
-	text-decoration: none;
-	font-variant: normal;
+	font-size:12px;
+	color:#999;
+	font-style:italic;
+	text-decoration:none;
+	font-variant:normal;
 }
 
-#djDebugToolbar #djDebugButton {
-	color: #92ef3f;
+#djDebugToolbarHandle {
+	position:absolute;
+	background:#111;
+	top:0;
+	bottom:0;
+	right:0;
+	z-index:100000000;
 }
 
-#djDebug pre {
-	background-color: #ffffff;
+#djDebug a#djShowToolBarButton {
+	display:block;
+	height:100%;
+	padding:2px;
+	color:#fff;
+	font-size:10px;
+	font-weight:bold;
+	text-decoration:none;
+	text-align:center;
 }
 
-#djDebug tr.djDebugOdd pre {
-	background-color: #eeeeee;
+#djDebug a#djShowToolBarButton:hover {
+	background-color:#f00;
 }
 
-#djDebug .panelContent {
-	
-	display: none;
-	position: absolute;
-	margin: 0;
-	padding: 10px 20px;
-	top: 2px;
-	right: 200px;
-	bottom: 2px;
-	left: 2px;
-	color: #111;
-	z-index: 1000000;
-	/*overflow: auto;*/
-	border-left: 10px solid #c6d6da;
-	border-top: 10px solid #c6d6da;
-	border-bottom: 10px solid #c6d6da;
-	opacity: 1.0;
-	background: transparent url(panel_bg.png) repeat left top;
+#djDebug pre {
+	background-color:#ffffff;
 }
 
-#djDebug .panelContent .panelScrollWrap {
-	overflow: auto;
-	height: 90%;
-	width: 100%;
+#djDebug tr.djDebugOdd pre {
+	background-color:#eeeeee;
 }
 
-#djDebug .panelContent .panelScrollContent {
-	width: auto;
-	margin-right: 10px;
+#djDebug .panelContent {
+	display:none;
+	position:absolute;
+	margin:0;
+	top:0;
+	right:200px;
+	bottom:0;
+	left:0;
+	background-color:#f6f6f6;
+	color:#666;
+	z-index:1000000;
+	overflow:auto;
 }
 
-#djDebug .panelContent .boxed {
-	background-color: #fff;
-	padding: 5px;
-	border: 1px solid #c6d6da;
+#djDebug .panelContent > div {
+	border-bottom:1px solid #ddd;
+	padding:10px 20px;
 }
 
-#djDebug .panelContent p a, #djDebug .panelContent dt a {
-	color: #000;
-	padding: 2px 4px;
+.djDebugPanelTitle {
+	background-color:#ffc;
+	color:#666;
 }
-#djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover {
-	background-color: #ffc;
+#djDebug h3 {
+	font-size:24px;
+	font-weight:bold;
+	font-variant:small-caps;
 }
 
-#djDebug .panelContent p a, #djDebug .panelContent dd a {
-	color: #000;
-	background-color: #eee;
-	padding: 2px 4px;
-}
-#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover {
-	color: #111;
-	background-color: #ffc;
+#djDebug h4 {
+	font-size:20px;
+	font-weight:bold;
 }
 
-#djDebug .panelContent h3 {
-	font-size: 24px;
-	font-variant: small-caps;
+#djDebug .panelContent {
+	background-color:#eee;
+	color:#000;
 }
 
-#djDebug .panelContent h4 {
-	font-weight: normal;
-	margin-top: 0.5em;
-	font-size: 20px;
-	line-height: 24px;
+#djDebug .panelContent table {
+	border:1px solid #ccc;
+	border-collapse:collapse;
+	width:100%;
+	background-color:#fff;
+}
+#djDebug .panelContent tbody td,
+#djDebug .panelContent tbody th {
+	vertical-align:top;
+	padding:2px 3px;
+}
+#djDebug .panelContent thead th {
+	padding:1px 6px 1px 3px;
+	background:#fefefe;
+	text-align:left;
+	font-weight:normal;
+	font-size:11px;
+	border:1px solid #ddd;
+}
+#djDebug .panelContent tbody th {
+	width:12em;
+	text-align:right;
+	color:#666;
+	padding-right:.5em;
 }
 
 #djDebug .panelContent code {
-	font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
-	font-size: inherit;
+	font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
+	font-size:12px;
+}
+/*
+#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover {
+	color:#111;
+	background-color:#ffc;
 }
 
 #djDebug .panelContent p {
-	padding: 0 5px;
+	padding:0 5px;
 }
 
 #djDebug .panelContent p, #djDebug .panelContent table, #djDebug .panelContent ol, #djDebug .panelContent ul, #djDebug .panelContent dl {
-	margin: 5px 0 15px;
-	background-color: #fff;
+	margin:5px 0 15px;
+	background-color:#fff;
 }
-
 #djDebug .panelContent table {
-	/*width: 90%;*/
-	clear: both;
-	border: 0;
-	padding: 0;
-	margin: 0;
-	border-collapse: collapse;
-	border-spacing: 0;
+	clear:both;
+	border:0;
+	padding:0;
+	margin:0;
+	border-collapse:collapse;
+	border-spacing:0;
 }
 
 #djDebug .panelContent table a {
-	color: #000;
-	padding: 2px 4px;
+	color:#000;
+	padding:2px 4px;
 }
 #djDebug .panelContent table a:hover {
-	background-color: #ffc;
+	background-color:#ffc;
 }
 
 #djDebug .panelContent table th {
-	background-color: #333;
-	font-weight: bold;
-	color: #fff;
-	padding: 3px 7px 3px;
-	text-align: left;
-	cursor: pointer;
+	background-color:#333;
+	font-weight:bold;
+	color:#fff;
+	padding:3px 7px 3px;
+	text-align:left;
+	cursor:pointer;
 }
 #djDebug .panelContent table td {
-	padding: 5px 10px;
-	font-size: 14px;
-	background: #fff;
-	color: #000;
-	vertical-align: top;
-	border: 0;
+	padding:5px 10px;
+	font-size:14px;
+	background:#fff;
+	color:#000;
+	vertical-align:top;
+	border:0;
 }
 #djDebug .panelContent table tr.djDebugOdd td {
-  background: #eee;
+  background:#eee;
 }
+*/
 
 #djDebug .panelContent .close {
-	text-indent: -9999999px;
-	display: block;
-	position: absolute;
-	top: 0;
-	right: 10px;
-	height: 40px;
-	width: 40px;
-	background: url(close.png) no-repeat center center;
+	text-indent:-9999999px;
+	display:block;
+	position:absolute;
+	top:0;
+	right:10px;
+	height:40px;
+	width:40px;
+	background:url(close.png) no-repeat center center;
 }
 
 #djDebug .panelContent .close:hover {
-	background-image: url(close_hover.png);
+	background-image:url(close_hover.png);
 }
 
 #djDebug .panelContent .close.back {
-	background-image: url(back.png);
+	background-image:url(back.png);
 }
 
 #djDebug .panelContent .close.back:hover  {
-	background-image: url(back_hover.png);
+	background-image:url(back_hover.png);
 }
 
 #djDebug .panelContent dt, #djDebug .panelContent dd {
-	display: block;
+	display:block;
 }
 
 #djDebug .panelContent dt {
-	margin-top: 0.75em;
+	margin-top:0.75em;
 }
 
 #djDebug .panelContent dd {
-	margin-left: 10px;
-}
-
-#djDebug .highlight  { color: #000; }
-#djDebug .highlight .err { color: #000; } /* Error */
-#djDebug .highlight .g { color: #000; } /* Generic */
-#djDebug .highlight .k { color: #000; font-weight: bold } /* Keyword */
-#djDebug .highlight .o { color: #000; } /* Operator */
-#djDebug .highlight .n { color: #000; } /* Name */
-#djDebug .highlight .mi { color: #000; font-weight: bold } /* Literal.Number.Integer */
-#djDebug .highlight .l { color: #000; } /* Literal */
-#djDebug .highlight .x { color: #000; } /* Other */
-#djDebug .highlight .p { color: #000; } /* Punctuation */
-#djDebug .highlight .m { color: #000; font-weight: bold } /* Literal.Number */
-#djDebug .highlight .s { color: #333 } /* Literal.String */
-#djDebug .highlight .w { color: #888888 } /* Text.Whitespace */
-#djDebug .highlight .il { color: #000; font-weight: bold } /* Literal.Number.Integer.Long */
-#djDebug .highlight .na { color: #333 } /* Name.Attribute */
-#djDebug .highlight .nt { color: #000; font-weight: bold } /* Name.Tag */
-#djDebug .highlight .nv { color: #333 } /* Name.Variable */
-#djDebug .highlight .s2 { color: #333 } /* Literal.String.Double */
-#djDebug .highlight .cp { color: #333 } /* Comment.Preproc */
+	margin-left:10px;
+}
+
+#djDebug .highlight  { color:#000; }
+#djDebug .highlight .err { color:#000; } /* Error */
+#djDebug .highlight .g { color:#000; } /* Generic */
+#djDebug .highlight .k { color:#000; font-weight: bold } /* Keyword */
+#djDebug .highlight .o { color:#000; } /* Operator */
+#djDebug .highlight .n { color:#000; } /* Name */
+#djDebug .highlight .mi { color:#000; font-weight: bold } /* Literal.Number.Integer */
+#djDebug .highlight .l { color:#000; } /* Literal */
+#djDebug .highlight .x { color:#000; } /* Other */
+#djDebug .highlight .p { color:#000; } /* Punctuation */
+#djDebug .highlight .m { color:#000; font-weight: bold } /* Literal.Number */
+#djDebug .highlight .s { color:#333 } /* Literal.String */
+#djDebug .highlight .w { color:#888888 } /* Text.Whitespace */
+#djDebug .highlight .il { color:#000; font-weight: bold } /* Literal.Number.Integer.Long */
+#djDebug .highlight .na { color:#333 } /* Name.Attribute */
+#djDebug .highlight .nt { color:#000; font-weight: bold } /* Name.Tag */
+#djDebug .highlight .nv { color:#333 } /* Name.Variable */
+#djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */
+#djDebug .highlight .cp { color:#333 } /* Comment.Preproc */
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js
index 355a66f..b20a487 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.js
@@ -31,7 +31,7 @@ jQuery(function($j) {
 			$j('#djDebug a.remoteCall').click(function() {
 				$j('#djDebugWindow').load(this.href, {}, function() {
 					$j('#djDebugWindow a.back').click(function() {
-						$j(this).parent().hide();
+						$j(this).parent().parent().hide();
 						return false;
 					});
 				});
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 830bceb..b80daef 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -18,7 +18,7 @@
 	@import url({{ BASE_URL }}/__debug__/m/toolbar.css);
 </style>
 <div id="djDebug">
-	<div style="display: none;" id="djDebugToolbar">
+	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
 			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">{% trans "Hide" %} &raquo;</a></li>
@@ -45,21 +45,19 @@
 			{% endfor %}
 		</ul>
 	</div>
-	<div style="display: none;" id="djDebugToolbarHandle">
-		<ul id="djDebugPanelList">
-			<li><a title="Show Toolbar" id="djShowToolBarButton" href="#">&laquo;</a></li>
-		</ul>
+	<div style="display:none;" id="djDebugToolbarHandle">
+		<a title="Show Toolbar" id="djShowToolBarButton" href="#">&laquo;</a>
 	</div>
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
-				<a href="" class="close">{% trans "Close" %}</a>
-			    <h3>{{ panel.title|safe }}</h3>
-			    <div class="panelScrollWrap">
-			        <div class="panelScrollContent">
-			            {{ panel.content|safe }}
-			        </div>
-			    </div>
+				<div class="djDebugPanelTitle">
+					<a href="" class="close">{% trans "Close" %}</a>
+					<h3>{{ panel.title|safe }}</h3>
+				</div>
+				<div class="djDebugPanelContent">
+					{{ panel.content|safe }}
+				</div>
 			</div>
 		{% endif %}
 	{% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index ef153bf..3aafb3e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,19 +1,19 @@
 {% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>{% trans "Key" %}</th>
-    			<th>{% trans "Value" %}</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for key, value in headers.iteritems %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ key|escape }}</td>
-    				<td>{{ value|escape }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for key, value in headers.iteritems %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ key|escape }}</td>
+					<td>{{ value|escape }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 080f955..736c676 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,27 +1,27 @@
 {% load i18n %}
 <div class="boxed">
-    {% if records %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>{% trans "Level" %}</th>
-    				<th>{% trans "Time" %}</th>
-    				<th>{% trans "Message" %}</th>
-    				<th>{% trans "Location" %}</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for record in records %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ record.level }}</td>
-    					<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
-    					<td>{{ record.message }}</td>
-    					<td>{{ record.file }}:{{ record.line }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>{% trans "No messages logged" %}.</p>
-    {% endif %}
+	{% if records %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Level" %}</th>
+					<th>{% trans "Time" %}</th>
+					<th>{% trans "Message" %}</th>
+					<th>{% trans "Location" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for record in records %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ record.level }}</td>
+						<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
+						<td>{{ record.message }}</td>
+						<td>{{ record.file }}:{{ record.line }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No messages logged" %}.</p>
+	{% endif %}
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index c2797dc..7f5e33f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,104 +1,104 @@
 {% load i18n %}
 <h4>COOKIES Variables</h4>
 <div class="boxed">
-    {% if cookies %}
-    	<table>
-    		<colgroup>
-    			<col style="width:20%"/>
-    			<col/>
-    		</colgroup>
-    		<thead>
-    			<tr>
-    				<th>{% trans "Variable" %}</th>
-    				<th>{% trans "Value" %}</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in cookies %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>{% trans "None" %}</p>
-    {% endif %}
+	{% if cookies %}
+		<table>
+			<colgroup>
+				<col style="width:20%"/>
+				<col/>
+			</colgroup>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in cookies %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No COOKIE data" %}</p>
+	{% endif %}
 </div>
 
 <h4>SESSION Variables</h4>
 <div class="boxed">
-    {% if session %}
-    	<table>
-    		<colgroup>
-    			<col style="width:20%"/>
-    			<col/>
-    		</colgroup>
-    		<thead>
-    			<tr>
-    				<th>{% trans "Variable" %}</th>
-    				<th>{% trans "Value" %}</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in session %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>{% trans "No SESSION data" %}</p>
-    {% endif %}
+	{% if session %}
+		<table>
+			<colgroup>
+				<col style="width:20%"/>
+				<col/>
+			</colgroup>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in session %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No SESSION data" %}</p>
+	{% endif %}
 </div>
 
 <h4>GET Variables</h4>
 <div class="boxed">
-    {% if get %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>{% trans "Variable" %}</th>
-    				<th>{% trans "Value" %}</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in get %}
-    				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|join:", "|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>{% trans "No GET data" %}</p>
-    {% endif %}
+	{% if get %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in get %}
+					<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|join:", "|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No GET data" %}</p>
+	{% endif %}
 </div>
 
 <h4>POST Variables</h4>
 <div class="boxed">
-    {% if post %}
-    	<table>
-    		<thead>
-    			<tr>
-    				<th>{% trans "Variable" %}</th>
-    				<th>{% trans "Value" %}</th>
-    			</tr>
-    		</thead>
-    		<tbody>
-    			{% for key, value in post %}
-    				<tr class="{% cycle 'row1' 'row2' %}">
-    					<td>{{ key|escape }}</td>
-    					<td>{{ value|join:", "|escape }}</td>
-    				</tr>
-    			{% endfor %}
-    		</tbody>
-    	</table>
-    {% else %}
-    	<p>{% trans "No POST data" %}</p>
-    {% endif %}
-</div>
+	{% if post %}
+		<table>
+			<thead>
+				<tr>
+					<th>{% trans "Variable" %}</th>
+					<th>{% trans "Value" %}</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for key, value in post %}
+					<tr class="{% cycle 'row1' 'row2' %}">
+						<td>{{ key|escape }}</td>
+						<td>{{ value|join:", "|escape }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	{% else %}
+		<p>{% trans "No POST data" %}</p>
+	{% endif %}
+</div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1b9d452..6d9cf2a 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,19 +1,19 @@
 {% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>{% trans "Setting" %}</th>
-    			<th>{% trans "Value" %}</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for var in settings.items|dictsort:"0" %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ var.0 }}</td>
-    				<td><code>{{ var.1|pprint }}</code></td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Setting" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for var in settings.items|dictsort:"0" %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ var.0 }}</td>
+					<td><code>{{ var.1|pprint }}</code></td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index fccf7ff..2b95d52 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,21 +1,21 @@
 {% load i18n %}
 <div class="boxed">
-    <table>
-        <thead>
-            <tr>
-                <th>{% trans "Signal" %}</th>
-                <th>Providing Args</th>
-                <th>Receivers</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for name, signal, receivers in signals %}
-                <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-                    <td>{{ name|escape }}</td>
-                    <td>{{ signal.providing_args|join:", " }}</td>
-                    <td>{{ receivers|join:", " }}</td>
-                </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Signal" %}</th>
+				<th>Providing Args</th>
+				<th>Receivers</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for name, signal, receivers in signals %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ name|escape }}</td>
+					<td>{{ signal.providing_args|join:", " }}</td>
+					<td>{{ receivers|join:", " }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index cac2e47..8d1fefc 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,51 +1,51 @@
 {% load i18n %}
 <div class="boxed">
-    <table>
-    	<thead>
-    		<tr>
-    			<th>{% trans "Time" %}&nbsp;(ms)</th>
-    			<th>{% trans "Action" %}</th>
-    			<th>Stacktrace</th>
-    			<th>Query</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for query in queries %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ query.time|floatformat:"2" }}</td>
-    				<td>
-    				{% if query.params %}
-    					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
-    					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
-    					{% if is_mysql %}
-    						<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
-    					{% endif %}
-    				{% endif %}
-    				</td>
-    				<td>
-    					{% if query.stacktrace %}
-    					<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
-    					<div class="djSQLHideStacktraceDiv" style="display:none;">
-    						<table>
-    							<tr>
-    								<th>{% trans "Line" %}</th>
-    								<th>{% trans "Method" %}</th>
-    								<th>{% trans "File" %}</th>
-    							</tr>
-    							{% for file, line, method in query.stacktrace %}
-    								<tr>
-    									<td>{{ line }}</td>
-    									<td><pre>{{ method|escape }}<pre></td>
-    									<td><pre>{{ file|escape }}</pre></td>
-    								</tr>
-    							{% endfor %}
-    						</table>
-    					</div>
-    					{% endif %}
-    				</td>
-    				<td class="syntax">{{ query.sql|safe }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<thead>
+			<tr>
+				<th>{% trans "Time" %}&nbsp;(ms)</th>
+				<th>{% trans "Action" %}</th>
+				<th>Stacktrace</th>
+				<th>Query</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for query in queries %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ query.time|floatformat:"2" }}</td>
+					<td>
+					{% if query.params %}
+						<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
+						<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
+						{% if is_mysql %}
+							<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
+						{% endif %}
+					{% endif %}
+					</td>
+					<td>
+						{% if query.stacktrace %}
+						<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
+						<div class="djSQLHideStacktraceDiv" style="display:none;">
+							<table>
+								<tr>
+									<th>{% trans "Line" %}</th>
+									<th>{% trans "Method" %}</th>
+									<th>{% trans "File" %}</th>
+								</tr>
+								{% for file, line, method in query.stacktrace %}
+									<tr>
+										<td>{{ line }}</td>
+										<td><pre>{{ method|escape }}<pre></td>
+										<td><pre>{{ file|escape }}</pre></td>
+									</tr>
+								{% endfor %}
+							</table>
+						</div>
+						{% endif %}
+					</td>
+					<td class="syntax">{{ query.sql|safe }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index 64076e7..38249b3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,27 +1,31 @@
 {% load i18n %}
-<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
-<h3>SQL Explained</h3>
-<dl>
-	<dt>{% trans "Executed SQL" %}</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>{% trans "Time" %}</dt>
-	<dd>{{ time }} ms</dd>
-</dl>
-<table>
-	<thead>
-		<tr>
-			{% for h in headers %}
-				<th>{{ h|upper }}</th>
-			{% endfor %}
-		</tr>
-	</thead>
-	<tbody>
-		{% for row in result %}
-			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-				{% for column in row %}
-					<td>{{ column|escape }}</td>
+<div class="djDebugPanelTitle">
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<h3>SQL Explained</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>{% trans "Executed SQL" %}</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>{% trans "Time" %}</dt>
+		<dd>{{ time }} ms</dd>
+	</dl>
+	<table>
+		<thead>
+			<tr>
+				{% for h in headers %}
+					<th>{{ h|upper }}</th>
 				{% endfor %}
 			</tr>
-		{% endfor %}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+			{% for row in result %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					{% for column in row %}
+						<td>{{ column|escape }}</td>
+					{% endfor %}
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index f53dcc0..7df65da 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,27 +1,31 @@
 {% load i18n %}
-<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
-<h3>SQL Profiled</h3>
-<dl>
-	<dt>{% trans "Executed SQL" %}</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>{% trans "Time" %}</dt>
-	<dd>{{ time }} ms</dd>
-</dl>
-<table>
-	<thead>
-		<tr>
-			{% for h in headers %}
-				<th>{{ h|upper }}</th>
-			{% endfor %}
-		</tr>
-	</thead>
-	<tbody>
-		{% for row in result %}
-			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-				{% for column in row %}
-					<td>{{ column|escape }}</td>
+<div class="djDebugPanelTitle">
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<h3>SQL Profiled</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>{% trans "Executed SQL" %}</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>{% trans "Time" %}</dt>
+		<dd>{{ time }} ms</dd>
+	</dl>
+	<table>
+		<thead>
+			<tr>
+				{% for h in headers %}
+					<th>{{ h|upper }}</th>
 				{% endfor %}
 			</tr>
-		{% endfor %}
-	</tbody>
-</table>
+		</thead>
+		<tbody>
+			{% for row in result %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					{% for column in row %}
+						<td>{{ column|escape }}</td>
+					{% endfor %}
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 1438050..e4d6027 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,31 +1,35 @@
 {% load i18n %}
-<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
-<h3>SQL Selected</h3>
-<dl>
-	<dt>{% trans "Executed SQL" %}</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>{% trans "Time" %}</dt>
-	<dd>{{ time }} ms</dd>
-</dl>
-{% if result %}
-<table>
-	<thead>
-		<tr>
-			{% for h in headers %}
-				<th>{{ h|upper }}</th>
-			{% endfor %}
-		</tr>
-	</thead>
-	<tbody>
-		{% for row in result %}
-			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-				{% for column in row %}
-					<td>{{ column|escape }}</td>
+<div class="djDebugPanelTitle">
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<h3>SQL Selected</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>{% trans "Executed SQL" %}</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>{% trans "Time" %}</dt>
+		<dd>{{ time }} ms</dd>
+	</dl>
+	{% if result %}
+	<table>
+		<thead>
+			<tr>
+				{% for h in headers %}
+					<th>{{ h|upper }}</th>
 				{% endfor %}
 			</tr>
-		{% endfor %}
-	</tbody>
-</table>
-{% else %}
-	<p>{% trans "Empty set" %}</p>
-{% endif %}
+		</thead>
+		<tbody>
+			{% for row in result %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					{% for column in row %}
+						<td>{{ column|escape }}</td>
+					{% endfor %}
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+	{% else %}
+		<p>{% trans "Empty set" %}</p>
+	{% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index a9d6a88..dd23fa3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,10 +1,14 @@
 {% load i18n %}
-<a class="close back" href="">{% trans "Back" %}</a>
-<h3>Template Source: <code>{{ template_name }}</code></h3>
-<div class="panelScrollWrap">
-    <div class="panelScrollContent">
-        <div class="boxed">
-            {{ source }}
-        </div>
-    </div>
+<div class="djDebugPanelTitle">
+	<a class="close back" href="">{% trans "Back" %}</a>
+	<h3>Template Source: <code>{{ template_name }}</code></h3>
+</div>
+<div class="djDebugPanelContent">
+	<div class="panelScrollWrap">
+		<div class="panelScrollContent">
+			<div class="boxed">
+				{{ source }}
+			</div>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 194e477..d4e18b5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -14,35 +14,35 @@
 
 <h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4>
 <div class="boxed">
-    {% if templates %}
-    <dl>
-    {% for template in templates %}
-    	<dt><strong><a class="remoteCall" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
-    	<dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
-    	<dd>
-    		<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
-    		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div>
-    	</dd>
-    {% endfor %}
-    </dl>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
+	{% if templates %}
+	<dl>
+	{% for template in templates %}
+		<dt><strong><a class="remoteCall" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt>
+		<dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd>
+		<dd>
+			<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
+			<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div>
+		</dd>
+	{% endfor %}
+	</dl>
+	{% else %}
+		<p>None</p>
+	{% endif %}
 </div>
 
 <h4>Context processor{{ context_processors|length|pluralize }}</h4>
 <div class="boxed">
-    {% if context_processors %}
-    <dl>
-    {% for key, value in context_processors.iteritems %}
-    	<dt><strong>{{ key|escape }}</strong></dt>
-    	<dd>
-    		<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
-    		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div>
-    	</dd>
-    {% endfor %}
-    </dl>
-    {% else %}
-    	<p>None</p>
-    {% endif %}
-</div>
\ No newline at end of file
+	{% if context_processors %}
+	<dl>
+	{% for key, value in context_processors.iteritems %}
+		<dt><strong>{{ key|escape }}</strong></dt>
+		<dd>
+			<div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div>
+			<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div>
+		</dd>
+	{% endfor %}
+	</dl>
+	{% else %}
+		<p>None</p>
+	{% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index d089276..d25f051 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,23 +1,23 @@
 {% load i18n %}
 <div class="boxed">
-    <table>
-    	<colgroup>
-    		<col style="width:20%"/>
-    		<col/>
-    	</colgroup>
-    	<thead>
-    		<tr>
-    			<th>{% trans "Resource" %}</th>
-    			<th>{% trans "Value" %}</th>
-    		</tr>
-    	</thead>
-    	<tbody>
-    		{% for key, value in rows %}
-    			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-    				<td>{{ key|escape }}</td>
-    				<td>{{ value|escape }}</td>
-    			</tr>
-    		{% endfor %}
-    	</tbody>
-    </table>
+	<table>
+		<colgroup>
+			<col style="width:20%"/>
+			<col/>
+		</colgroup>
+		<thead>
+			<tr>
+				<th>{% trans "Resource" %}</th>
+				<th>{% trans "Value" %}</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for key, value in rows %}
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+					<td>{{ key|escape }}</td>
+					<td>{{ value|escape }}</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
 </div>
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index 5611977..d0d9b35 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -10,7 +10,7 @@
 	debug viewing purposes.  You can click the above link to continue with the
 	redirect as normal.  If you'd like to disable this feature, set the" %}
 	<code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key
-	<code>INTERCEPT_REDIRECTS</code> to <code>False</code>.
+	<code>INTERCEPT_REDIRECTS</code> to <code>False</code>." %}
 </p>
 </body>
 </html>