merging in changes from rob/iu-rf and fixing conflicts

11 files changed, 325 insertions, 281 deletions

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 748001d..830bceb 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -8,28 +8,38 @@
 		document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
 	}
 </script>
-<script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.min.js"></script>
+<script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/jquery.cookie.js"></script>
+<script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.js"></script>
 <script type="text/javascript" charset="utf-8">
 	// Now that jQuery is done loading, put the '$' variable back to what it was...
 	var $ = _$;
 </script>
 <style type="text/css">
-	@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);
+	@import url({{ BASE_URL }}/__debug__/m/toolbar.css);
 </style>
 <div id="djDebug">
 	<div style="display: none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">&laquo; {% trans "Hide" %}</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">{% trans "Hide" %} &raquo;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
 			{% for panel in panels %}
 				<li>
 					{% if panel.has_content %}
-						<a href="{{ panel.url|default:"#" }}" title="{{ panel.title }}" class="{{ panel.dom_id }}">{{ panel.title }}</a>
+						<a href="{{ panel.url|default:"#" }}" title="{{ panel.title }}" class="{{ panel.dom_id }}">
 					{% else %}
-						{{ panel.title }}
+					    <div class="contentless">
+					{% endif %}
+					{{ panel.nav_title }}
+					{% with panel.nav_subtitle as subtitle %}
+						{% if subtitle %}<br><small>{{ subtitle }}</small>{% endif %}
+					{% endwith %}
+					{% if panel.has_content %}
+						</a>
+					{% else %}
+					    </div>
 					{% endif %}
 				</li>
 			{% endfor %}
@@ -37,14 +47,19 @@
 	</div>
 	<div style="display: none;" id="djDebugToolbarHandle">
 		<ul id="djDebugPanelList">
-			<li><a title="Show Toolbar" id="djShowToolBarButton" href="#">&raquo;</a></li>
+			<li><a title="Show Toolbar" id="djShowToolBarButton" href="#">&laquo;</a></li>
 		</ul>
 	</div>
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
 				<a href="" class="close">{% trans "Close" %}</a>
-				{{ panel.content|safe }}
+			    <h3>{{ panel.title|safe }}</h3>
+			    <div class="panelScrollWrap">
+			        <div class="panelScrollContent">
+			            {{ panel.content|safe }}
+			        </div>
+			    </div>
 			</div>
 		{% endif %}
 	{% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 3649f0c..5c5f13b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-<h3>Cache Usage</h3>
 <table>
 	<colgroup>
 		<col width="12%"/>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index dec83bf..ef153bf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,18 +1,19 @@
 {% load i18n %}
-<h3>HTTP Headers</h3>
-<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 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>
+</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 441337c..080f955 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 %}
-<h3>Log Messages</h3>
-{% 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 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 %}
+</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 677714d..791a736 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,93 +1,104 @@
 {% load i18n %}
-<h3>COOKIES Variables</h3>
-{% if cookies %}
-	<table>
-		<colgroup>
-			<col style="width:20%"/>
-			<col/>
-		</colgroup>
-		<thead>
-			<tr>
-				<th>{% trans "Key" %}</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 %}
-<h3>SESSION Variables</h3>
-{% if session %}
-	<table>
-		<colgroup>
-			<col style="width:20%"/>
-			<col/>
-		</colgroup>
-		<thead>
-			<tr>
-				<th>{% trans "Key" %}</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 "None" %}</p>
-{% endif %}
-<h3>GET Variables</h3>
-{% if get %}
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans "Key" %}</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 "None" %}</p>
-{% endif %}
-<h3>POST Variables</h3>
-{% if post %}
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans "Key" %}</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 "None" %}</p>
-{% endif %}
+<h4>COOKIES Variables</h4>
+<div class="boxed">
+    {% if cookies %}
+    	<table>
+    		<colgroup>
+    			<col style="width:20%"/>
+    			<col/>
+    		</colgroup>
+    		<thead>
+    			<tr>
+    				<th>{% trans "Key" %}</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 %}
+</div>
+
+<h4>SESSION Variables</h4>
+<div class="boxed">
+    {% if session %}
+    	<table>
+    		<colgroup>
+    			<col style="width:20%"/>
+    			<col/>
+    		</colgroup>
+    		<thead>
+    			<tr>
+    				<th>{% trans "Key" %}</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 "None" %}</p>
+    {% endif %}
+</div>
+
+<h4>GET Variables</h4>
+<div class="boxed">
+    {% if get %}
+    	<table>
+    		<thead>
+    			<tr>
+    				<th>{% trans "Key" %}</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 "None" %}</p>
+    {% endif %}
+</div>
+
+<h4>POST Variables</h4>
+<div class="boxed">
+    {% if post %}
+    	<table>
+    		<thead>
+    			<tr>
+    				<th>{% trans "Key" %}</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 "None" %}</p>
+    {% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 92b65cd..1b9d452 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,18 +1,19 @@
 {% load i18n %}
-<h3>{% trans "Settings from" %} <code>{{ settings.SETTINGS_MODULE }}</code></h3>
-<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 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>
+</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 bd2ebc2..3936dba 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,19 +1,20 @@
-<h3>Signals</h3>
-<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>
+<div class="boxed">
+    <table>
+        <thead>
+            <tr>
+                <th>{% trans "Signal" %}</th>
+                <th>Providing Args</th>
+                <th>Receivers</th>
             </tr>
-        {% endfor %}
-    </tbody>
-</table>
+        </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 c07c566..4c100e9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,50 +1,51 @@
 {% load i18n %}
-<h3>SQL Queries</h3>
-<table>
-	<thead>
-		<tr>
-			<th>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>Line</th>
-								<th>Method</th>
-								<th>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 class="boxed">
+    <table>
+    	<thead>
+    		<tr>
+    			<th>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>Line</th>
+    								<th>Method</th>
+    								<th>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/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index e716691..a9d6a88 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,4 +1,10 @@
 {% load i18n %}
-<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
-<h3>Template Source: <samp>{{ template_name }}</samp></h3>
-{{ source }}
+<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>
\ 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 6c918b1..622321f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,4 +1,5 @@
-<h3>Template path{{ template_dirs|length|pluralize }}:</h3>
+<h4>Template path{{ template_dirs|length|pluralize }}</h4>
+<div class="boxed">
 {% if template_dirs %}
 	<ol>
 	{% for template in template_dirs %}
@@ -8,32 +9,39 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>Template{{ templates|length|pluralize }}</h3>
-{% 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 %}
-<h3>Context processor{{ context_processors|length|pluralize }}</h3>
-{% 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>
+
+<h4>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 %}
+</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
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index f593b44..70ba61e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,22 +1,23 @@
 {% load i18n %}
-<h3>Resource Usage</h3>
-<table>
-	<colgroup>
-		<col style="width:20%"/>
-		<col/>
-	</colgroup>
-	<thead>
-		<tr>
-			<th>{% trans "Key" %}</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 class="boxed">
+    <table>
+    	<colgroup>
+    		<col style="width:20%"/>
+    		<col/>
+    	</colgroup>
+    	<thead>
+    		<tr>
+    			<th>{% trans "Key" %}</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