diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html
index 94414ea..d6d681c 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/signals.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html
@@ -1,21 +1,19 @@
{% load i18n %}
-
-
-
-
- | {% trans "Signal" %} |
- Providing Args |
- Receivers |
+
+
+
+ | {% trans "Signal" %} |
+ Providing Args |
+ Receivers |
+
+
+
+ {% for name, signal, receivers in signals %}
+
+ | {{ name|escape }} |
+ {{ signal.providing_args|join:", " }} |
+ {{ receivers|join:", " }} |
-
-
- {% for name, signal, receivers in signals %}
-
- | {{ name|escape }} |
- {{ signal.providing_args|join:", " }} |
- {{ receivers|join:", " }} |
-
- {% endfor %}
-
-
-
+ {% endfor %}
+
+
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index aecfad6..7aa4c2d 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -1,51 +1,49 @@
{% load i18n %}
-
-
-
-
- | {% trans "Time" %} (ms) |
- {% trans "Action" %} |
- Stacktrace |
- Query |
-
-
-
- {% for query in queries %}
-
- | {{ query.time|floatformat:"2" }} |
-
- {% if query.params %}
- SELECT
- EXPLAIN
- {% if is_mysql %}
- PROFILE
- {% endif %}
+
+
+
+ | {% trans "Time" %} (ms) |
+ {% trans "Action" %} |
+ Stacktrace |
+ Query |
+
+
+
+ {% for query in queries %}
+
+ | {{ query.time|floatformat:"2" }} |
+
+ {% if query.params %}
+ SELECT
+ EXPLAIN
+ {% if is_mysql %}
+ PROFILE
{% endif %}
- |
-
- {% if query.stacktrace %}
-
-
-
+ {% endif %}
+
+
+ {% if query.stacktrace %}
+
+
+
+
+ | {% trans "Line" %} |
+ {% trans "Method" %} |
+ {% trans "File" %} |
+
+ {% for file, line, method in query.stacktrace %}
- | {% trans "Line" %} |
- {% trans "Method" %} |
- {% trans "File" %} |
+ {{ line }} |
+ {{ method|escape }} |
+ {{ file|escape }} |
- {% for file, line, method in query.stacktrace %}
-
- | {{ line }} |
- {{ method|escape }} |
- {{ file|escape }} |
-
- {% endfor %}
-
- |
- {{ query.sql|safe }} |
-
- {% endfor %}
-
-
- |
+
+ {% endif %}
+ |
+ {{ query.sql|safe }} |
+
+ {% endfor %}
+
+
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
index 8e8253d..192d1af 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html
@@ -4,11 +4,5 @@
Template Source: {{ template_name }}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index d4e18b5..872a5f5 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -1,6 +1,5 @@
{% load i18n %}
Template path{{ template_dirs|length|pluralize }}
-
{% if template_dirs %}
{% for template in template_dirs %}
@@ -10,39 +9,34 @@
{% else %}
None
{% endif %}
-
{% trans "Template" %}{{ templates|length|pluralize }}
-
- {% if templates %}
-
- {% for template in templates %}
- - {{ template.template.name|addslashes }}
- - {{ template.template.origin_name|addslashes }}
- -
-
-
-
- {% endfor %}
-
- {% else %}
-
None
- {% endif %}
-
+{% if templates %}
+
+{% for template in templates %}
+ - {{ template.template.name|addslashes }}
+ - {{ template.template.origin_name|addslashes }}
+ -
+
+
+
+{% endfor %}
+
+{% else %}
+
None
+{% endif %}
Context processor{{ context_processors|length|pluralize }}
-
- {% if context_processors %}
-
- {% for key, value in context_processors.iteritems %}
- - {{ key|escape }}
- -
-
-
-
- {% endfor %}
-
- {% else %}
-
None
- {% endif %}
-
+{% if context_processors %}
+
+{% for key, value in context_processors.iteritems %}
+ - {{ key|escape }}
+ -
+
+
+
+{% endfor %}
+
+{% else %}
+
None
+{% endif %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
index 9fd479f..f267de1 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/timer.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -1,23 +1,21 @@
{% load i18n %}
-
-
-
-
-
-
-
-
- | {% trans "Resource" %} |
- {% trans "Value" %} |
+
+
+
+
+
+
+
+ | {% trans "Resource" %} |
+ {% trans "Value" %} |
+
+
+
+ {% for key, value in rows %}
+
+ | {{ key|escape }} |
+ {{ value|escape }} |
-
-
- {% for key, value in rows %}
-
- | {{ key|escape }} |
- {{ value|escape }} |
-
- {% endfor %}
-
-
-
+ {% endfor %}
+
+
--
cgit v1.2.3
From 0e65f95980e8cd2e84055ddbe52c3c40010353e2 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Tue, 25 Aug 2009 19:14:31 +0300
Subject: Added toggle arrows, grey boxes for template links
---
debug_toolbar/media/debug_toolbar/toolbar.css | 31 ++++++++++++++++++++--
debug_toolbar/media/debug_toolbar/toolbar.js | 8 +++++-
.../templates/debug_toolbar/panels/templates.html | 6 ++---
3 files changed, 39 insertions(+), 6 deletions(-)
(limited to 'debug_toolbar')
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index bf4648a..64a1a3c 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
@@ -176,14 +176,14 @@
bottom:0;
left:0;
height:auto;
- padding:10px 20px;
+ padding:0px 20px;
}
#djDebug .djDebugPanelContent .scroll {
height:100%;
overflow:auto;
display:block;
- padding-right:10px;
+ padding:10px;
}
#djDebug h3 {
@@ -195,6 +195,8 @@
#djDebug h4 {
font-size:20px;
font-weight:bold;
+ margin-bottom:0.8em;
+ margin-top:0.4em;
}
#djDebug .panelContent table {
@@ -314,6 +316,31 @@
margin-left:10px;
}
+#djDebug a.toggleTemplate {
+ padding:4px;
+ background-color:#bbb;
+ -moz-border-radius:3px;
+ -webkit-border-radius:3px;
+}
+
+#djDebug a.toggleTemplate:hover {
+ padding:4px;
+ background-color:#444;
+ color:#ffe761;
+ -moz-border-radius:3px;
+ -webkit-border-radius:3px;
+}
+
+
+#djDebug a.djTemplateShowContext, #djDebug a.djTemplateShowContext span.toggleArrow {
+ color:#999;
+}
+
+#djDebug a.djTemplateShowContext:hover, #djDebug a.djTemplateShowContext:hover span.toggleArrow {
+ color:#000;
+ cursor:pointer;
+}
+
#djDebug .highlight { color:#000; }
#djDebug .highlight .err { color:#000; } /* Error */
#djDebug .highlight .g { color:#000; } /* Generic */
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js
index f1e6a94..e47adfa 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.js
@@ -43,6 +43,7 @@ jQuery(function($j) {
return false;
});
$j('#djDebugTemplatePanel a.djTemplateShowContext').click(function() {
+ $j.djDebug.toggle_arrow($j(this).children('.toggleArrow'))
$j.djDebug.toggle_content($j(this).parent().next());
return false;
});
@@ -101,7 +102,12 @@ jQuery(function($j) {
path: '/',
expires: -1
});
- }
+ },
+ toggle_arrow: function(elem) {
+ var uarr = String.fromCharCode(0x25b6);
+ var darr = String.fromCharCode(0x25bc);
+ elem.html(elem.html() == uarr ? darr : uarr);
+ }
});
$j(document).bind('close.djDebug', function() {
$j(document).unbind('keydown.djDebug');
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html
index 872a5f5..1158abe 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/templates.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html
@@ -14,10 +14,10 @@
{% if templates %}
{% for template in templates %}
- - {{ template.template.name|addslashes }}
+ - {{ template.template.name|addslashes }}
- {{ template.template.origin_name|addslashes }}
-
-
+
{% endfor %}
@@ -32,7 +32,7 @@
{% for key, value in context_processors.iteritems %}
- {{ key|escape }}
-
-
+
{% endfor %}
--
cgit v1.2.3
From 0b2e7031d9d89571055df5bad3d6cf0586a9ef61 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 26 Aug 2009 01:45:13 +0300
Subject: more thorough reset, added #djDebug to all rules to increase their
specificity.
---
debug_toolbar/media/debug_toolbar/toolbar.css | 71 +++++++++++++--------------
1 file changed, 33 insertions(+), 38 deletions(-)
(limited to 'debug_toolbar')
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index 64a1a3c..b645d19 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
@@ -1,32 +1,27 @@
-/* Debug Toolbar CSS Reset, adapted from YUI CSS Reset */
+/* Debug Toolbar CSS Reset, adapted from Eric Meyer's CSS Reset */
#djDebug {color:#000;background:#FFF;}
-#djDebug div,#djDebug dl,#djDebug dt,#djDebug dd,#djDebug ul,#djDebug ol,#djDebug li,#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6,#djDebug pre,#djDebug code,#djDebug form,#djDebug fieldset,#djDebug legend,#djDebug input,#djDebug button,#djDebug textarea,#djDebug p,#djDebug blockquote,#djDebug th,#djDebug td{margin:0;padding:0;}
-#djDebug table{border-collapse:collapse;border-spacing:0;}
-#djDebug fieldset,#djDebug img{border:0;}
-#djDebug address,#djDebug caption,#djDebug cite,#djDebug code,#djDebug dfn,#djDebug em,#djDebug strong,#djDebug th,#djDebug var,#djDebug optgroup{font-style:inherit;font-weight:inherit;}
-#djDebug del,#djDebug ins{text-decoration:none;}
-#djDebug li{list-style:none;}
-#djDebug caption,#djDebug th{text-align:left;}
-#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6{font-size:100%;font-weight:normal;}
-#djDebug q:before,#djDebug q:after{content:'';}
-#djDebug abbr,#djDebug acronym{border:0;font-variant:normal;}
-#djDebug sup{vertical-align:baseline;}
-#djDebug sub{vertical-align:baseline;}
-#djDebug legend{color:#000;}
-#djDebug input,#djDebug button,#djDebug textarea,#djDebug select,#djDebug optgroup,#djDebug option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}
-#djDebug input,#djDebug button,#djDebug textarea,#djDebug select{*font-size:100%;}
-
-#djDebug * {
- color:#000;
- float:none;
- margin:0;
- padding:0;
- position:static;
- text-align:left;
- font-family:sans-serif;
-}
-
-#djDebugToolbar {
+#djDebug, #djDebug div, #djDebug span, #djDebug applet, #djDebug object, #djDebug iframe,
+#djDebug h1, #djDebug h2, #djDebug h3, #djDebug h4, #djDebug h5, #djDebug h6, #djDebug p, blockquote, #djDebug pre,
+#djDebug a, #djDebug abbr, #djDebug acronym, #djDebug address, #djDebug big, #djDebug cite, #djDebug code,
+#djDebug del, #djDebug dfn, #djDebug em, #djDebug font, #djDebug img, #djDebug ins, #djDebug kbd, #djDebug q, #djDebug s, #djDebug samp,
+#djDebug small, #djDebug strike, #djDebug strong, #djDebug sub, #djDebug sup, #djDebug tt, #djDebug var,
+#djDebug b, #djDebug u, #djDebug i, #djDebug center,
+#djDebug dl, #djDebug dt, #djDebug dd, #djDebug ol, #djDebug ul, #djDebug li,
+#djDebug fieldset, #djDebug form, #djDebug label, #djDebug legend,
+#djDebug table, #djDebug caption, #djDebug tbody, #djDebug tfoot, #djDebug thead, #djDebug tr, #djDebug th, #djDebug td {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ outline: 0;
+ font-size: 16px%;
+ line-height: 1.5em;
+ color: #000;
+ vertical-align: baseline;
+ background: transparent;
+ font-family: sans-serif;
+}
+
+#djDebug #djDebugToolbar {
background:#111;
width:200px;
z-index:100000000;
@@ -37,17 +32,17 @@
opacity:0.9;
}
-#djDebugToolbar small {
+#djDebug #djDebugToolbar small {
color:#999;
}
-#djDebugToolbar ul {
+#djDebug #djDebugToolbar ul {
margin:0;
padding:0;
list-style:none;
}
-#djDebugToolbar li {
+#djDebug #djDebugToolbar li {
border-bottom:1px solid #222;
color:#fff;
display:block;
@@ -59,8 +54,8 @@
width:auto;
}
-#djDebugToolbar li>a,
-#djDebugToolbar li>div.contentless {
+#djDebug #djDebugToolbar li>a,
+#djDebug #djDebugToolbar li>div.contentless {
font-weight:normal;
font-style:normal;
text-decoration:none;
@@ -70,12 +65,12 @@
color:#fff;
}
-#djDebugToolbar li a:hover {
+#djDebug #djDebugToolbar li a:hover {
color:#111;
background-color:#ffc;
}
-#djDebugToolbar li.active {
+#djDebug #djDebugToolbar li.active {
background-image:url(indicator.png);
background-repeat:no-repeat;
background-position:left center;
@@ -83,12 +78,12 @@
padding-left:10px;
}
-#djDebugToolbar li.active a:hover {
+#djDebug #djDebugToolbar li.active a:hover {
color:#b36a60;
background-color:transparent;
}
-#djDebugToolbar li small {
+#djDebug #djDebugToolbar li small {
font-size:12px;
color:#999;
font-style:normal;
@@ -96,7 +91,7 @@
font-variant:small-caps;
}
-#djDebugToolbarHandle {
+#djDebug #djDebugToolbarHandle {
position:fixed;
background:#fff;
border:1px solid #111;
--
cgit v1.2.3
From 2256052ce57ae0496943597d0c1c082d2bbf09f1 Mon Sep 17 00:00:00 2001
From: Idan Gazit
Date: Wed, 26 Aug 2009 02:03:59 +0300
Subject: Whoops, forgot a % in the css.
---
debug_toolbar/media/debug_toolbar/toolbar.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'debug_toolbar')
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index b645d19..90fe09c 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
@@ -13,7 +13,7 @@
padding: 0;
border: 0;
outline: 0;
- font-size: 16px%;
+ font-size: 16px;
line-height: 1.5em;
color: #000;
vertical-align: baseline;
--
cgit v1.2.3