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