aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/templates
diff options
context:
space:
mode:
authorRob Hudson2011-04-25 11:26:21 -0700
committerRob Hudson2011-04-25 11:26:21 -0700
commit930f33bfe9526cc7b917853da473a358ec5fc071 (patch)
tree6580aaf0caf8a62d4bcf6c8bb7b2c60bfd7e73f4 /debug_toolbar/templates
parent8cb8abae8cec44909947dbe54e1ed644deeecbd6 (diff)
parent6479ad305ab763a5eceb68c8eb0806caa6b63f77 (diff)
downloaddjango-debug-toolbar-0.8.5.tar.bz2
Merge branch 'release/v0.8.5'v0.8.5
Diffstat (limited to 'debug_toolbar/templates')
-rw-r--r--debug_toolbar/templates/debug_toolbar/base.html1
-rw-r--r--debug_toolbar/templates/debug_toolbar/panels/logger.html2
-rw-r--r--debug_toolbar/templates/debug_toolbar/panels/sql.html2
3 files changed, 4 insertions, 1 deletions
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 0fe64ca..7f7a535 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,5 +1,4 @@
{% load i18n %}
-<style type="text/css">@media print { #djDebug {display:none;}}</style>
<script type="text/javascript">
// <![CDATA[
var DEBUG_TOOLBAR_MEDIA_URL = "{{ DEBUG_TOOLBAR_MEDIA_URL }}";
diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html
index 5e8b652..c41749e 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/logger.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html
@@ -5,6 +5,7 @@
<tr>
<th>{% trans "Level" %}</th>
<th>{% trans "Time" %}</th>
+ <th>{% trans "Channel" %}</th>
<th>{% trans "Message" %}</th>
<th>{% trans "Location" %}</th>
</tr>
@@ -14,6 +15,7 @@
<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
<td>{{ record.level }}</td>
<td>{{ record.time|date:"h:i:s m/d/Y" }}</td>
+ <td>{{ record.channel|default:"-" }}</td>
<td>{{ record.message }}</td>
<td>{{ record.file }}:{{ record.line }}</td>
</tr>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index 9ed87ca..626ec5c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -5,6 +5,7 @@
<th>{% trans "Time" %}&nbsp;(ms)</th>
<th>{% trans "Action" %}</th>
<th>{% trans 'Stacktrace' %}</th>
+ <th>{% trans 'Alias' %}</th>
<th>{% trans 'Query' %}</th>
</tr>
</thead>
@@ -28,6 +29,7 @@
<div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div>
{% endif %}
</td>
+ <td>{{ query.alias }}</td>
<td class="syntax">
<div class="djDebugSqlWrap">
<div class="djDebugSql">{{ query.sql|safe }}</div>