diff options
| author | Idan Gazit | 2009-09-09 01:45:59 +0300 |
|---|---|---|
| committer | Idan Gazit | 2009-09-09 01:45:59 +0300 |
| commit | 36b36b587c410a1ad74f1ed98de0eedeb6cfda1e (patch) | |
| tree | 4bca06e26a5d633e1491a9e065af9a7c900238cd /debug_toolbar/templates | |
| parent | 80d72869a9a950b1598aec71b8534fcc58d54a3c (diff) | |
| parent | 20ee57b927751fd0d492c428b82f64bebdb0e860 (diff) | |
| download | django-debug-toolbar-36b36b587c410a1ad74f1ed98de0eedeb6cfda1e.tar.bz2 | |
Merge commit 'upstream/ui-rf'
Diffstat (limited to 'debug_toolbar/templates')
4 files changed, 13 insertions, 9 deletions
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index dc8ccf9..d1ee273 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -1,4 +1,5 @@ {% load i18n %} +{% spaceless %} <script type="text/javascript" charset="utf-8"> // When jQuery is sourced, it's going to overwrite whatever might be in the // '$' variable, so store a reference of it in a temporary variable... @@ -65,3 +66,4 @@ {% endfor %} <div id="djDebugWindow" class="panelContent"></div> </div> +{% endspaceless %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 9c8bfa6..81188a9 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -14,10 +14,10 @@ <td>{{ query.duration|floatformat:"2" }}</td> <td> {% if query.params %} - <a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a> - <a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a> + <a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a><br> + <a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a><br> {% if is_mysql %} - <a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a> + <a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}¶ms={{ query.params|urlencode }}&duration={{ query.duration|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a><br> {% endif %} {% endif %} </td> diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index 192d1af..7074f4f 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html +++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html @@ -4,5 +4,11 @@ <h3>Template Source: <code>{{ template_name }}</code></h3> </div> <div class="djDebugPanelContent"> - {{ source }} + <div class="scroll"> + {% if not source.pygmentized %} + <pre>{{ source }}</pre> + {% else %} + {{ source }} + {% endif %} + </div> </div> diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html index d0d9b35..068fe8c 100644 --- a/debug_toolbar/templates/debug_toolbar/redirect.html +++ b/debug_toolbar/templates/debug_toolbar/redirect.html @@ -6,11 +6,7 @@ <h1>HttpResponseRedirect</h1> <p>Location: <a href="{{ redirect_to|urlencode }}">{{ redirect_to }}</a></p> <p class="notice"> - {% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for - debug viewing purposes. You can click the above link to continue with the - redirect as normal. If you'd like to disable this feature, set the" %} - <code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key - <code>INTERCEPT_REDIRECTS</code> to <code>False</code>." %} + {% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for debug viewing purposes. You can click the above link to continue with the redirect as normal. If you'd like to disable this feature, set the <code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key <code>INTERCEPT_REDIRECTS</code> to <code>False</code>." %} </p> </body> </html> |