From 9d335bed8c83981370429833d1c5fd7f31b97a5e Mon Sep 17 00:00:00 2001
From: Reto Aebersold
Date: Sat, 17 Jan 2009 12:18:19 -0800
Subject: Adding ability to show/hide toolbar, using jquery.cookie.js for
 statefulness.

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

(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..3b8e92e 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -4,14 +4,19 @@
 		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.min.js"></script>
 <script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.min.js"></script>
 <style type="text/css">
 	@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);
 </style>
 <div id="djDebug">
-	<div id="djDebugToolbar">
+	<div style="display: none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
+			{% if panels %}
+			<li><a id="djHideToolBarButton" href="#" title="Hide Toolbar">&laquo; Hide</a></li>
+			{% else %}
 			<li id="djDebugButton">DEBUG</li>
+			{% endif %}
 			{% for panel in panels %}
 				<li>
 					{% if panel.has_content %}
@@ -23,6 +28,11 @@
 			{% endfor %}
 		</ul>
 	</div>
+	<div style="display: none;" id="djDebugToolbarHandle">
+		<ul id="djDebugPanelList">
+			<li><a title="Show Toolbar" id="djShowToolBarButton" href="#">&raquo;</a></li>
+		</ul>
+	</div>
 	{% for panel in panels %}
 		{% if panel.has_content %}
 			<div id="{{ panel.dom_id }}" class="panelContent">
-- 
cgit v1.2.3


From ed520f265d71ea61ff8c04ae3a0aa4246d447ae7 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sat, 17 Jan 2009 12:29:51 -0800
Subject: Adjust Makefile to concatenate to jquery.cookie.js onto
 toolbar.min.js.

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

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 3b8e92e..7277620 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -4,7 +4,6 @@
 		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.min.js"></script>
 <script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.min.js"></script>
 <style type="text/css">
 	@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);
-- 
cgit v1.2.3


From 85bd265bd5fe9dda44c67c2b2e618a79c2fb8fdc Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 23 Jan 2009 10:59:59 -0800
Subject: Add preliminary support for stacktraces to see where SQL queries are
 coming from.

I'm wanting to test this a bit more before I merge it in fully.  Feedback welcome.---
 .../templates/debug_toolbar/panels/sql.html        | 22 ++++++++++++++++++++++
 1 file changed, 22 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 7de2220..1896e3c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -4,6 +4,7 @@
 		<tr>
 			<th>Time&nbsp;(ms)</th>
 			<th>Action</th>
+			<th>Stacktrace</th>
 			<th>Query</th>
 		</tr>
 	</thead>
@@ -20,6 +21,27 @@
 					{% 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 s in query.stacktrace %}
+								<tr>
+									<td>{{ s.1 }}</td>
+									<td><pre>{{ s.2|escape }}<pre></td>
+									<td><pre>{{ s.0|escape }}</pre></td>
+								</tr>
+							{% endfor %}
+						</table>
+					</div>
+					{% endif %}
+				</td>
 				<td class="syntax">{{ query.sql|safe }}</td>
 			</tr>
 		{% endfor %}
-- 
cgit v1.2.3


From 1a52939905b7a43a9cf83cde6216a98cc5cbc595 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 23 Jan 2009 11:45:14 -0800
Subject: Tuple unpacking of stacktrace variables for niceness.

---
 debug_toolbar/templates/debug_toolbar/panels/sql.html | 8 ++++----
 1 file changed, 4 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 1896e3c..d08f93e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -31,11 +31,11 @@
 								<th>Method</th>
 								<th>File</th>
 							</tr>
-							{% for s in query.stacktrace %}
+							{% for file, line, method in query.stacktrace %}
 								<tr>
-									<td>{{ s.1 }}</td>
-									<td><pre>{{ s.2|escape }}<pre></td>
-									<td><pre>{{ s.0|escape }}</pre></td>
+									<td>{{ line }}</td>
+									<td><pre>{{ method|escape }}<pre></td>
+									<td><pre>{{ file|escape }}</pre></td>
 								</tr>
 							{% endfor %}
 						</table>
-- 
cgit v1.2.3


From 8c64bb0cc82c6129b4ab14ff4cc80880761680d4 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sat, 21 Mar 2009 08:49:19 -0700
Subject: Making CSS classes 'odd' and 'even' more specific.

---
 debug_toolbar/templates/debug_toolbar/panels/headers.html       | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/logger.html        | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/request_vars.html  | 6 +++---
 debug_toolbar/templates/debug_toolbar/panels/settings_vars.html | 2 +-
 debug_toolbar/templates/debug_toolbar/panels/sql.html           | 2 +-
 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 +-
 debug_toolbar/templates/debug_toolbar/panels/timer.html         | 2 +-
 9 files changed, 11 insertions(+), 11 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..005ffe6 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/headers.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html
@@ -8,7 +8,7 @@
 	</thead>
 	<tbody>
 		{% for key, value in headers.iteritems %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ key|escape }}</td>
 				<td>{{ value|escape }}</td>
 			</tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index c079065..2117529 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -11,7 +11,7 @@
 		</thead>
 		<tbody>
 			{% for record in records %}
-				<tr class="{% cycle 'odd' 'even' %}">
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 					<td>{{ record.level }}</td>
 					<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
 					<td>{{ record.message }}</td>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
index fe317ae..b7d53ee 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html
@@ -13,7 +13,7 @@
 		</thead>
 		<tbody>
 			{% for key, value in cookies %}
-				<tr class="{% cycle 'odd' 'even' %}">
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 					<td>{{ key|escape }}</td>
 					<td>{{ value|escape }}</td>
 				</tr>
@@ -38,7 +38,7 @@
 		</thead>
 		<tbody>
 			{% for key, value in session %}
-				<tr class="{% cycle 'odd' 'even' %}">
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 					<td>{{ key|escape }}</td>
 					<td>{{ value|escape }}</td>
 				</tr>
@@ -59,7 +59,7 @@
 		</thead>
 		<tbody>
 			{% for key, value in get %}
-				<tr class="{% cycle 'odd' 'even' %}">
+				<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 					<td>{{ key|escape }}</td>
 					<td>{{ value|join:", "|escape }}</td>
 				</tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
index 1d332bf..93f0b34 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
@@ -8,7 +8,7 @@
 	</thead>
 	<tbody>
 		{% for var in settings.items|dictsort:"0" %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ var.0 }}</td>
 				<td><code>{{ var.1|pprint }}</code></td>
 			</tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 7de2220..0c8e9c3 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -9,7 +9,7 @@
 	</thead>
 	<tbody>
 		{% for query in queries %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ query.time|floatformat:"2" }}</td>
 				<td>
 				{% if query.params %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
index dc306f0..a163b25 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -16,7 +16,7 @@
 	</thead>
 	<tbody>
 		{% for row in result %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				{% for column in row %}
 					<td>{{ column|escape }}</td>
 				{% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
index c1d04ce..e46f41d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -16,7 +16,7 @@
 	</thead>
 	<tbody>
 		{% for row in result %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				{% for column in row %}
 					<td>{{ column|escape }}</td>
 				{% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
index 73109ef..17e7d48 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -17,7 +17,7 @@
 	</thead>
 	<tbody>
 		{% for row in result %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				{% for column in row %}
 					<td>{{ column|escape }}</td>
 				{% endfor %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 1b077c6..831ff86 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -12,7 +12,7 @@
 	</thead>
 	<tbody>
 		{% for key, value in rows %}
-			<tr class="{% cycle 'odd' 'even' %}">
+			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ key|escape }}</td>
 				<td>{{ value|escape }}</td>
 			</tr>
-- 
cgit v1.2.3


From ea1f9430ddb58f28b50cc702f9eb2612f19e308d Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sun, 22 Mar 2009 23:41:15 -0700
Subject: Add fix so jQuery doesn't conflict with other Javascript libraries.

I think I finally got this one working.  The saving of the temporary variable has to happen *before* jQuery loads, or else jQuery has already stomped on the '$' variable that another library might have used.  This patch moves the temporary saving of this variable the HTML template so it tucks it aside before jQuery loads and puts it back after we're done.  Tested and works with jQuery, mootools, and prototype.---
 debug_toolbar/templates/debug_toolbar/base.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 7277620..52b7a5b 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,10 +1,17 @@
 <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...
+	var _$ = window.$;
 	if (typeof jQuery == 'undefined') {
 		var jquery_url = '{{ BASE_URL }}/__debug__/m/jquery.js';
 		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" 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);
 </style>
-- 
cgit v1.2.3


From 1956ee540c75f9d4226f0352df5b06aae5c02703 Mon Sep 17 00:00:00 2001
From: Alex Gaynor
Date: Wed, 27 May 2009 19:17:24 -0700
Subject: Adding a signals panel to display list of signals and their providing
 arguments and receivers.  Thanks Alex Gaynor!

Signed-off-by: Rob Hudson <rob@cogit8.org>
---
 .../templates/debug_toolbar/panels/signals.html       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 debug_toolbar/templates/debug_toolbar/panels/signals.html

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
new file mode 100644
index 0000000..e9a189e
--- /dev/null
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -0,0 +1,19 @@
+<h3>Signals</h3>
+<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>
+            </tr>
+        {% endfor %}
+    </tbody>
+</table>
-- 
cgit v1.2.3


From 4dc0710b6a5eedec0448909f6b90e55a4f3555d4 Mon Sep 17 00:00:00 2001
From: Philip Zeyliger
Date: Sat, 2 May 2009 00:46:02 +0800
Subject: Captured redirection requests must be urlencoded.

I ran into this when I had a URL with a ? (%3F) mark in it.

Signed-off-by: Rob Hudson <rob@tastybrew.com>---
 debug_toolbar/templates/debug_toolbar/redirect.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
index afdccc4..1f5c84b 100644
--- a/debug_toolbar/templates/debug_toolbar/redirect.html
+++ b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -3,7 +3,7 @@
 </head>
 <body>
 <h1>HttpResponseRedirect</h1>
-<p>Location: <a href="{{ redirect_to }}">{{ redirect_to }}</a></p>
+<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
 	debug viewing purposes.  You can click the above link to continue with the
-- 
cgit v1.2.3