diff options
18 files changed, 396 insertions, 363 deletions
diff --git a/debug_toolbar/media/debug_toolbar/back.png b/debug_toolbar/media/debug_toolbar/back.png Binary files differindex fa6a36b..6ac8a52 100644 --- a/debug_toolbar/media/debug_toolbar/back.png +++ b/debug_toolbar/media/debug_toolbar/back.png diff --git a/debug_toolbar/media/debug_toolbar/back_hover.png b/debug_toolbar/media/debug_toolbar/back_hover.png Binary files differindex 774f97c..452b673 100644 --- a/debug_toolbar/media/debug_toolbar/back_hover.png +++ b/debug_toolbar/media/debug_toolbar/back_hover.png diff --git a/debug_toolbar/media/debug_toolbar/close.png b/debug_toolbar/media/debug_toolbar/close.png Binary files differindex c22e2e8..c0e8135 100644 --- a/debug_toolbar/media/debug_toolbar/close.png +++ b/debug_toolbar/media/debug_toolbar/close.png diff --git a/debug_toolbar/media/debug_toolbar/close_hover.png b/debug_toolbar/media/debug_toolbar/close_hover.png Binary files differindex f868e80..5b2c812 100644 --- a/debug_toolbar/media/debug_toolbar/close_hover.png +++ b/debug_toolbar/media/debug_toolbar/close_hover.png diff --git a/debug_toolbar/media/debug_toolbar/djdt_vertical.png b/debug_toolbar/media/debug_toolbar/djdt_vertical.png Binary files differnew file mode 100644 index 0000000..000c60f --- /dev/null +++ b/debug_toolbar/media/debug_toolbar/djdt_vertical.png diff --git a/debug_toolbar/media/debug_toolbar/indicator.png b/debug_toolbar/media/debug_toolbar/indicator.png Binary files differindex a21fc6e..1a2c578 100644 --- a/debug_toolbar/media/debug_toolbar/indicator.png +++ b/debug_toolbar/media/debug_toolbar/indicator.png diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 9da3f32..b645d19 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,53 +1,48 @@ -/* 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; - position:absolute; + position:fixed; top:0; bottom:0; right:0; 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,11 +54,10 @@ width:auto; } -#djDebugToolbar li>a, -#djDebugToolbar li>div.contentless { +#djDebug #djDebugToolbar li>a, +#djDebug #djDebugToolbar li>div.contentless { font-weight:normal; font-style:normal; - font-variant:small-caps; text-decoration:none; display:block; font-size:16px; @@ -71,57 +65,67 @@ color:#fff; } -#djDebugToolbar li a:hover { +#djDebug #djDebugToolbar li a:hover { color:#111; - background-color:#c6d6da; - border-right:10px solid #fff; + background-color:#ffc; } -#djDebugToolbar li.active { +#djDebug #djDebugToolbar li.active { background-image:url(indicator.png); background-repeat:no-repeat; background-position:left center; + background-color:#333; + padding-left:10px; } -#djDebugToolbar li.active a:hover { - background-color:#111; - background-image:inherit; - background-position:inherit; - background-repeat:inherit; +#djDebug #djDebugToolbar li.active a:hover { color:#b36a60; - border:none; + background-color:transparent; } -#djDebugToolbar li small { +#djDebug #djDebugToolbar li small { font-size:12px; color:#999; - font-style:italic; + font-style:normal; text-decoration:none; - font-variant:normal; + font-variant:small-caps; } -#djDebugToolbarHandle { - position:absolute; - background:#111; - top:0; - bottom:0; +#djDebug #djDebugToolbarHandle { + position:fixed; + background:#fff; + border:1px solid #111; + top:30px; right:0; z-index:100000000; + opacity:0.75; } #djDebug a#djShowToolBarButton { display:block; - height:100%; - padding:2px; + height:75px; + width:30px; + border-right:none; + border-bottom:4px solid #fff; + border-top:4px solid #fff; + border-left:4px solid #fff; color:#fff; font-size:10px; font-weight:bold; text-decoration:none; text-align:center; + text-indent:-999999px; + background:#000 url(djdt_vertical.png) no-repeat left center; + opacity:0.5; } #djDebug a#djShowToolBarButton:hover { - background-color:#f00; + background-color:#111; + padding-right:6px; + border-top-color:#FFE761; + border-left-color:#FFE761; + border-bottom-color:#FFE761; + opacity:1.0; } #djDebug pre { @@ -134,41 +138,60 @@ #djDebug .panelContent { display:none; - position:absolute; + position:fixed; margin:0; top:0; - right:200px; + right:150px; bottom:0; - left:0; - background-color:#f6f6f6; + left:50px; + background-color:#eee; color:#666; z-index:1000000; - overflow:auto; } #djDebug .panelContent > div { border-bottom:1px solid #ddd; - padding:10px 20px; } -.djDebugPanelTitle { +#djDebug .djDebugPanelTitle { + position:absolute; background-color:#ffc; color:#666; + padding-left:20px; + top:0; + right:0; + left:0; + height:50px; +} + +#djDebug .djDebugPanelContent { + position:absolute; + top:50px; + right:0; + bottom:0; + left:0; + height:auto; + padding:0px 20px; +} + +#djDebug .djDebugPanelContent .scroll { + height:100%; + overflow:auto; + display:block; + padding:10px; } + #djDebug h3 { font-size:24px; - font-weight:bold; - font-variant:small-caps; + font-weight:normal; + line-height:50px; } #djDebug h4 { font-size:20px; font-weight:bold; -} - -#djDebug .panelContent { - background-color:#eee; - color:#000; + margin-bottom:0.8em; + margin-top:0.4em; } #djDebug .panelContent table { @@ -176,6 +199,7 @@ border-collapse:collapse; width:100%; background-color:#fff; + display:block; } #djDebug .panelContent tbody td, #djDebug .panelContent tbody th { @@ -199,7 +223,6 @@ #djDebug .panelContent code { font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; - font-size:12px; } /* #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { @@ -257,8 +280,8 @@ text-indent:-9999999px; display:block; position:absolute; - top:0; - right:10px; + top:4px; + right:15px; height:40px; width:40px; background:url(close.png) no-repeat center center; @@ -288,22 +311,47 @@ 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 */ -#djDebug .highlight .k { color:#000; font-weight: bold } /* Keyword */ +#djDebug .highlight .k { color:#000; font-weight:bold } /* Keyword */ #djDebug .highlight .o { color:#000; } /* Operator */ #djDebug .highlight .n { color:#000; } /* Name */ -#djDebug .highlight .mi { color:#000; font-weight: bold } /* Literal.Number.Integer */ +#djDebug .highlight .mi { color:#000; font-weight:bold } /* Literal.Number.Integer */ #djDebug .highlight .l { color:#000; } /* Literal */ #djDebug .highlight .x { color:#000; } /* Other */ #djDebug .highlight .p { color:#000; } /* Punctuation */ -#djDebug .highlight .m { color:#000; font-weight: bold } /* Literal.Number */ +#djDebug .highlight .m { color:#000; font-weight:bold } /* Literal.Number */ #djDebug .highlight .s { color:#333 } /* Literal.String */ #djDebug .highlight .w { color:#888888 } /* Text.Whitespace */ -#djDebug .highlight .il { color:#000; font-weight: bold } /* Literal.Number.Integer.Long */ +#djDebug .highlight .il { color:#000; font-weight:bold } /* Literal.Number.Integer.Long */ #djDebug .highlight .na { color:#333 } /* Name.Attribute */ -#djDebug .highlight .nt { color:#000; font-weight: bold } /* Name.Tag */ +#djDebug .highlight .nt { color:#000; font-weight:bold } /* Name.Tag */ #djDebug .highlight .nv { color:#333 } /* Name.Variable */ #djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */ #djDebug .highlight .cp { color:#333 } /* Comment.Preproc */ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index b20a487..e47adfa 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -12,12 +12,16 @@ jQuery(function($j) { return false; } current = $j('#djDebug #' + this.className); + $j(document).trigger('close.djDebug'); if (current.is(':visible')) { - $j(document).trigger('close.djDebug'); $j(this).parent().removeClass("active"); } else { $j('.panelContent').hide(); - current.show(); + current.animate({ + right:"200px", + left:"0px", + opacity:"show" + },200); $j.djDebug.open(); $j('#djDebugToolbar li').removeClass("active"); $j(this).parent().addClass("active"); @@ -39,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; }); @@ -79,9 +84,9 @@ jQuery(function($j) { return false; }, hide_toolbar: function(setCookie) { + $j(document).trigger('close.djDebug'); $j('#djDebugToolbar').hide("fast"); $j('#djDebugToolbar li').removeClass("active"); - $j(document).trigger('close.djDebug'); $j('#djDebugToolbarHandle').show(); if (setCookie) { $j.cookie(COOKIE_NAME, 'hide', { @@ -97,11 +102,20 @@ 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'); - $j('.panelContent').hide(); + $j('.panelContent').animate({ + right:"150px", + left:"50px", + opacity:"hide" + }, 150); $j('#djDebugToolbar li').removeClass("active"); }); }); diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index b80daef..dc8ccf9 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -56,7 +56,9 @@ <h3>{{ panel.title|safe }}</h3> </div> <div class="djDebugPanelContent"> - {{ panel.content|safe }} + <div class="scroll"> + {{ panel.content|safe }} + </div> </div> </div> {% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index 3aafb3e..f251056 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -1,19 +1,17 @@ {% load i18n %} -<div class="boxed"> - <table> - <thead> - <tr> - <th>{% trans "Key" %}</th> - <th>{% trans "Value" %}</th> +<table> + <thead> + <tr> + <th>{% trans "Key" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in headers.iteritems %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in headers.iteritems %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> -</div>
\ No newline at end of file + {% endfor %} + </tbody> +</table> diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html index 736c676..5e8b652 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/logger.html +++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html @@ -1,27 +1,26 @@ {% load i18n %} -<div class="boxed"> - {% if records %} - <table> - <thead> - <tr> - <th>{% trans "Level" %}</th> - <th>{% trans "Time" %}</th> - <th>{% trans "Message" %}</th> - <th>{% trans "Location" %}</th> +{% if records %} + <table> + <thead> + <tr> + <th>{% trans "Level" %}</th> + <th>{% trans "Time" %}</th> + <th>{% trans "Message" %}</th> + <th>{% trans "Location" %}</th> + </tr> + </thead> + <tbody> + {% for record in records %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ record.level }}</td> + <td>{{ record.time|date:"h:i:s m/d/Y" }}</td> + <td>{{ record.message }}</td> + <td>{{ record.file }}:{{ record.line }}</td> </tr> - </thead> - <tbody> - {% for record in records %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ record.level }}</td> - <td>{{ record.time|date:"h:i:s m/d/Y" }}</td> - <td>{{ record.message }}</td> - <td>{{ record.file }}:{{ record.line }}</td> - </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "No messages logged" %}.</p> - {% endif %} -</div>
\ No newline at end of file + {% endfor %} + </tbody> + </table> +{% else %} + <p>{% trans "No messages logged" %}.</p> +{% endif %} + diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html index 7f5e33f..3fdbf74 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html @@ -1,104 +1,96 @@ {% load i18n %} <h4>COOKIES Variables</h4> -<div class="boxed"> - {% if cookies %} - <table> - <colgroup> - <col style="width:20%"/> - <col/> - </colgroup> - <thead> - <tr> - <th>{% trans "Variable" %}</th> - <th>{% trans "Value" %}</th> +{% if cookies %} + <table> + <colgroup> + <col style="width:20%"/> + <col/> + </colgroup> + <thead> + <tr> + <th>{% trans "Variable" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in cookies %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in cookies %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "No COOKIE data" %}</p> - {% endif %} -</div> + {% endfor %} + </tbody> + </table> +{% else %} + <p>{% trans "No COOKIE data" %}</p> +{% endif %} <h4>SESSION Variables</h4> -<div class="boxed"> - {% if session %} - <table> - <colgroup> - <col style="width:20%"/> - <col/> - </colgroup> - <thead> - <tr> - <th>{% trans "Variable" %}</th> - <th>{% trans "Value" %}</th> +{% if session %} + <table> + <colgroup> + <col style="width:20%"/> + <col/> + </colgroup> + <thead> + <tr> + <th>{% trans "Variable" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in session %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in session %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "No SESSION data" %}</p> - {% endif %} -</div> + {% endfor %} + </tbody> + </table> +{% else %} + <p>{% trans "No SESSION data" %}</p> +{% endif %} <h4>GET Variables</h4> -<div class="boxed"> - {% if get %} - <table> - <thead> - <tr> - <th>{% trans "Variable" %}</th> - <th>{% trans "Value" %}</th> +{% if get %} + <table> + <thead> + <tr> + <th>{% trans "Variable" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in get %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|join:", "|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in get %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|join:", "|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "No GET data" %}</p> - {% endif %} -</div> + {% endfor %} + </tbody> + </table> +{% else %} + <p>{% trans "No GET data" %}</p> +{% endif %} <h4>POST Variables</h4> -<div class="boxed"> - {% if post %} - <table> - <thead> - <tr> - <th>{% trans "Variable" %}</th> - <th>{% trans "Value" %}</th> +{% if post %} + <table> + <thead> + <tr> + <th>{% trans "Variable" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in post %} + <tr class="{% cycle 'row1' 'row2' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|join:", "|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in post %} - <tr class="{% cycle 'row1' 'row2' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|join:", "|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "No POST data" %}</p> - {% endif %} -</div>
\ No newline at end of file + {% endfor %} + </tbody> + </table> +{% else %} + <p>{% trans "No POST data" %}</p> +{% endif %}
\ No newline at end of file diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html index 6d9cf2a..99c43b6 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html @@ -1,19 +1,17 @@ {% load i18n %} -<div class="boxed"> - <table> - <thead> - <tr> - <th>{% trans "Setting" %}</th> - <th>{% trans "Value" %}</th> +<table> + <thead> + <tr> + <th>{% trans "Setting" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for var in settings.items|dictsort:"0" %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ var.0 }}</td> + <td><code>{{ var.1|pprint }}</code></td> </tr> - </thead> - <tbody> - {% for var in settings.items|dictsort:"0" %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ var.0 }}</td> - <td><code>{{ var.1|pprint }}</code></td> - </tr> - {% endfor %} - </tbody> - </table> -</div>
\ No newline at end of file + {% endfor %} + </tbody> +</table> diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html index 2b95d52..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 %} -<div class="boxed"> - <table> - <thead> - <tr> - <th>{% trans "Signal" %}</th> - <th>Providing Args</th> - <th>Receivers</th> +<table> + <thead> + <tr> + <th>{% trans "Signal" %}</th> + <th>Providing Args</th> + <th>Receivers</th> + </tr> + </thead> + <tbody> + {% for name, signal, receivers in signals %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ name|escape }}</td> + <td>{{ signal.providing_args|join:", " }}</td> + <td>{{ receivers|join:", " }}</td> </tr> - </thead> - <tbody> - {% for name, signal, receivers in signals %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ name|escape }}</td> - <td>{{ signal.providing_args|join:", " }}</td> - <td>{{ receivers|join:", " }}</td> - </tr> - {% endfor %} - </tbody> - </table> -</div>
\ No newline at end of file + {% endfor %} + </tbody> +</table> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 8d1fefc..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 %} -<div class="boxed"> - <table> - <thead> - <tr> - <th>{% trans "Time" %} (ms)</th> - <th>{% trans "Action" %}</th> - <th>Stacktrace</th> - <th>Query</th> - </tr> - </thead> - <tbody> - {% for query in queries %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ query.time|floatformat:"2" }}</td> - <td> - {% if query.params %} - <a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a> - <a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a> - {% if is_mysql %} - <a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a> - {% endif %} +<table> + <thead> + <tr> + <th>{% trans "Time" %} (ms)</th> + <th>{% trans "Action" %}</th> + <th>Stacktrace</th> + <th>Query</th> + </tr> + </thead> + <tbody> + {% for query in queries %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ query.time|floatformat:"2" }}</td> + <td> + {% if query.params %} + <a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a> + <a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a> + {% if is_mysql %} + <a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a> {% endif %} - </td> - <td> - {% if query.stacktrace %} - <div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div> - <div class="djSQLHideStacktraceDiv" style="display:none;"> - <table> + {% endif %} + </td> + <td> + {% if query.stacktrace %} + <div class="djSQLShowStacktraceDiv"><a class="djSQLShowStacktrace" href="#">Toggle Stacktrace</a></div> + <div class="djSQLHideStacktraceDiv" style="display:none;"> + <table> + <tr> + <th>{% trans "Line" %}</th> + <th>{% trans "Method" %}</th> + <th>{% trans "File" %}</th> + </tr> + {% for file, line, method in query.stacktrace %} <tr> - <th>{% trans "Line" %}</th> - <th>{% trans "Method" %}</th> - <th>{% trans "File" %}</th> + <td>{{ line }}</td> + <td><pre>{{ method|escape }}<pre></td> + <td><pre>{{ file|escape }}</pre></td> </tr> - {% for file, line, method in query.stacktrace %} - <tr> - <td>{{ line }}</td> - <td><pre>{{ method|escape }}<pre></td> - <td><pre>{{ file|escape }}</pre></td> - </tr> - {% endfor %} - </table> - </div> - {% endif %} - </td> - <td class="syntax">{{ query.sql|safe }}</td> - </tr> - {% endfor %} - </tbody> - </table> -</div>
\ No newline at end of file + {% endfor %} + </table> + </div> + {% endif %} + </td> + <td class="syntax">{{ query.sql|safe }}</td> + </tr> + {% endfor %} + </tbody> +</table> diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index dd23fa3..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 @@ <h3>Template Source: <code>{{ template_name }}</code></h3> </div> <div class="djDebugPanelContent"> - <div class="panelScrollWrap"> - <div class="panelScrollContent"> - <div class="boxed"> - {{ source }} - </div> - </div> - </div> -</div>
\ No newline at end of file + {{ source }} +</div> diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index d4e18b5..1158abe 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 %} <h4>Template path{{ template_dirs|length|pluralize }}</h4> -<div class="boxed"> {% if template_dirs %} <ol> {% for template in template_dirs %} @@ -10,39 +9,34 @@ {% else %} <p>None</p> {% endif %} -</div> <h4>{% trans "Template" %}{{ templates|length|pluralize }}</h4> -<div class="boxed"> - {% if templates %} - <dl> - {% for template in templates %} - <dt><strong><a class="remoteCall" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt> - <dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd> - <dd> - <div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div> - <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div> - </dd> - {% endfor %} - </dl> - {% else %} - <p>None</p> - {% endif %} -</div> +{% if templates %} +<dl> +{% for template in templates %} + <dt><strong><a class="remoteCall toggleTemplate" href="/__debug__/template_source/?template={{ template.template.name }}">{{ template.template.name|addslashes }}</a></strong></dt> + <dd><samp>{{ template.template.origin_name|addslashes }}</samp></dd> + <dd> + <div class="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">▶</span> Toggle Context</a></div> + <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ template.context }}</pre></div> + </dd> +{% endfor %} +</dl> +{% else %} + <p>None</p> +{% endif %} <h4>Context processor{{ context_processors|length|pluralize }}</h4> -<div class="boxed"> - {% if context_processors %} - <dl> - {% for key, value in context_processors.iteritems %} - <dt><strong>{{ key|escape }}</strong></dt> - <dd> - <div class="djTemplateShowContextDiv"><a class="djTemplateShowContext">Toggle Context</a></div> - <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div> - </dd> - {% endfor %} - </dl> - {% else %} - <p>None</p> - {% endif %} -</div> +{% if context_processors %} +<dl> +{% for key, value in context_processors.iteritems %} + <dt><strong>{{ key|escape }}</strong></dt> + <dd> + <div class="djTemplateShowContextDiv"><a class="djTemplateShowContext"><span class="toggleArrow">▶</span> Toggle Context</a></div> + <div class="djTemplateHideContextDiv" style="display:none;"><pre>{{ value|escape }}</pre></div> + </dd> +{% endfor %} +</dl> +{% else %} + <p>None</p> +{% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index d25f051..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 %} -<div class="boxed"> - <table> - <colgroup> - <col style="width:20%"/> - <col/> - </colgroup> - <thead> - <tr> - <th>{% trans "Resource" %}</th> - <th>{% trans "Value" %}</th> +<table> + <colgroup> + <col style="width:20%"/> + <col/> + </colgroup> + <thead> + <tr> + <th>{% trans "Resource" %}</th> + <th>{% trans "Value" %}</th> + </tr> + </thead> + <tbody> + {% for key, value in rows %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + <td>{{ key|escape }}</td> + <td>{{ value|escape }}</td> </tr> - </thead> - <tbody> - {% for key, value in rows %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - <td>{{ key|escape }}</td> - <td>{{ value|escape }}</td> - </tr> - {% endfor %} - </tbody> - </table> -</div>
\ No newline at end of file + {% endfor %} + </tbody> +</table> |
