From abc3351bcfd3b2d1aa9c317bc592f96092226ceb Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Sat, 6 Sep 2008 14:22:25 -0700 Subject: Updating rendering to use Django templates and could possibly be overridden. --- debug_toolbar/models.py | 0 debug_toolbar/templates/debug_toolbar/base.html | 37 +++++++++++++++++++++++++ debug_toolbar/toolbar/loader.py | 33 ++-------------------- 3 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 debug_toolbar/models.py create mode 100644 debug_toolbar/templates/debug_toolbar/base.html (limited to 'debug_toolbar') diff --git a/debug_toolbar/models.py b/debug_toolbar/models.py new file mode 100644 index 0000000..e69de29 diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html new file mode 100644 index 0000000..c6469d4 --- /dev/null +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -0,0 +1,37 @@ + +
+
+ + {% for panel in panels %} +
+

{{ panel.title }}

+ {{ panel.content|safe }} +
+ {% endfor %} +
+
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py index 4c3efa2..f4cc068 100644 --- a/debug_toolbar/toolbar/loader.py +++ b/debug_toolbar/toolbar/loader.py @@ -1,6 +1,8 @@ """ The main DebugToolbar class that loads and renders the Toolbar. """ +from django.template.loader import render_to_string + class DebugToolbar(object): def __init__(self): @@ -37,37 +39,8 @@ class DebugToolbar(object): self.panels.append(panel_instance) - def render_panels(self): - """ - Renders each panel. - """ - for panel in self.panels: - div_id = 'djDebug%sPanel' % (panel.title().replace(' ', '')) - self.panel_list.append('
  • %(title)s
  • ' % ({ - 'title': panel.title(), - 'url': panel.url() or '#', - })) - self.content_list.append('

    %(title)s

    %(content)s
    ' % ({ - 'div_id': div_id, - 'title': panel.title(), - 'content': panel.content(), - })) - def render_toolbar(self): """ Renders the overall Toolbar with panels inside. """ - self.render_panels() - template = """ -
    - - %(contents)s -
    - """ - context = { - 'panels': ''.join(self.panel_list), - 'contents': ''.join(self.content_list), - } - return template % context + return render_to_string('debug_toolbar/base.html', {'panels': self.panels}) -- cgit v1.2.3