From 5151e5ff87ab56352df8d6979c14542aa18b2538 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 2 Jan 2009 23:19:45 -0800
Subject: working on translating the django toolbar into Spanish. Translating
 panel template: cache.html

---
 .../templates/debug_toolbar/panels/cache.html         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 3142783..7667740 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h3>Cache Usage</h3>
 <table>
 	<colgroup>
@@ -11,13 +12,13 @@
 		<col width="12%"/>
 	</colgroup>
 	<tr>
-		<th>Total Calls</th>
+		<th>{% trans "Total Calls" %}</th>
 		<td>{{ cache_calls }}</td>
-		<th>Total Time</th>
+		<th>{% trans "Total Time" %}</th>
 		<td>{{ cache_time }}ms</td>
-		<th>Hits</th>
+		<th>{% trans "Hits" %}</th>
 		<td>{{ cache.hits }}</td>
-		<th>Misses</th>
+		<th>{% trans "Misses" %}</th>
 		<td>{{ cache.misses }}</td>
 	</tr>
 	<tr>
@@ -32,14 +33,14 @@
 	</tr>
 </table>
 {% if cache.calls %}
-<h3>Breakdown</h3>
+<h3>{% trans "Breakdown" %}</h3>
 <table>
 	<thead>
 		<tr>
-			<th>Time&nbsp;(ms)</th>
-			<th>Type</th>
-			<th>Parameters</th>
-			<th>Function</th>
+			<th>{% trans "Time&nbsp;(ms)" %}</th>
+			<th>{% trans "Type" %}</th>
+			<th>{% trans "Parameters" %}</th>
+			<th>{% trans "Function" %}</th>
 		</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.3


From 22fde8255f935dbadcd958ee04fc3f0a94a64704 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 2 Jan 2009 23:26:02 -0800
Subject: finished adding "trans" to panel template headers.html

---
 debug_toolbar/templates/debug_toolbar/panels/headers.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index 3ac7fd3..0a1578d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <h3>HTTP Headers</h3>
 <table>
 	<thead>
 		<tr>
-			<th>Key</th>
-			<th>Value</th>
+			<th>{% trans "Key" %}</th>
+			<th>{% trans "Value" %}</th>
 		</tr>
 	</thead>
 	<tbody>
-- 
cgit v1.2.3


From 74763c3eb7e8debdf502697dfa28b0122cc9a628 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 2 Jan 2009 23:36:49 -0800
Subject: trans fue incorporado a logger.html

---
 debug_toolbar/templates/debug_toolbar/panels/headers.html |  2 +-
 debug_toolbar/templates/debug_toolbar/panels/logger.html  | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index 0a1578d..00b28e2 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -4,7 +4,7 @@
 	<thead>
 		<tr>
 			<th>{% trans "Key" %}</th>
-			<th>{% trans "Value" %}</th>
+			<th>{% trans Value %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index c079065..112cc7d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <h3>Log Messages</h3>
 {% if records %}
 	<table>
 		<thead>
 			<tr>
-				<th>Level</th>
-				<th>Time</th>
-				<th>Message</th>
-				<th>Location</th>
+				<th>{% trans "Level" %}</th>
+				<th>{% trans "Time" %}</th>
+				<th>{% trans "Message" %}</th>
+				<th>{% trans "Location" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -21,6 +22,6 @@
 		</tbody>
 	</table>
 {% else %}
-	<p>No messages logged.</p>
+	<p>{% trans "No messages logged" %}.</p>
 {% endif %}
 
-- 
cgit v1.2.3


From 77c0f4d0b1bb7392b5893cc2fc055ec7605c4fed Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 2 Jan 2009 23:39:15 -0800
Subject: adding i18n to request_vars template

---
 debug_toolbar/templates/debug_toolbar/panels/request_vars.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index fe317ae..0885711 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h3>COOKIES Variables</h3>
 {% if cookies %}
 	<table>
-- 
cgit v1.2.3


From 5387dbaecb4cd339279dad1b970e15231b9b5deb Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 2 Jan 2009 23:44:30 -0800
Subject: added trans to request_vars.html

---
 .../templates/debug_toolbar/panels/headers.html    |  2 +-
 .../debug_toolbar/panels/request_vars.html         | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index 00b28e2..0a1578d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -4,7 +4,7 @@
 	<thead>
 		<tr>
 			<th>{% trans "Key" %}</th>
-			<th>{% trans Value %}</th>
+			<th>{% trans "Value" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index 0885711..751e1da 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -8,8 +8,8 @@
 		</colgroup>
 		<thead>
 			<tr>
-				<th>Key</th>
-				<th>Value</th>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -22,7 +22,7 @@
 		</tbody>
 	</table>
 {% else %}
-	<p>None</p>
+	<p>{% trans "None" %}</p>
 {% endif %}
 <h3>SESSION Variables</h3>
 {% if session %}
@@ -33,8 +33,8 @@
 		</colgroup>
 		<thead>
 			<tr>
-				<th>Key</th>
-				<th>Value</th>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -47,15 +47,15 @@
 		</tbody>
 	</table>
 {% else %}
-	<p>None</p>
+	<p>{% trans "None" %}</p>
 {% endif %}
 <h3>GET Variables</h3>
 {% if get %}
 	<table>
 		<thead>
 			<tr>
-				<th>Key</th>
-				<th>Value</th>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -68,15 +68,15 @@
 		</tbody>
 	</table>
 {% else %}
-	<p>None</p>
+	<p>{% trans "None" %}</p>
 {% endif %}
 <h3>POST Variables</h3>
 {% if post %}
 	<table>
 		<thead>
 			<tr>
-				<th>Key</th>
-				<th>Value</th>
+				<th>{% trans "Key" %}</th>
+				<th>{% trans "Value" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -89,5 +89,5 @@
 		</tbody>
 	</table>
 {% else %}
-	<p>None</p>
+	<p>{% trans "None" %}</p>
 {% endif %}
-- 
cgit v1.2.3


From 88fbcdcaaf9d8cced4d321ffed395b7937b9aa2a Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Sun, 4 Jan 2009 15:07:34 -0800
Subject: added "trans" to the templates to be translated

---
 debug_toolbar/templates/debug_toolbar/panels/settings_vars.html  | 5 +++--
 debug_toolbar/templates/debug_toolbar/panels/sql.html            | 7 ++++---
 debug_toolbar/templates/debug_toolbar/panels/sql_explain.html    | 7 ++++---
 debug_toolbar/templates/debug_toolbar/panels/sql_profile.html    | 7 ++++---
 debug_toolbar/templates/debug_toolbar/panels/sql_select.html     | 9 +++++----
 .../templates/debug_toolbar/panels/template_source.html          | 3 ++-
 debug_toolbar/templates/debug_toolbar/panels/timer.html          | 5 +++--
 debug_toolbar/templates/debug_toolbar/redirect.html              | 7 +++++--
 8 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1d332bf..1e84edf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <h3>Settings from <code>{{ settings.SETTINGS_MODULE }}</code></h3>
 <table>
 	<thead>
 		<tr>
-			<th>Setting</th>
-			<th>Value</th>
+			<th>{% trans "Setting" %}</th>
+			<th>{% trans "Value" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 7de2220..0dc82e6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,10 +1,11 @@
+{% load i18n %}
 <h3>SQL Queries</h3>
 <table>
 	<thead>
 		<tr>
-			<th>Time&nbsp;(ms)</th>
-			<th>Action</th>
-			<th>Query</th>
+			<th>{% trans "Time&nbsp;(ms)" %}</th>
+			<th>{% trans "Action" %}</th>
+			<th>{% trans "Query" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index dc306f0..cb3ca5e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,9 +1,10 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
+{% load i18n %}
+<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 <h3>SQL Explained</h3>
 <dl>
-	<dt>Executed SQL</dt>
+	<dt>{% trans "Executed SQL" %}</dt>
 	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>Time</dt>
+	<dt>{% trans "Time" %}</dt>
 	<dd>{{ time }} ms</dd>
 </dl>
 <table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index c1d04ce..c058b2b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,9 +1,10 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
+{% load i18n %}
+<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 <h3>SQL Profiled</h3>
 <dl>
-	<dt>Executed SQL</dt>
+	<dt>{% trans "Executed SQL" %}</dt>
 	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>Time</dt>
+	<dt>{% trans "Time" %}</dt>
 	<dd>{{ time }} ms</dd>
 </dl>
 <table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 73109ef..c2ab7b6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,9 +1,10 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
+{% load i18n %}
+<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 <h3>SQL Selected</h3>
 <dl>
-	<dt>Executed SQL</dt>
+	<dt>{% trans "Executed SQL" %}</dt>
 	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>Time</dt>
+	<dt>{% trans "Time" %}</dt>
 	<dd>{{ time }} ms</dd>
 </dl>
 {% if result %}
@@ -26,5 +27,5 @@
 	</tbody>
 </table>
 {% else %}
-	<p>Empty set</p>
+	<p>{% trans "Empty set" %}</p>
 {% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 572522b..e716691 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,3 +1,4 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
+{% load i18n %}
+<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 <h3>Template Source: <samp>{{ template_name }}</samp></h3>
 {{ source }}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 1b077c6..2d409b0 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h3>Resource Usage</h3>
 <table>
 	<colgroup>
@@ -6,8 +7,8 @@
 	</colgroup>
 	<thead>
 		<tr>
-			<th>Key</th>
-			<th>Value</th>
+			<th>{% trans "Key" %}</th>
+			<th>{% trans "Value" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index afdccc4..d0585ca 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <html>
 <head>
 </head>
@@ -5,9 +6,11 @@
 <h1>HttpResponseRedirect</h1>
 <p>Location: <a href="{{ redirect_to }}">{{ redirect_to }}</a></p>
 <p class="notice">
-	The Django Debug Toolbar has intercepted a redirect to the above URL for
+	{% trans
+	"The Django Debug Toolbar has intercepted a redirect to the above URL for
 	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
+	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>.
 </p>
-- 
cgit v1.2.3


From 2339b5e95a2ecf0cc64ccef8d50e669f5caff69a Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Sun, 4 Jan 2009 16:32:52 -0800
Subject: added "trans" to base and redirect templates

---
 debug_toolbar/templates/debug_toolbar/base.html     | 3 ++-
 debug_toolbar/templates/debug_toolbar/redirect.html | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index a6c8aef..fca6256 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <script type="text/javascript" charset="utf-8">
 	if (typeof jQuery == 'undefined') {
 		var jquery_url = '{{ BASE_URL }}/__debug__/m/jquery.js';
@@ -26,7 +27,7 @@
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
-				<a href="" class="close">Close</a>
+				<a href="" class="close">{% trans "Close" %}</a>
 				{{ panel.content|safe }}
 			</div>
 		{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index d0585ca..cdc08b9 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -6,11 +6,9 @@
 <h1>HttpResponseRedirect</h1>
 <p>Location: <a href="{{ redirect_to }}">{{ redirect_to }}</a></p>
 <p class="notice">
-	{% trans
-	"The Django Debug Toolbar has intercepted a redirect to the above URL for
+	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for
 	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"
-	%}
+	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>.
 </p>
-- 
cgit v1.2.3


From 073ab2c8255ebc310a54e9f937b4b17f94f7eac2 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Sun, 4 Jan 2009 17:21:18 -0800
Subject: updated Spanish translation

---
 debug_toolbar/templates/debug_toolbar/panels/cache.html         | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/settings_vars.html | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/sql.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index 7667740..3649f0c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -37,7 +37,7 @@
 <table>
 	<thead>
 		<tr>
-			<th>{% trans "Time&nbsp;(ms)" %}</th>
+			<th>{% trans "Time" %}&nbsp;(ms)</th>
 			<th>{% trans "Type" %}</th>
 			<th>{% trans "Parameters" %}</th>
 			<th>{% trans "Function" %}</th>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1e84edf..7b285ff 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<h3>Settings from <code>{{ settings.SETTINGS_MODULE }}</code></h3>
+<h3>{% trans "Settings from" %} <code>{{ settings.SETTINGS_MODULE }}</code></h3>
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 0dc82e6..50480bf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -3,7 +3,7 @@
 <table>
 	<thead>
 		<tr>
-			<th>{% trans "Time&nbsp;(ms)" %}</th>
+			<th>{% trans "Time" %}&nbsp;(ms)</th>
 			<th>{% trans "Action" %}</th>
 			<th>{% trans "Query" %}</th>
 		</tr>
-- 
cgit v1.2.3


From 565b100f9d97214043ae93c51d276951a65331e8 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 11 Aug 2009 09:45:18 -0700
Subject: Refactored the UI to be a right hand side vertical toolbar.
 DebugPanel subclass grew a subtitle method to display informative text under
 the title.

---
 debug_toolbar/templates/debug_toolbar/base.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 52b7a5b..e3681b2 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -19,7 +19,7 @@
 	<div style="display: none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">&laquo; Hide</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">Hide &raquo;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
@@ -30,13 +30,16 @@
 					{% else %}
 						{{ panel.title }}
 					{% endif %}
+					{% with panel.subtitle as subtitle %}
+						{% if subtitle %}<br><small>{{ subtitle }}</small>{% endif %}
+					{% endwith %}
 				</li>
 			{% endfor %}
 		</ul>
 	</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 %}
-- 
cgit v1.2.3


From c67c719047645381011f02c56daaa152efbf796c Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 04:37:47 +0300
Subject: toolbar restyling, switched to non-minified css/js

---
 debug_toolbar/templates/debug_toolbar/base.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index e3681b2..f6a508d 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -7,13 +7,14 @@
 		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">
@@ -26,13 +27,19 @@
 			{% 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.title }}
 					{% with panel.subtitle as subtitle %}
 						{% if subtitle %}<br><small>{{ subtitle }}</small>{% endif %}
 					{% endwith %}
+					{% if panel.has_content %}
+						</a>
+					{% else %}
+					    </div>
+					{% endif %}
 				</li>
 			{% endfor %}
 		</ul>
-- 
cgit v1.2.3


From 2e5e136e00f964c10247c78da88e2b11e1f5a7dd Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 04:39:59 +0300
Subject: renamed title/subtitle -> nav_title/nav_subtitle

---
 debug_toolbar/templates/debug_toolbar/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index f6a508d..a45e9b6 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -31,8 +31,8 @@
 					{% else %}
 					    <div class="contentless">
 					{% endif %}
-					{{ panel.title }}
-					{% with panel.subtitle as subtitle %}
+					{{ panel.nav_title }}
+					{% with panel.nav_subtitle as subtitle %}
 						{% if subtitle %}<br><small>{{ subtitle }}</small>{% endif %}
 					{% endwith %}
 					{% if panel.has_content %}
-- 
cgit v1.2.3


From 5015057cfe3448028ff79ca36a96f1baa4224226 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 05:09:04 +0300
Subject: added in-panel title

---
 debug_toolbar/templates/debug_toolbar/base.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index a45e9b6..ab591dd 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -52,6 +52,7 @@
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
+			    <h3>{{ panel.title|safe }}</h3>
 				<a href="" class="close">Close</a>
 				{{ panel.content|safe }}
 			</div>
-- 
cgit v1.2.3


From e38c45515ca458709b0a7e5bc75e3f640950dbb3 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 06:37:43 +0300
Subject: Cleaned up the panels

---
 debug_toolbar/templates/debug_toolbar/base.html                 | 6 ++++--
 debug_toolbar/templates/debug_toolbar/panels/cache.html         | 1 -
 debug_toolbar/templates/debug_toolbar/panels/headers.html       | 1 -
 debug_toolbar/templates/debug_toolbar/panels/logger.html        | 1 -
 debug_toolbar/templates/debug_toolbar/panels/request_vars.html  | 8 ++++----
 debug_toolbar/templates/debug_toolbar/panels/settings_vars.html | 1 -
 debug_toolbar/templates/debug_toolbar/panels/signals.html       | 1 -
 debug_toolbar/templates/debug_toolbar/panels/sql.html           | 1 -
 debug_toolbar/templates/debug_toolbar/panels/templates.html     | 1 -
 debug_toolbar/templates/debug_toolbar/panels/timer.html         | 1 -
 10 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index ab591dd..5f4b7e7 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -52,9 +52,11 @@
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
-			    <h3>{{ panel.title|safe }}</h3>
 				<a href="" class="close">Close</a>
-				{{ panel.content|safe }}
+			    <h3>{{ panel.title|safe }}</h3>
+			    <div class="panelScroll">
+					{{ panel.content|safe }}
+			    </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 3142783..d102cdd 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,4 +1,3 @@
-<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 005ffe6..b14a50c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,4 +1,3 @@
-<h3>HTTP Headers</h3>
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 2117529..e6ce945 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,4 +1,3 @@
-<h3>Log Messages</h3>
 {% if records %}
 	<table>
 		<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index b7d53ee..a65d0a5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,4 +1,4 @@
-<h3>COOKIES Variables</h3>
+<h4>COOKIES Variables</h4>
 {% if cookies %}
 	<table>
 		<colgroup>
@@ -23,7 +23,7 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>SESSION Variables</h3>
+<h4>SESSION Variables</h4>
 {% if session %}
 	<table>
 		<colgroup>
@@ -48,7 +48,7 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>GET Variables</h3>
+<h4>GET Variables</h4>
 {% if get %}
 	<table>
 		<thead>
@@ -69,7 +69,7 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>POST Variables</h3>
+<h4>POST Variables</h4>
 {% if post %}
 	<table>
 		<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 93f0b34..c53ee4d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,4 +1,3 @@
-<h3>Settings from <code>{{ settings.SETTINGS_MODULE }}</code></h3>
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index e9a189e..7875700 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,4 +1,3 @@
-<h3>Signals</h3>
 <table>
     <thead>
         <tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index f05ea97..717d54d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,4 +1,3 @@
-<h3>SQL Queries</h3>
 <table>
 	<thead>
 		<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 6c918b1..78519c9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,4 +1,3 @@
-<h3>Template path{{ template_dirs|length|pluralize }}:</h3>
 {% if template_dirs %}
 	<ol>
 	{% for template in template_dirs %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 831ff86..39e9eb1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,4 +1,3 @@
-<h3>Resource Usage</h3>
 <table>
 	<colgroup>
 		<col style="width:20%"/>
-- 
cgit v1.2.3


From e11bfdac25d48019377f64131b78f4462e9d005f Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 15:18:47 +0300
Subject: oops, retitled templates panel

---
 debug_toolbar/templates/debug_toolbar/panels/templates.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 78519c9..01240f7 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,3 +1,4 @@
+<h4>Template path{{ template_dirs|length|pluralize }}</h4>
 {% if template_dirs %}
 	<ol>
 	{% for template in template_dirs %}
@@ -7,7 +8,7 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>Template{{ templates|length|pluralize }}</h3>
+<h4>Template{{ templates|length|pluralize }}</h4>
 {% if templates %}
 <dl>
 {% for template in templates %}
@@ -22,7 +23,7 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-<h3>Context processor{{ context_processors|length|pluralize }}</h3>
+<h4>Context processor{{ context_processors|length|pluralize }}</h4>
 {% if context_processors %}
 <dl>
 {% for key, value in context_processors.iteritems %}
-- 
cgit v1.2.3


From f60a5e3b048728240bb4d85dd1fb5e2c9ea6fa2d Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 12 Aug 2009 17:04:54 +0300
Subject: panel width, content boxing, safe scrolling

---
 debug_toolbar/templates/debug_toolbar/base.html    |   6 +-
 .../templates/debug_toolbar/panels/headers.html    |  34 ++--
 .../templates/debug_toolbar/panels/logger.html     |  51 +++---
 .../debug_toolbar/panels/request_vars.html         | 187 +++++++++++----------
 .../debug_toolbar/panels/settings_vars.html        |  34 ++--
 .../templates/debug_toolbar/panels/signals.html    |  36 ++--
 .../templates/debug_toolbar/panels/sql.html        |  99 +++++------
 .../debug_toolbar/panels/template_source.html      |  12 +-
 .../templates/debug_toolbar/panels/templates.html  |  62 ++++---
 .../templates/debug_toolbar/panels/timer.html      |  42 ++---
 10 files changed, 301 insertions(+), 262 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 5f4b7e7..a44d31e 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -54,8 +54,10 @@
 			<div id="{{ panel.dom_id }}" class="panelContent">
 				<a href="" class="close">Close</a>
 			    <h3>{{ panel.title|safe }}</h3>
-			    <div class="panelScroll">
-					{{ panel.content|safe }}
+			    <div class="panelScrollWrap">
+			        <div class="panelScrollContent">
+			            {{ panel.content|safe }}
+			        </div>
 			    </div>
 			</div>
 		{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index b14a50c..a6b6b59 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,16 +1,18 @@
-<table>
-	<thead>
-		<tr>
-			<th>Key</th>
-			<th>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>Key</th>
+    			<th>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 e6ce945..2bfab05 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,25 +1,26 @@
-{% if records %}
-	<table>
-		<thead>
-			<tr>
-				<th>Level</th>
-				<th>Time</th>
-				<th>Message</th>
-				<th>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>No messages logged.</p>
-{% endif %}
-
+<div class="boxed">
+    {% if records %}
+    	<table>
+    		<thead>
+    			<tr>
+    				<th>Level</th>
+    				<th>Time</th>
+    				<th>Message</th>
+    				<th>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>No messages logged.</p>
+    {% endif %}
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index a65d0a5..d8c81ba 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,92 +1,103 @@
 <h4>COOKIES Variables</h4>
-{% if cookies %}
-	<table>
-		<colgroup>
-			<col style="width:20%"/>
-			<col/>
-		</colgroup>
-		<thead>
-			<tr>
-				<th>Key</th>
-				<th>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>None</p>
-{% endif %}
+<div class="boxed">
+    {% if cookies %}
+    	<table>
+    		<colgroup>
+    			<col style="width:20%"/>
+    			<col/>
+    		</colgroup>
+    		<thead>
+    			<tr>
+    				<th>Key</th>
+    				<th>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>None</p>
+    {% endif %}
+</div>
+
 <h4>SESSION Variables</h4>
-{% if session %}
-	<table>
-		<colgroup>
-			<col style="width:20%"/>
-			<col/>
-		</colgroup>
-		<thead>
-			<tr>
-				<th>Key</th>
-				<th>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>None</p>
-{% endif %}
+<div class="boxed">
+    {% if session %}
+    	<table>
+    		<colgroup>
+    			<col style="width:20%"/>
+    			<col/>
+    		</colgroup>
+    		<thead>
+    			<tr>
+    				<th>Key</th>
+    				<th>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>None</p>
+    {% endif %}
+</div>
+
 <h4>GET Variables</h4>
-{% if get %}
-	<table>
-		<thead>
-			<tr>
-				<th>Key</th>
-				<th>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>None</p>
-{% endif %}
+<div class="boxed">
+    {% if get %}
+    	<table>
+    		<thead>
+    			<tr>
+    				<th>Key</th>
+    				<th>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>None</p>
+    {% endif %}
+</div>
+
 <h4>POST Variables</h4>
-{% if post %}
-	<table>
-		<thead>
-			<tr>
-				<th>Key</th>
-				<th>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>None</p>
-{% endif %}
+<div class="boxed">
+    {% if post %}
+    	<table>
+    		<thead>
+    			<tr>
+    				<th>Key</th>
+    				<th>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>None</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 c53ee4d..8c65700 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,16 +1,18 @@
-<table>
-	<thead>
-		<tr>
-			<th>Setting</th>
-			<th>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>Setting</th>
+    			<th>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 7875700..c7a7733 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,18 +1,20 @@
-<table>
-    <thead>
-        <tr>
-            <th>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>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 717d54d..bb805e6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,48 +1,51 @@
-<table>
-	<thead>
-		<tr>
-			<th>Time&nbsp;(ms)</th>
-			<th>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>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>
+
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 572522b..2094a3f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -1,3 +1,9 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
-<h3>Template Source: <samp>{{ template_name }}</samp></h3>
-{{ source }}
+<a class="close back" href="">Back</a>
+<h3>Template Source: <code>{{ template_name }}</code></h3>
+<div class="panelScrollWrap">
+    <div class="panelScrollContent">
+        <div class="boxed">
+            {{ source }}
+        </div>
+    </div>
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 01240f7..622321f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,4 +1,5 @@
 <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 %}
+</div>
+
 <h4>Template{{ templates|length|pluralize }}</h4>
-{% 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 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>
-{% 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 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 39e9eb1..ba801b2 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,20 +1,22 @@
-<table>
-	<colgroup>
-		<col style="width:20%"/>
-		<col/>
-	</colgroup>
-	<thead>
-		<tr>
-			<th>Key</th>
-			<th>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>Key</th>
+    			<th>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>
-- 
cgit v1.2.3


From e0a81fd78aa2a6e5096a8b207484fa19cc5c034f Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 21 Aug 2009 13:30:24 -0700
Subject: testing some changes

---
 debug_toolbar/templates/debug_toolbar/base.html           | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/signals.html | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/sql.html     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 66d126e..748001d 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -20,7 +20,7 @@
 	<div style="display: none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">&laquo; Hide</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">&laquo; {% trans "Hide" %}</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index e9a189e..bd2ebc2 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -2,7 +2,7 @@
 <table>
     <thead>
         <tr>
-            <th>Signal</th>
+            <th>{% trans "Signal" %}</th>
             <th>Providing Args</th>
             <th>Receivers</th>
         </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 99ce611..c07c566 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -4,7 +4,7 @@
 	<thead>
 		<tr>
 			<th>Time&nbsp;(ms)</th>
-			<th>Action</th>
+			<th>{% trans "Action" %}</th>
 			<th>Stacktrace</th>
 			<th>Query</th>
 		</tr>
-- 
cgit v1.2.3


From 5c9ebea7a2738517189ac1701f72b8942b590dc1 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 21 Aug 2009 14:56:30 -0700
Subject: Cleaning up and simplifying the closed handle HTML and CSS.

---
 debug_toolbar/templates/debug_toolbar/base.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index a44d31e..401677a 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -17,7 +17,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">Hide &raquo;</a></li>
@@ -44,10 +44,8 @@
 			{% 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 %}
-- 
cgit v1.2.3


From f986b6d995efac1b7129eb9835d3fcdd20ef6098 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 21 Aug 2009 15:03:21 -0700
Subject: added i18n support (Spanish) for request_Vars.html

---
 .../templates/debug_toolbar/panels/request_vars.html       | 14 +++++++-------
 debug_toolbar/templates/debug_toolbar/panels/signals.html  |  1 +
 debug_toolbar/templates/debug_toolbar/panels/sql.html      |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index 791a736..c2797dc 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -9,7 +9,7 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>{% trans "Key" %}</th>
+    				<th>{% trans "Variable" %}</th>
     				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
@@ -37,7 +37,7 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>{% trans "Key" %}</th>
+    				<th>{% trans "Variable" %}</th>
     				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
@@ -51,7 +51,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>{% trans "None" %}</p>
+    	<p>{% trans "No SESSION data" %}</p>
     {% endif %}
 </div>
 
@@ -61,7 +61,7 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>{% trans "Key" %}</th>
+    				<th>{% trans "Variable" %}</th>
     				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
@@ -75,7 +75,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>{% trans "None" %}</p>
+    	<p>{% trans "No GET data" %}</p>
     {% endif %}
 </div>
 
@@ -85,7 +85,7 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>{% trans "Key" %}</th>
+    				<th>{% trans "Variable" %}</th>
     				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
@@ -99,6 +99,6 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>{% trans "None" %}</p>
+    	<p>{% trans "No POST data" %}</p>
     {% endif %}
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index 3936dba..fccf7ff 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div class="boxed">
     <table>
         <thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 4c100e9..4bb7c9a 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -28,7 +28,7 @@
     					<div class="djSQLHideStacktraceDiv" style="display:none;">
     						<table>
     							<tr>
-    								<th>Line</th>
+    								<th>{% trans "Line" %}</th>
     								<th>Method</th>
     								<th>File</th>
     							</tr>
-- 
cgit v1.2.3


From 8fa547a2a34086455b4af9e327906b6f96b12b24 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 21 Aug 2009 15:11:13 -0700
Subject: added i18n support (Spanish) for timer.html

---
 debug_toolbar/templates/debug_toolbar/panels/timer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 70ba61e..d089276 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -7,7 +7,7 @@
     	</colgroup>
     	<thead>
     		<tr>
-    			<th>{% trans "Key" %}</th>
+    			<th>{% trans "Resource" %}</th>
     			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
-- 
cgit v1.2.3


From b5087075c1354b1512bb25a38e7f7c0afd1067d0 Mon Sep 17 00:00:00 2001
From: Percy Perez-Pinedo
Date: Fri, 21 Aug 2009 15:36:00 -0700
Subject: spanish version of the debug toolbar templates is mostly done'

---
 debug_toolbar/templates/debug_toolbar/panels/sql.html       | 6 +++---
 debug_toolbar/templates/debug_toolbar/panels/templates.html | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 4bb7c9a..cac2e47 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -3,7 +3,7 @@
     <table>
     	<thead>
     		<tr>
-    			<th>Time&nbsp;(ms)</th>
+    			<th>{% trans "Time" %}&nbsp;(ms)</th>
     			<th>{% trans "Action" %}</th>
     			<th>Stacktrace</th>
     			<th>Query</th>
@@ -29,8 +29,8 @@
     						<table>
     							<tr>
     								<th>{% trans "Line" %}</th>
-    								<th>Method</th>
-    								<th>File</th>
+    								<th>{% trans "Method" %}</th>
+    								<th>{% trans "File" %}</th>
     							</tr>
     							{% for file, line, method in query.stacktrace %}
     								<tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 622321f..194e477 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h4>Template path{{ template_dirs|length|pluralize }}</h4>
 <div class="boxed">
 {% if template_dirs %}
@@ -11,7 +12,7 @@
 {% endif %}
 </div>
 
-<h4>Template{{ templates|length|pluralize }}</h4>
+<h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4>
 <div class="boxed">
     {% if templates %}
     <dl>
-- 
cgit v1.2.3


From ecd7f2abe62996b19720e9ade61b45eafac590e8 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Mon, 24 Aug 2009 11:24:38 -0700
Subject: Make panel content stylings look like Django's debug template.

---
 debug_toolbar/templates/debug_toolbar/base.html    | 14 ++---
 .../debug_toolbar/panels/sql_explain.html          | 52 ++++++++++---------
 .../debug_toolbar/panels/sql_profile.html          | 52 ++++++++++---------
 .../templates/debug_toolbar/panels/sql_select.html | 60 ++++++++++++----------
 4 files changed, 95 insertions(+), 83 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 401677a..d0f4562 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -50,13 +50,13 @@
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
-				<a href="" class="close">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">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/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index a163b25..d26a8a3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,26 +1,30 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
-<h3>SQL Explained</h3>
-<dl>
-	<dt>Executed SQL</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>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;Back</a>
+	<h3>SQL Explained</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>Executed SQL</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>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 e46f41d..c5410f8 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,26 +1,30 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
-<h3>SQL Profiled</h3>
-<dl>
-	<dt>Executed SQL</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>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;Back</a>
+	<h3>SQL Profiled</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>Executed SQL</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>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 17e7d48..4fc928d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,30 +1,34 @@
-<a class="back" href="">&laquo;&nbsp;Back</a>
-<h3>SQL Selected</h3>
-<dl>
-	<dt>Executed SQL</dt>
-	<dd><pre>{{ sql|safe }}</pre></dd>
-	<dt>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;Back</a>
+	<h3>SQL Selected</h3>
+</div>
+<div class="djDebugPanelContent">
+	<dl>
+		<dt>Executed SQL</dt>
+		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dt>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>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>Empty set</p>
+	{% endif %}
+</div>
-- 
cgit v1.2.3


From 2fcfa87b1addcb903185af943d6f7a20c0cfa6bf Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Mon, 24 Aug 2009 16:16:10 -0700
Subject: Merge locale work by Percy.

---
 debug_toolbar/templates/debug_toolbar/base.html    |  5 ++--
 .../templates/debug_toolbar/panels/cache.html      | 19 +++++++--------
 .../templates/debug_toolbar/panels/headers.html    |  5 ++--
 .../templates/debug_toolbar/panels/logger.html     | 13 ++++++-----
 .../debug_toolbar/panels/request_vars.html         | 27 +++++++++++-----------
 .../debug_toolbar/panels/settings_vars.html        |  5 ++--
 .../templates/debug_toolbar/panels/signals.html    |  3 ++-
 .../templates/debug_toolbar/panels/sql.html        | 14 +++++------
 .../debug_toolbar/panels/sql_explain.html          |  7 +++---
 .../debug_toolbar/panels/sql_profile.html          |  7 +++---
 .../templates/debug_toolbar/panels/sql_select.html |  9 ++++----
 .../debug_toolbar/panels/template_source.html      |  5 ++--
 .../templates/debug_toolbar/panels/templates.html  |  3 ++-
 .../templates/debug_toolbar/panels/timer.html      |  7 +++---
 .../templates/debug_toolbar/redirect.html          |  5 ++--
 15 files changed, 74 insertions(+), 60 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index d0f4562..b80daef 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <script type="text/javascript" charset="utf-8">
 	// When jQuery is sourced, it's going to overwrite whatever might be in the
 	// '$' variable, so store a reference of it in a temporary variable...
@@ -20,7 +21,7 @@
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
 			{% if panels %}
-			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">Hide &raquo;</a></li>
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">{% trans "Hide" %} &raquo;</a></li>
 			{% else %}
 			<li id="djDebugButton">DEBUG</li>
 			{% endif %}
@@ -51,7 +52,7 @@
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
 				<div class="djDebugPanelTitle">
-					<a href="" class="close">Close</a>
+					<a href="" class="close">{% trans "Close" %}</a>
 					<h3>{{ panel.title|safe }}</h3>
 				</div>
 				<div class="djDebugPanelContent">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html
index d102cdd..5c5f13b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/cache.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <table>
 	<colgroup>
 		<col width="12%"/>
@@ -10,13 +11,13 @@
 		<col width="12%"/>
 	</colgroup>
 	<tr>
-		<th>Total Calls</th>
+		<th>{% trans "Total Calls" %}</th>
 		<td>{{ cache_calls }}</td>
-		<th>Total Time</th>
+		<th>{% trans "Total Time" %}</th>
 		<td>{{ cache_time }}ms</td>
-		<th>Hits</th>
+		<th>{% trans "Hits" %}</th>
 		<td>{{ cache.hits }}</td>
-		<th>Misses</th>
+		<th>{% trans "Misses" %}</th>
 		<td>{{ cache.misses }}</td>
 	</tr>
 	<tr>
@@ -31,14 +32,14 @@
 	</tr>
 </table>
 {% if cache.calls %}
-<h3>Breakdown</h3>
+<h3>{% trans "Breakdown" %}</h3>
 <table>
 	<thead>
 		<tr>
-			<th>Time&nbsp;(ms)</th>
-			<th>Type</th>
-			<th>Parameters</th>
-			<th>Function</th>
+			<th>{% trans "Time" %}&nbsp;(ms)</th>
+			<th>{% trans "Type" %}</th>
+			<th>{% trans "Parameters" %}</th>
+			<th>{% trans "Function" %}</th>
 		</tr>
 	</thead>
 	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index a6b6b59..ef153bf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
+    			<th>{% trans "Key" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 2bfab05..080f955 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="boxed">
     {% if records %}
     	<table>
     		<thead>
     			<tr>
-    				<th>Level</th>
-    				<th>Time</th>
-    				<th>Message</th>
-    				<th>Location</th>
+    				<th>{% trans "Level" %}</th>
+    				<th>{% trans "Time" %}</th>
+    				<th>{% trans "Message" %}</th>
+    				<th>{% trans "Location" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -21,6 +22,6 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>No messages logged.</p>
+    	<p>{% trans "No messages logged" %}.</p>
     {% endif %}
-</div>
+</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 d8c81ba..c2797dc 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h4>COOKIES Variables</h4>
 <div class="boxed">
     {% if cookies %}
@@ -8,8 +9,8 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -22,7 +23,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "None" %}</p>
     {% endif %}
 </div>
 
@@ -36,8 +37,8 @@
     		</colgroup>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -50,7 +51,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No SESSION data" %}</p>
     {% endif %}
 </div>
 
@@ -60,8 +61,8 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -74,7 +75,7 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No GET data" %}</p>
     {% endif %}
 </div>
 
@@ -84,8 +85,8 @@
     	<table>
     		<thead>
     			<tr>
-    				<th>Key</th>
-    				<th>Value</th>
+    				<th>{% trans "Variable" %}</th>
+    				<th>{% trans "Value" %}</th>
     			</tr>
     		</thead>
     		<tbody>
@@ -98,6 +99,6 @@
     		</tbody>
     	</table>
     {% else %}
-    	<p>None</p>
+    	<p>{% trans "No POST data" %}</p>
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 8c65700..1b9d452 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Setting</th>
-    			<th>Value</th>
+    			<th>{% trans "Setting" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index c7a7733..fccf7ff 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 <div class="boxed">
     <table>
         <thead>
             <tr>
-                <th>Signal</th>
+                <th>{% trans "Signal" %}</th>
                 <th>Providing Args</th>
                 <th>Receivers</th>
             </tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index bb805e6..cac2e47 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<thead>
     		<tr>
-    			<th>Time&nbsp;(ms)</th>
-    			<th>Action</th>
+    			<th>{% trans "Time" %}&nbsp;(ms)</th>
+    			<th>{% trans "Action" %}</th>
     			<th>Stacktrace</th>
     			<th>Query</th>
     		</tr>
@@ -27,9 +28,9 @@
     					<div class="djSQLHideStacktraceDiv" style="display:none;">
     						<table>
     							<tr>
-    								<th>Line</th>
-    								<th>Method</th>
-    								<th>File</th>
+    								<th>{% trans "Line" %}</th>
+    								<th>{% trans "Method" %}</th>
+    								<th>{% trans "File" %}</th>
     							</tr>
     							{% for file, line, method in query.stacktrace %}
     								<tr>
@@ -47,5 +48,4 @@
     		{% endfor %}
     	</tbody>
     </table>
-</div>
-
+</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 d26a8a3..38249b3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Explained</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	<table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index c5410f8..7df65da 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Profiled</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	<table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 4fc928d..e4d6027 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,12 +1,13 @@
+{% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;Back</a>
+	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
 	<h3>SQL Selected</h3>
 </div>
 <div class="djDebugPanelContent">
 	<dl>
-		<dt>Executed SQL</dt>
+		<dt>{% trans "Executed SQL" %}</dt>
 		<dd><pre>{{ sql|safe }}</pre></dd>
-		<dt>Time</dt>
+		<dt>{% trans "Time" %}</dt>
 		<dd>{{ time }} ms</dd>
 	</dl>
 	{% if result %}
@@ -29,6 +30,6 @@
 		</tbody>
 	</table>
 	{% else %}
-		<p>Empty set</p>
+		<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 2094a3f..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,5 @@
-<a class="close back" href="">Back</a>
+{% load i18n %}
+<a class="close back" href="">{% trans "Back" %}</a>
 <h3>Template Source: <code>{{ template_name }}</code></h3>
 <div class="panelScrollWrap">
     <div class="panelScrollContent">
@@ -6,4 +7,4 @@
             {{ 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 622321f..194e477 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <h4>Template path{{ template_dirs|length|pluralize }}</h4>
 <div class="boxed">
 {% if template_dirs %}
@@ -11,7 +12,7 @@
 {% endif %}
 </div>
 
-<h4>Template{{ templates|length|pluralize }}</h4>
+<h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4>
 <div class="boxed">
     {% if templates %}
     <dl>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index ba801b2..d089276 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div class="boxed">
     <table>
     	<colgroup>
@@ -6,8 +7,8 @@
     	</colgroup>
     	<thead>
     		<tr>
-    			<th>Key</th>
-    			<th>Value</th>
+    			<th>{% trans "Resource" %}</th>
+    			<th>{% trans "Value" %}</th>
     		</tr>
     	</thead>
     	<tbody>
@@ -19,4 +20,4 @@
     		{% endfor %}
     	</tbody>
     </table>
-</div>
+</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 1f5c84b..5611977 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <html>
 <head>
 </head>
@@ -5,9 +6,9 @@
 <h1>HttpResponseRedirect</h1>
 <p>Location: <a href="{{ redirect_to|urlencode }}">{{ redirect_to }}</a></p>
 <p class="notice">
-	The Django Debug Toolbar has intercepted a redirect to the above URL for
+	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for
 	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
+	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>.
 </p>
-- 
cgit v1.2.3


From 0c9ea213680018837059f8b8e0186a6d213862a3 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Mon, 24 Aug 2009 16:16:36 -0700
Subject: Some locale tweaks and template tweaks after merge.

---
 .../templates/debug_toolbar/panels/headers.html    |  34 ++--
 .../templates/debug_toolbar/panels/logger.html     |  50 +++---
 .../debug_toolbar/panels/request_vars.html         | 176 ++++++++++-----------
 .../debug_toolbar/panels/settings_vars.html        |  34 ++--
 .../templates/debug_toolbar/panels/signals.html    |  38 ++---
 .../templates/debug_toolbar/panels/sql.html        |  98 ++++++------
 .../debug_toolbar/panels/template_source.html      |  22 +--
 .../templates/debug_toolbar/panels/templates.html  |  56 +++----
 .../templates/debug_toolbar/panels/timer.html      |  42 ++---
 .../templates/debug_toolbar/redirect.html          |   4 +-
 10 files changed, 279 insertions(+), 275 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index ef153bf..957a021 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>
-</div>
\ No newline at end of file
+	<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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 080f955..515742c 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 %}
-</div>
\ No newline at end of file
+	{% 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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index c2797dc..b1d7233 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 %}
+	{% 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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1b9d452..1591966 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>
-</div>
\ No newline at end of file
+	<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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index fccf7ff..94414ea 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>
-</div>
\ No newline at end of file
+	<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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index cac2e47..aecfad6 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>
-</div>
\ No newline at end of file
+	<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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index a9d6a88..8e8253d 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>
\ No newline at end of file
+<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>
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..9fd479f 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>
-</div>
\ No newline at end of file
+	<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>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index 5611977..1128cea 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -8,9 +8,9 @@
 <p class="notice">
 	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for
 	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" %}
+	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>
-- 
cgit v1.2.3


From 760653360fa9d3bd09047dcbea7785717e54a83b Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Tue, 25 Aug 2009 17:25:36 +0300
Subject: Removed tons of invalid ".boxed" classes, renamed boxed -> scroll

---
 debug_toolbar/templates/debug_toolbar/base.html    |   4 +-
 .../templates/debug_toolbar/panels/headers.html    |  32 ++--
 .../templates/debug_toolbar/panels/logger.html     |  49 +++---
 .../debug_toolbar/panels/request_vars.html         | 176 ++++++++++-----------
 .../debug_toolbar/panels/settings_vars.html        |  32 ++--
 .../templates/debug_toolbar/panels/signals.html    |  36 ++---
 .../templates/debug_toolbar/panels/sql.html        |  92 ++++++-----
 .../debug_toolbar/panels/template_source.html      |   8 +-
 .../templates/debug_toolbar/panels/templates.html  |  60 ++++---
 .../templates/debug_toolbar/panels/timer.html      |  40 +++--
 10 files changed, 250 insertions(+), 279 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index b80daef..dc8ccf9 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -56,7 +56,9 @@
 					<h3>{{ panel.title|safe }}</h3>
 				</div>
 				<div class="djDebugPanelContent">
-					{{ panel.content|safe }}
+				    <div class="scroll">
+				        {{ panel.content|safe }}
+				    </div>
 				</div>
 			</div>
 		{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html
index 957a021..f251056 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -1,19 +1,17 @@
 {% load i18n %}
-<div class="boxed">
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans "Key" %}</th>
-				<th>{% trans "Value" %}</th>
+<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>
-		</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>
+		{% endfor %}
+	</tbody>
+</table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 515742c..5e8b652 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -1,27 +1,26 @@
 {% 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>
+{% 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>
-			</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>
+			{% endfor %}
+		</tbody>
+	</table>
+{% else %}
+	<p>{% trans "No messages logged" %}.</p>
+{% endif %}
+
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index b1d7233..3fdbf74 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -1,104 +1,96 @@
 {% 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>
+{% 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>
-			</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>
+			{% endfor %}
+		</tbody>
+	</table>
+{% else %}
+	<p>{% trans "No COOKIE data" %}</p>
+{% endif %}
 
 <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>
+{% 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>
-			</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>
+			{% endfor %}
+		</tbody>
+	</table>
+{% else %}
+	<p>{% trans "No SESSION data" %}</p>
+{% endif %}
 
 <h4>GET Variables</h4>
-<div class="boxed">
-	{% if get %}
-		<table>
-			<thead>
-				<tr>
-					<th>{% trans "Variable" %}</th>
-					<th>{% trans "Value" %}</th>
+{% 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>
-			</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>
+			{% endfor %}
+		</tbody>
+	</table>
+{% else %}
+	<p>{% trans "No GET data" %}</p>
+{% endif %}
 
 <h4>POST Variables</h4>
-<div class="boxed">
-	{% if post %}
-		<table>
-			<thead>
-				<tr>
-					<th>{% trans "Variable" %}</th>
-					<th>{% trans "Value" %}</th>
+{% 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>
-			</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>
+			{% endfor %}
+		</tbody>
+	</table>
+{% else %}
+	<p>{% trans "No POST data" %}</p>
+{% endif %}
\ 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 1591966..99c43b6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -1,19 +1,17 @@
 {% load i18n %}
-<div class="boxed">
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans "Setting" %}</th>
-				<th>{% trans "Value" %}</th>
+<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>
-		</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>
+		{% endfor %}
+	</tbody>
+</table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index 94414ea..d6d681c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,21 +1,19 @@
 {% load i18n %}
-<div class="boxed">
-	<table>
-		<thead>
-			<tr>
-				<th>{% trans "Signal" %}</th>
-				<th>Providing Args</th>
-				<th>Receivers</th>
+<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>
-		</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>
+		{% endfor %}
+	</tbody>
+</table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index aecfad6..7aa4c2d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,51 +1,49 @@
 {% 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 %}
+<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 %}
-					</td>
-					<td>
-						{% if query.stacktrace %}
-						<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
-						<div class="djSQLHideStacktraceDiv" style="display:none;">
-							<table>
+				{% 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>
-									<th>{% trans "Line" %}</th>
-									<th>{% trans "Method" %}</th>
-									<th>{% trans "File" %}</th>
+									<td>{{ line }}</td>
+									<td><pre>{{ method|escape }}<pre></td>
+									<td><pre>{{ file|escape }}</pre></td>
 								</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>
+							{% endfor %}
+						</table>
+					</div>
+					{% endif %}
+				</td>
+				<td class="syntax">{{ query.sql|safe }}</td>
+			</tr>
+		{% endfor %}
+	</tbody>
+</table>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 8e8253d..192d1af 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -4,11 +4,5 @@
 	<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>
+	{{ source }}
 </div>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index d4e18b5..872a5f5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,6 +1,5 @@
 {% load i18n %}
 <h4>Template path{{ template_dirs|length|pluralize }}</h4>
-<div class="boxed">
 {% if template_dirs %}
 	<ol>
 	{% for template in template_dirs %}
@@ -10,39 +9,34 @@
 {% else %}
 	<p>None</p>
 {% endif %}
-</div>
 
 <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 %}
-</div>
+{% 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 %}
 
 <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>
+{% 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 %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 9fd479f..f267de1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,23 +1,21 @@
 {% load i18n %}
-<div class="boxed">
-	<table>
-		<colgroup>
-			<col style="width:20%"/>
-			<col/>
-		</colgroup>
-		<thead>
-			<tr>
-				<th>{% trans "Resource" %}</th>
-				<th>{% trans "Value" %}</th>
+<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>
-		</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>
+		{% endfor %}
+	</tbody>
+</table>
-- 
cgit v1.2.3


From 0e65f95980e8cd2e84055ddbe52c3c40010353e2 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Tue, 25 Aug 2009 19:14:31 +0300
Subject: Added toggle arrows, grey boxes for template links

---
 debug_toolbar/templates/debug_toolbar/panels/templates.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 872a5f5..1158abe 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -14,10 +14,10 @@
 {% 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>
+	<dt><strong><a class="remoteCall toggleTemplate" 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="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">&#x25B6;</span> Toggle Context</a></div>
 		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div>
 	</dd>
 {% endfor %}
@@ -32,7 +32,7 @@
 {% 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="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">&#x25B6;</span> Toggle Context</a></div>
 		<div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div>
 	</dd>
 {% endfor %}
-- 
cgit v1.2.3


From 4a59813e75d7cb3b88bf2b223b21d4e23d9ecb03 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 28 Aug 2009 09:13:37 -0700
Subject: Fixed sql profiling so it doesn't return a 500 if the SQL `SET
 PROFILING=1` results in an error.  Also fixed view to render the correct
 template.

---
 .../debug_toolbar/panels/sql_profile.html          | 51 ++++++++++++----------
 1 file changed, 29 insertions(+), 22 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index 7df65da..0dcb0b9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -4,28 +4,35 @@
 	<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>
-		</thead>
-		<tbody>
-			{% for row in result %}
-				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-					{% for column in row %}
-						<td>{{ column|escape }}</td>
+	{% if result %}
+		<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>
+	{% else %}
+		<dl>
+			<dt>{% trans 'Error' %}</dt>
+			<dd>{{ result_error }}</dd>
+		</dl>
+	{% endif %}
 </div>
-- 
cgit v1.2.3


From f97ff555a4d8f22dae83bcfd0c2dcf6e846962c9 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 28 Aug 2009 09:21:39 -0700
Subject: Refactored SQL panel to use datetime objects and added a visual
 display of both duration and sequence to the SQL template.

---
 debug_toolbar/templates/debug_toolbar/panels/sql.html     | 15 ++++++++++-----
 .../templates/debug_toolbar/panels/sql_explain.html       |  4 ++--
 .../templates/debug_toolbar/panels/sql_profile.html       |  4 ++--
 .../templates/debug_toolbar/panels/sql_select.html        |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 7aa4c2d..9c8bfa6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -11,13 +11,13 @@
 	<tbody>
 		{% for query in queries %}
 			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
-				<td>{{ query.time|floatformat:"2" }}</td>
+				<td>{{ query.duration|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>
+					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
+					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|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>
+						<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
 					{% endif %}
 				{% endif %}
 				</td>
@@ -42,7 +42,12 @@
 					</div>
 					{% endif %}
 				</td>
-				<td class="syntax">{{ query.sql|safe }}</td>
+				<td class="syntax">
+					<div class="djDebugSqlWrap">
+						<div class="djDebugSql">{{ query.sql|safe }}</div>
+						<span class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" style="width:{{ query.width_ratio }}%; left:{{ query.start_offset }}%;"</span>
+					</div>
+				</td>
 			</tr>
 		{% endfor %}
 	</tbody>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index 38249b3..a21ec59 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -6,9 +6,9 @@
 <div class="djDebugPanelContent">
 	<dl>
 		<dt>{% trans "Executed SQL" %}</dt>
-		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dd>{{ sql|safe }}</dd>
 		<dt>{% trans "Time" %}</dt>
-		<dd>{{ time }} ms</dd>
+		<dd>{{ duration }} ms</dd>
 	</dl>
 	<table>
 		<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index 0dcb0b9..a15574e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -7,9 +7,9 @@
 	{% if result %}
 		<dl>
 			<dt>{% trans "Executed SQL" %}</dt>
-			<dd><pre>{{ sql|safe }}</pre></dd>
+			<dd>{{ sql|safe }}</dd>
 			<dt>{% trans "Time" %}</dt>
-			<dd>{{ time }} ms</dd>
+			<dd>{{ duration }} ms</dd>
 		</dl>
 		<table>
 			<thead>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index e4d6027..66835c8 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -6,9 +6,9 @@
 <div class="djDebugPanelContent">
 	<dl>
 		<dt>{% trans "Executed SQL" %}</dt>
-		<dd><pre>{{ sql|safe }}</pre></dd>
+		<dd>{{ sql|safe }}</dd>
 		<dt>{% trans "Time" %}</dt>
-		<dd>{{ time }} ms</dd>
+		<dd>{{ duration }} ms</dd>
 	</dl>
 	{% if result %}
 	<table>
-- 
cgit v1.2.3


From d23196e480faa01bc96605260bdf58b595010b1d Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 1 Sep 2009 06:56:36 -0700
Subject: Fixed translated string in redirect template.

---
 debug_toolbar/templates/debug_toolbar/redirect.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index d0d9b35..068fe8c 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -6,11 +6,7 @@
 <h1>HttpResponseRedirect</h1>
 <p>Location: <a href="{{ redirect_to|urlencode }}">{{ redirect_to }}</a></p>
 <p class="notice">
-	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for
-	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>." %}
+	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for 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>." %}
 </p>
 </body>
 </html>
-- 
cgit v1.2.3


From e8527b23ccdb9a484166dd648e4751e6b24fedaf Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Mon, 7 Sep 2009 08:54:36 -0700
Subject: Used spaceless tag to tighten up debug toolbar HTML output.

---
 debug_toolbar/templates/debug_toolbar/base.html       | 2 ++
 debug_toolbar/templates/debug_toolbar/panels/sql.html | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index dc8ccf9..d1ee273 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% spaceless %}
 <script type="text/javascript" charset="utf-8">
 	// When jQuery is sourced, it's going to overwrite whatever might be in the
 	// '$' variable, so store a reference of it in a temporary variable...
@@ -65,3 +66,4 @@
 	{% endfor %}
 	<div id="djDebugWindow" class="panelContent"></div>
 </div>
+{% endspaceless %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 9c8bfa6..81188a9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -14,10 +14,10 @@
 				<td>{{ query.duration|floatformat:"2" }}</td>
 				<td>
 				{% if query.params %}
-					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
-					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
+					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a><br>
+					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a><br>
 					{% if is_mysql %}
-						<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
+						<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a><br>
 					{% endif %}
 				{% endif %}
 				</td>
-- 
cgit v1.2.3


From 6445ef28c70018d8e44db1fc68c8d30ce3c1f777 Mon Sep 17 00:00:00 2001
From: Mikhail Korobov
Date: Tue, 1 Sep 2009 20:33:22 +0600
Subject: Allow template source to be scrollable

Signed-off-by: Rob Hudson <rob@cogit8.org>
---
 debug_toolbar/templates/debug_toolbar/panels/template_source.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 192d1af..3b265a9 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -4,5 +4,7 @@
 	<h3>Template Source: <code>{{ template_name }}</code></h3>
 </div>
 <div class="djDebugPanelContent">
-	{{ source }}
+    <div class='scroll'>
+    	{{ source }}
+    </div>
 </div>
-- 
cgit v1.2.3


From 81da67bbfcd18ac9802f652155c331229d7967f2 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Mon, 7 Sep 2009 09:47:38 -0700
Subject: Fixed template source to work nicely with and without Pygments.

---
 .../templates/debug_toolbar/panels/template_source.html        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 3b265a9..7074f4f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -4,7 +4,11 @@
 	<h3>Template Source: <code>{{ template_name }}</code></h3>
 </div>
 <div class="djDebugPanelContent">
-    <div class='scroll'>
-    	{{ source }}
-    </div>
+	<div class="scroll">
+		{% if not source.pygmentized %}
+			<pre>{{ source }}</pre>
+		{% else %}
+			{{ source }}
+		{% endif %}
+	</div>
 </div>
-- 
cgit v1.2.3


From 80d72869a9a950b1598aec71b8534fcc58d54a3c Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 9 Sep 2009 01:40:55 +0300
Subject: Fixed back buttons on SQL explain/select/profile subpanels.

---
 debug_toolbar/templates/debug_toolbar/panels/sql_explain.html | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/sql_profile.html | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/sql_select.html  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index a21ec59..57fa538 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<a class="close back" href="">{% trans "Back" %}</a>
 	<h3>SQL Explained</h3>
 </div>
 <div class="djDebugPanelContent">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index a15574e..a3d3240 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<a class="close back" href="">{% trans "Back" %}</a>
 	<h3>SQL Profiled</h3>
 </div>
 <div class="djDebugPanelContent">
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 66835c8..a240b07 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="djDebugPanelTitle">
-	<a class="back" href="">&laquo;&nbsp;{% trans "Back" %}</a>
+	<a class="close back" href="">{% trans "Back" %}</a>
 	<h3>SQL Selected</h3>
 </div>
 <div class="djDebugPanelContent">
-- 
cgit v1.2.3


From 608e3ce3e79e3c2d073cf72d1071b71b324485ee Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 8 Sep 2009 15:58:43 -0700
Subject: Updated toolbar to use minified versions of js and css.

---
 debug_toolbar/templates/debug_toolbar/base.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index d1ee273..f220b62 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -9,14 +9,13 @@
 		document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
 	}
 </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" src="{{ BASE_URL }}/__debug__/m/toolbar.min.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.css);
+	@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);
 </style>
 <div id="djDebug">
 	<div style="display:none;" id="djDebugToolbar">
-- 
cgit v1.2.3