";c("#djDebugWindow").html(l)}c("#djDebugWindow a.djDebugBack").click(function(){c(this).parent().parent().hide();return false})});c("#djDebugWindow").show();return false});c("#djDebugTemplatePanel a.djTemplateShowContext").click(function(){d.toggle_arrow(c(this).children(".toggleArrow"));d.toggle_content(c(this).parent().next());return false});c("#djDebug a.djToggleSwitch").click(function(l){l.preventDefault();var j=c(this);var m=j.attr("data-toggle-id");var k=j.text()==j.attr("data-toggle-open");if(m==""||!m){return}c(this).parents(".djDebugPanelContent").find(".djToggleDetails_"+m).each(function(){var n=c(this);if(k){n.addClass("djSelected");n.removeClass("djUnselected");j.text(j.attr("data-toggle-close"));n.find(".djToggleSwitch").text(j.text())}else{n.removeClass("djSelected");n.addClass("djUnselected");j.text(j.attr("data-toggle-open"));n.find(".djToggleSwitch").text(j.text())}});return});function g(j){id=j.attr("id");return c('.djDebugProfileRow[id^="'+id+'_"]')}function h(j){subcalls=g(j);depth=parseInt(j.attr("depth"))+1;return subcalls.filter("[depth="+depth+"]")}c(".djDebugProfileRow .djDebugProfileToggle").click(function(){row=c(this).closest(".djDebugProfileRow");subcalls=g(row);if(subcalls.css("display")=="none"){h(row).show()}else{subcalls.hide()}});c("#djDebug-htmlvalidator .handle-position").click(function(){c("#djDebug-htmlvalidator .repr-info-sel").removeClass("repr-info-sel");c(this).parent().parent().addClass("repr-info-sel");var q=c(this).text();var l=new RegExp("line\\s+([0-9]+)");var k=q.match(l);try{var p=k[1]}catch(o){return}var j=c(a).data("reprlineselpos")||null;if(j){j.removeClass("repr-line-sel")}c("#djDebug-htmlvalidator .repr-line-"+p).addClass("repr-line-sel");c(a).data("reprlineselpos",c(".repr-line-"+p));var n=location;if(location.href.indexOf("#repr-line-")>-1){var m=location.href.substring(0,location.href.indexOf("#repr"));n=m}location=n+"#repr-line-"+p});c("#djDebug-htmlvalidator .tidy-msg").click(function(j){c(".handle-position:first",c(this).prev()).click()});c("#djHideToolBarButton").click(function(){d.hide_toolbar(true);return false});c("#djShowToolBarButton").click(function(){d.show_toolbar();return false});c(a).bind("close.djDebug",function(){if(c("#djDebugWindow").is(":visible")){c("#djDebugWindow").hide();return}if(c(".panelContent").is(":visible")){c(".panelContent").hide();return}if(c("#djDebugToolbar").is(":visible")){d.hide_toolbar(true);return}});if(c.cookie(f)){d.hide_toolbar(false)}else{d.show_toolbar(false)}c("#djDebug .djDebugHoverable").hover(function(){c(this).addClass("djDebugHover")},function(){c(this).removeClass("djDebugHover")});d.isReady=true;c.each(d.events.ready,function(j,k){k(d)})},toggle_content:function(g){if(g.is(":visible")){g.hide()}else{g.show()}},close:function(){c(a).trigger("close.djDebug");return false},hide_toolbar:function(g){c("#djDebugWindow").hide();c(".panelContent").hide();c("#djDebugToolbar li").removeClass("active");c("#djDebugToolbar").hide("fast");c("#djDebugToolbarHandle").show();c(a).unbind("keydown.djDebug");if(g){c.cookie(f,"hide",{path:"/",expires:10})}},show_toolbar:function(g){c(a).bind("keydown.djDebug",function(h){if(h.keyCode==27){d.close()}});c("#djDebugToolbarHandle").hide();if(g){c("#djDebugToolbar").show("fast")}else{c("#djDebugToolbar").show()}c.cookie(f,null,{path:"/",expires:-1})},toggle_arrow:function(h){var g=String.fromCharCode(9654);var i=String.fromCharCode(9660);h.html(h.html()==g?i:g)},ready:function(g){if(d.isReady){g(d)}else{d.events.ready.push(g)}}};c(a).ready(function(){d.init()});return d}(window,document,jQuery.noConflict()));
\ No newline at end of file
diff --git a/debug_toolbar/panels/htmlvalidator.py b/debug_toolbar/panels/htmlvalidator.py
new file mode 100644
index 000000000..a5599180e
--- /dev/null
+++ b/debug_toolbar/panels/htmlvalidator.py
@@ -0,0 +1,92 @@
+import re
+
+try:
+ from tidylib import tidy_document
+except ImportError:
+ raise ImportError("""Please, make sure that PyTidyLib
+ module installed - it's required for HTMLValidationDebugPanel""")
+
+from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
+
+from debug_toolbar.panels import DebugPanel
+
+
+class HTMLValidationDebugPanel(DebugPanel):
+ name = "HTMLValidator"
+ has_content = True
+
+ log_data = None
+ errors_count = 0
+ warns_count = 0
+ src_content = ''
+
+ def nav_title(self):
+ return _("HTML Validator")
+
+ def nav_subtitle(self):
+ return mark_safe(_(u"Tidy Errors: %(errors_cnt)d "\
+ u"Warnings: %(warns_cnt)d") % {
+ 'errors_cnt': self.errors_count,
+ 'warns_cnt': self.warns_count,
+ })
+
+ def title(self):
+ return _("HTML Validator")
+
+ def url(self):
+ return ''
+
+ def process_response(self, request, response):
+ document, errors = tidy_document(response.content,
+ options={'numeric-entities': 1})
+ self.log_data = (document, errors)
+ self.src_content = response.content
+ errors_list = errors.split('\n')
+ self.errors_count = len([err for err in errors_list \
+ if 'error:' in err.lower()])
+ self.warns_count = len([err for err in errors_list \
+ if 'warning:' in err.lower()])
+
+ return response
+
+ def appearance(self, errors):
+ replacements = [
+ (re.compile(r'\<([^\>]*)\>'), \
+ '<\\1> '),
+ (re.compile(r'(line[^\-]*)(.*)'), \
+ u'\\1 \\2 '),
+ (re.compile(r'\s*\-\s+(Error\:|Warning\:)', re.I), \
+ u'\\1 '),
+ ]
+
+ for rx, rp in replacements:
+ errors = re.sub(rx, rp, errors)
+
+ errors_list = errors.split('\n')
+ errors_rt = []
+ # mark lines with error with validation-error class
+ for err in errors_list:
+ if 'error:' in err.lower():
+ err = err.replace(' ', ' ')
+ errors_rt.append(err)
+ continue
+ errors_rt.append(err)
+
+ return errors_rt
+
+ def content(self):
+ context = self.context.copy()
+
+ document, errors = self.log_data
+ lines = self.src_content.split("\n")
+
+ context.update({
+ 'document': document,
+ 'lines': zip(range(1, len(lines) + 1), lines),
+ 'errors': self.appearance(errors),
+ })
+
+ return render_to_string(\
+ 'debug_toolbar/panels/htmlvalidator.html', context)
diff --git a/debug_toolbar/panels/state.py b/debug_toolbar/panels/state.py
new file mode 100644
index 000000000..ded3414a9
--- /dev/null
+++ b/debug_toolbar/panels/state.py
@@ -0,0 +1,168 @@
+import re
+
+from django.db import models
+from django.db.models.signals import post_save, post_delete
+from django.template.loader import render_to_string
+from django.utils.translation import ugettext_lazy as _
+from django.utils.safestring import mark_safe
+
+from debug_toolbar.panels import DebugPanel
+
+
+class StateDebugPanel(DebugPanel):
+ name = "State"
+ has_content = True
+
+ ADD = 1
+ UPDATE = 2
+ DELETE = 3
+
+ objs_created = 0
+ objs_deleted = 0
+ objs_updated = 0
+
+ objects_state = {}
+ prev_objects_state = {}
+
+ log_data = []
+
+ keys = {ADD: 'created', UPDATE: 'updated', DELETE: 'deleted'}
+
+ def nav_title(self):
+ return _("State")
+
+ def nav_subtitle(self):
+ return mark_safe(_("%(created)d created, "\
+ "%(updated)d changed, %(deleted)d deleted") % {
+ 'created': self.objs_created,
+ 'deleted': self.objs_deleted,
+ 'updated': self.objs_updated,
+ })
+
+ def title(self):
+ return _("Objects State")
+
+ def url(self):
+ return ''
+
+ def _track_save(cls, *args, **kwargs):
+ """Method to track every post_save signal and increase amount of
+ create/change action for corresponding object"""
+ is_created = False
+ action = cls.UPDATE
+ if 'created' in kwargs and kwargs['created']:
+ cls.objs_created += 1
+ is_created = True
+ action = cls.ADD
+ else:
+ cls.objs_updated += 1
+
+ cls.log_data.append({
+ 'action': action,
+ 'sender': kwargs['sender'],
+ 'pk': kwargs['instance'].pk,
+ 'is_created': is_created,
+ })
+ track_save = classmethod(_track_save)
+
+ def _track_delete(cls, *args, **kwargs):
+ cls.objs_deleted += 1
+ cls.log_data.append({
+ 'action': cls.DELETE,
+ 'pk': kwargs['instance'].pk,
+ 'sender': kwargs['sender'],
+ })
+ track_delete = classmethod(_track_delete)
+
+ def _connect(cls):
+ post_save.connect(cls.track_save)
+ post_delete.connect(cls.track_delete)
+ cls.update_objects_state()
+ connect = classmethod(_connect)
+
+ def _update_objects_state(cls):
+ for md in models.get_models():
+ model_name = cls.prepare_model_name(md)
+ try:
+ cls.objects_state[model_name] = md.objects.count()
+ except Exception:
+ pass
+ update_objects_state = classmethod(_update_objects_state)
+
+ def renew_state(self):
+ cls = self.__class__
+
+ cls.prev_objects_state = cls.objects_state.copy()
+ self.update_objects_state()
+
+ cls.objs_created = 0
+ cls.objs_updated = 0
+ cls.objs_deleted = 0
+ cls.log_data = []
+
+ def _prepare_model_name(cls, mdl):
+ return re.sub(r'(\\']*)', '', str(mdl)).strip()
+ prepare_model_name = classmethod(_prepare_model_name)
+
+ def _statistic(self):
+ cls = self.__class__
+ data = self.log_data
+ stat = {}
+ for item in data:
+ sender = cls.prepare_model_name(item['sender'])
+ action = item['action']
+ if not sender in stat:
+ stat[sender] = dict((key, 0) for key in self.keys.values())
+
+ stat[sender][self.keys[action]] += 1
+
+ return stat
+ statistic = property(_statistic)
+
+ def merge_states(self, stat, cur, prev):
+ rv = []
+ keys = self.keys.values()
+ for md, cur in cur.iteritems():
+ prev_amt = prev.get(md, -1)
+ md_stat = stat.get(md, None)
+
+ md_data = {
+ 'prev': prev_amt,
+ 'cur': cur,
+ 'model': md,
+ }
+
+ if md_stat:
+ [md_data.update({
+ 'have_%s' % key: True,
+ '%s_amount' % key: md_stat[key],
+ }) for key in keys if md_stat[key] > 0]
+
+ rv.append(md_data)
+
+ # sort by C/U/D
+ [rv.sort(reverse=True, key=lambda obj: obj.get(key, 0)) \
+ for key in ["%s_amount" % c_key for c_key in keys]]
+
+ return rv
+
+ def content(self):
+ context = self.context.copy()
+ statistic = self.statistic.copy()
+ context.update({
+ 'objs_created': self.objs_created,
+ 'objs_updated': self.objs_updated,
+ 'objs_deleted': self.objs_deleted,
+ 'stat': statistic,
+ 'objects_state': self.merge_states(statistic, self.objects_state, \
+ self.prev_objects_state),
+ })
+
+ # we should do it because we save state to
+ # class, not to particular object instance
+ self.renew_state()
+
+ return render_to_string('debug_toolbar/panels/state.html', context)
+
+# initialize tracking signals
+StateDebugPanel.connect()
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index d039ade70..332536772 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -51,4 +51,4 @@ {{ panel.title|safe }}
{% endif %}
{% endfor %}
-
+
\ No newline at end of file
diff --git a/debug_toolbar/templates/debug_toolbar/panels/htmlvalidator.html b/debug_toolbar/templates/debug_toolbar/panels/htmlvalidator.html
new file mode 100644
index 000000000..a960834f6
--- /dev/null
+++ b/debug_toolbar/templates/debug_toolbar/panels/htmlvalidator.html
@@ -0,0 +1,29 @@
+{% load i18n %}
+
+ {% trans "Current page have following errors" %}:
+
+
+ Position
+ Error or Warning
+
+ {% for err in errors %}
+
+ {{ err|safe }}
+
+ {% endfor %}
+
+
+ Content:
+
+
+
+
+ {% trans "Summary" %}:
+
+ {% trans "Created" %}:
+ {{ objs_created }}
+ {% trans "Updated" %}:
+ {{ objs_updated }}
+ {% trans "Deleted" %}:
+ {{ objs_deleted }}
+
+
+{% trans "No objects was created, updated or deleted" %}
+{% else %}
+{% trans "Objects manipulations statistic" %}
+
+
+
+ {% trans "Model" %}
+ {% trans 'Created' %}
+ {% trans 'Changed' %}
+ {% trans 'Deleted' %}
+
+
+
+ {% for sender, s in stat.iteritems %}
+
+ {{ sender }}
+ {{ s.created }}
+ {{ s.updated }}
+ {{ s.deleted }}
+
+ {% endfor %}
+
+
+{% endifequal %}
+
+{% trans "Objects state" %}
+
+{% trans "C" %} — {% trans "Created" %}{% trans "U" %} — {% trans "Updated" %}{% trans "D" %} — {% trans "Deleted" %}
+
+
+
+ {% trans "C" %}
+ {% trans "U" %}
+ {% trans "D" %}
+ {% trans "Model" %}
+ {% trans 'Objects amount' %}
+ {% trans 'Previous objects amount' %}
+
+
+
+ {% for item in objects_state %}
+
+ {{ item.created_amount }}
+ {{ item.updated_amount }}
+ {{ item.deleted_amount }}
+ {{ item.model }}
+ {{ item.cur }}
+ {{ item.prev }}
+
+ {% endfor %}
+
+
diff --git a/debug_toolbar/toolbar/loader.py b/debug_toolbar/toolbar/loader.py
index 3501c695d..ac6d664fd 100644
--- a/debug_toolbar/toolbar/loader.py
+++ b/debug_toolbar/toolbar/loader.py
@@ -16,13 +16,15 @@ def __init__(self, request):
base_url = self.request.META.get('SCRIPT_NAME', '')
self.config = {
'INTERCEPT_REDIRECTS': True,
- 'MEDIA_URL': u'%s/__debug__/m/' % base_url
+ 'MEDIA_URL': u'%s/__debug__/m/' % base_url,
+ 'DEBUG_TOOLBAR_DEV': False,
}
# Check if settings has a DEBUG_TOOLBAR_CONFIG and updated config
self.config.update(getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}))
self.template_context = {
'BASE_URL': base_url, # for backwards compatibility
'DEBUG_TOOLBAR_MEDIA_URL': self.config.get('MEDIA_URL'),
+ 'DEBUG_TOOLBAR_DEV': self.config.get('DEBUG_TOOLBAR_DEV', False),
}
# Override this tuple by copying to settings.py as `DEBUG_TOOLBAR_PANELS`
self.default_panels = (
@@ -36,6 +38,8 @@ def __init__(self, request):
#'debug_toolbar.panels.cache.CacheDebugPanel',
'debug_toolbar.panels.signals.SignalDebugPanel',
'debug_toolbar.panels.logger.LoggingPanel',
+ 'debug_toolbar.panels.state.StateDebugPanel',
+ 'debug_toolbar.panels.htmlvalidator.HTMLValidationDebugPanel',
)
self.load_panels()
@@ -86,10 +90,21 @@ def render_toolbar(self):
media_path = os.path.join(os.path.dirname(__file__), os.pardir, 'media', 'debug_toolbar')
context = self.template_context.copy()
+ load_media = lambda file: mark_safe(open(os.path.join(media_path, file), 'r').read())
+
context.update({
'panels': self.panels,
- 'js': mark_safe(open(os.path.join(media_path, 'js', 'toolbar.min.js'), 'r').read()),
- 'css': mark_safe(open(os.path.join(media_path, 'css', 'toolbar.min.css'), 'r').read()),
})
+ if not getattr(settings, 'DEBUG_TOOLBAR_DEV_MODE', False):
+ context.update({
+ 'js': load_media('js/toolbar.min.js'),
+ 'css': load_media('css/toolbar.min.css'),
+ })
+ else:
+ context.update({
+ 'js': mark_safe("\n\n".join([load_media('js/jquery.js'),
+ load_media('js/toolbar.js')])),
+ 'css': load_media('css/toolbar.css'),
+ })
return render_to_string('debug_toolbar/base.html', context)
diff --git a/example/example.db b/example/example.db
index 1339622e6..7075b8aaa 100644
Binary files a/example/example.db and b/example/example.db differ
diff --git a/example/models.py b/example/models.py
new file mode 100644
index 000000000..6cdc79dc1
--- /dev/null
+++ b/example/models.py
@@ -0,0 +1,8 @@
+from django.db import models
+
+
+class Sample(models.Model):
+ name = models.CharField(max_length=255)
+
+ def __unicode__(self):
+ return self.name
diff --git a/example/settings.py b/example/settings.py
index 11b0117d3..fea2d88e0 100644
--- a/example/settings.py
+++ b/example/settings.py
@@ -1,6 +1,10 @@
import os
+import sys
+
PROJECT_PATH = os.path.realpath(os.path.dirname(__file__))
+sys.path.append(os.path.join(PROJECT_PATH, '..'))
+
ADMIN_MEDIA_PREFIX = '/admin_media/'
DATABASE_ENGINE = 'sqlite3'
DATABASE_NAME = 'example.db'
@@ -12,6 +16,7 @@
'django.contrib.sessions',
'django.contrib.sites',
'debug_toolbar',
+ 'example',
)
INTERNAL_IPS = ('127.0.0.1',)
MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
@@ -32,16 +37,5 @@
)
TEMPLATE_DEBUG = DEBUG
TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'templates'))
-DEBUG_TOOLBAR_PANELS = (
- 'debug_toolbar.panels.version.VersionDebugPanel',
- 'debug_toolbar.panels.timer.TimerDebugPanel',
- 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
- 'debug_toolbar.panels.headers.HeaderDebugPanel',
- 'debug_toolbar.panels.profiling.ProfilingDebugPanel',
- 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
- 'debug_toolbar.panels.sql.SQLDebugPanel',
- 'debug_toolbar.panels.template.TemplateDebugPanel',
- #'debug_toolbar.panels.cache.CacheDebugPanel',
- 'debug_toolbar.panels.signals.SignalDebugPanel',
- 'debug_toolbar.panels.logger.LoggingPanel',
-)
\ No newline at end of file
+
+DEBUG_TOOLBAR_DEV_MODE = False
\ No newline at end of file
diff --git a/example/templates/index.html b/example/templates/index.html
index 6fd3a9240..e22895ba3 100644
--- a/example/templates/index.html
+++ b/example/templates/index.html
@@ -11,6 +11,10 @@ Index of Tests
MooTools 1.2.4 Prototype 1.6.1
+
+