From 924361de6c1c87a5dd4db0e37b94380246d85790 Mon Sep 17 00:00:00 2001
From: Alex Gaynor
Date: Fri, 18 Sep 2009 19:29:32 -0400
Subject: Made the versions panel more powerful

---
 .../templates/debug_toolbar/panels/versions.html       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 debug_toolbar/templates/debug_toolbar/panels/versions.html

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/versions.html b/debug_toolbar/templates/debug_toolbar/panels/versions.html
new file mode 100644
index 0000000..f0ee012
--- /dev/null
+++ b/debug_toolbar/templates/debug_toolbar/panels/versions.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+
+<table>
+	<thead>
+		<tr>
+			<th>{% trans "Package" %}</th>
+			<th>{% trans "Version" %}</th>
+		</tr>
+	</thead>
+	<tbody>
+		{% for package, version in versions.iteritems %}
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
+			    <td>{{ package }}</td>
+				<td>{{ version }}</td>
+			</tr>
+		{% endfor %}
+	</tbody>
+</table>
-- 
cgit v1.2.3


From c1d19af25d3f7e76520eb93bc45d0860add6e38f Mon Sep 17 00:00:00 2001
From: Chris Lamb
Date: Wed, 14 Oct 2009 14:34:25 +0100
Subject: Move the stacktrace underneath the SQL - current column is too narrow

Signed-off-by: Chris Lamb <lamby@debian.org>
Signed-off-by: Rob Hudson <rob@cogit8.org>
---
 .../templates/debug_toolbar/panels/sql.html        | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 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 c275bea..038deaf 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -26,27 +26,29 @@
 				<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">
 					<div class="djDebugSqlWrap">
 						<div class="djDebugSql">{{ query.sql|safe }}</div>
+						{% if query.stacktrace %}
+						<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 %}
             <span class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" style="width:{{ query.width_ratio }}%; left:{{ query.start_offset }}%;"></span>
 					</div>
 				</td>
-- 
cgit v1.2.3


From 3f81a95105381a0ffabc46ae6ab84d69ace89720 Mon Sep 17 00:00:00 2001
From: Chris Lamb
Date: Wed, 14 Oct 2009 14:45:51 +0100
Subject: Show context where SQL query originated from template

Signed-off-by: Chris Lamb <lamby@debian.org>
Signed-off-by: Rob Hudson <rob@cogit8.org>
---
 debug_toolbar/templates/debug_toolbar/panels/sql.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

(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 038deaf..331306b 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -47,6 +47,17 @@
 									</tr>
 								{% endfor %}
 							</table>
+							{% if query.template_info %}
+							<table>
+								{% for line in query.template_info.context %}
+								<tr>
+									<td>{{ line.num }}</td>
+									<td><pre style="font-family: monospace;{% if line.highlight %}background-color: lightgrey{% endif %}">{{ line.content }}</pre></td>
+								</tr>
+								{% endfor %}
+							</table>
+							<p><strong>{{ query.template_info.name|default:"(unknown)" }}</strong></p>
+							{% endif %}
 						</div>
 						{% endif %}
             <span class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" style="width:{{ query.width_ratio }}%; left:{{ query.start_offset }}%;"></span>
-- 
cgit v1.2.3