diff options
| author | Rob Hudson | 2008-09-08 10:12:47 -0700 |
|---|---|---|
| committer | Rob Hudson | 2008-09-08 10:12:47 -0700 |
| commit | e403821323d529980407c05da77409c7e1c5c2a0 (patch) | |
| tree | 1252bd3bfd2783bde327816a71f50ca35eb73249 /debug_toolbar | |
| parent | 3da89d05d1157798aa8c5a56e330b76f78bae47b (diff) | |
| download | django-debug-toolbar-e403821323d529980407c05da77409c7e1c5c2a0.tar.bz2 | |
convert panels with content to use file based templates for overriding ability
Diffstat (limited to 'debug_toolbar')
| -rw-r--r-- | debug_toolbar/panels/headers.py | 25 | ||||
| -rw-r--r-- | debug_toolbar/panels/sql.py | 14 |
2 files changed, 11 insertions, 28 deletions
diff --git a/debug_toolbar/panels/headers.py b/debug_toolbar/panels/headers.py index ab39b85..d75cb25 100644 --- a/debug_toolbar/panels/headers.py +++ b/debug_toolbar/panels/headers.py @@ -1,4 +1,4 @@ -from django.template import Context, Template +from django.template.loader import render_to_string from debug_toolbar.panels import DebugPanel class HeaderDebugPanel(DebugPanel): @@ -7,7 +7,7 @@ class HeaderDebugPanel(DebugPanel): """ name = 'Header' # List of headers we want to display - header_filter = [ + header_filter = ( 'CONTENT_TYPE', 'HTTP_ACCEPT', 'HTTP_ACCEPT_CHARSET', @@ -28,7 +28,8 @@ class HeaderDebugPanel(DebugPanel): 'SERVER_PORT', 'SERVER_PROTOCOL', 'SERVER_SOFTWARE', - ] + ) + def title(self): return 'HTTP Headers' @@ -36,17 +37,7 @@ class HeaderDebugPanel(DebugPanel): return '' def content(self): - t = Template(''' - <dl> - {% for h in headers %} - <dt><strong>{{ h.key }}</strong></dt> - <dd>{{ h.value }}</dd> - {% endfor %} - </dl> - ''') - headers = [] - for k, v in self.request.META.iteritems(): - if k in self.header_filter: - headers.append({'key': k, 'value': v}) - c = Context({'headers': headers}) - return t.render(c) + context = { + 'headers': dict([(k, self.request.META[k]) for k in self.header_filter if k in self.request.META]), + } + return render_to_string('debug_toolbar/panels/headers.html', context)
\ No newline at end of file diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py index 2cc981b..d699e1a 100644 --- a/debug_toolbar/panels/sql.py +++ b/debug_toolbar/panels/sql.py @@ -1,6 +1,6 @@ from debug_toolbar.panels import DebugPanel from django.db import connection -from django.template import Context, Template +from django.template.loader import render_to_string class SQLDebugPanel(DebugPanel): """ @@ -15,13 +15,5 @@ class SQLDebugPanel(DebugPanel): return '' def content(self): - t = Template(''' - <dl> - {% for q in queries %} - <dt><strong>{{ q.time }}</strong></dt> - <dd>{{ q.sql }}</dd> - {% endfor %} - </dl> - ''') - c = Context({'queries': connection.queries}) - return t.render(c) + context = {'queries': connection.queries} + return render_to_string('debug_toolbar/panels/sql.html', context) |
