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

14 files changed, 370 insertions, 356 deletions

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>