From 1b5785aaf1ca31cafe4832ff91aef52280ca1f9b Mon Sep 17 00:00:00 2001 From: Brobin Date: Wed, 4 Jan 2017 15:20:10 -0600 Subject: [PATCH] prefix timeline and query with djdt to avoid conflicting class names --- debug_toolbar/static/debug_toolbar/css/toolbar.css | 2 +- debug_toolbar/static/debug_toolbar/js/toolbar.timer.js | 4 ++-- debug_toolbar/templates/debug_toolbar/panels/sql.html | 8 ++++---- debug_toolbar/templates/debug_toolbar/panels/timer.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debug_toolbar/static/debug_toolbar/css/toolbar.css b/debug_toolbar/static/debug_toolbar/css/toolbar.css index ba929ef51..8fed1e302 100644 --- a/debug_toolbar/static/debug_toolbar/css/toolbar.css +++ b/debug_toolbar/static/debug_toolbar/css/toolbar.css @@ -503,7 +503,7 @@ #djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */ #djDebug .highlight .cp { color:#333 } /* Comment.Preproc */ -#djDebug .timeline { +#djDebug .djdt-timeline { width: 30%; } #djDebug .djDebugTimeline { diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js b/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js index b9bf3b41a..ba2e065b3 100644 --- a/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js +++ b/debug_toolbar/static/debug_toolbar/js/toolbar.timer.js @@ -24,13 +24,13 @@ if (endStat) { // Render a start through end bar $row.html('' + stat.replace('Start', '') + '' + - '
 
' + + '
 
' + '' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')'); $row.find('strong').css({width: getCSSWidth(stat, endStat)}); } else { // Render a point in time $row.html('' + stat + '' + - '
 
' + + '
 
' + '' + (perf.timing[stat] - timingOffset) + ''); $row.find('strong').css({width: 2}); } diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 8b40f4592..792f25f29 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -18,8 +18,8 @@   - {% trans "Query" %} - {% trans "Timeline" %} + {% trans "Query" %} + {% trans "Timeline" %} {% trans "Time (ms)" %} {% trans "Action" %} @@ -31,7 +31,7 @@ + - +
{{ query.sql|safe }}
@@ -42,7 +42,7 @@ {% endif %} - +
{{ query.width_ratio }}%
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index 2f44e889e..38cc7a797 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/timer.html +++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html @@ -33,7 +33,7 @@

{% trans "Browser timing" %}

{% trans "Timing attribute" %} - {% trans "Timeline" %} + {% trans "Timeline" %} {% trans "Milliseconds since navigation start (+length)" %}