diff options
18 files changed, 888 insertions, 284 deletions
@@ -102,7 +102,7 @@ The debug toolbar has two settings that can be set in `settings.py`: defined as the python path to the signal. * `HIDE_DJANGO_SQL`: If set to True (the default) then code in Django itself - won't be show in SQL stacktraces. + won't be shown in SQL stacktraces. * `SHOW_TEMPLATE_CONTEXT`: If set to True (the default) then a template's context will be included with it in the Template debug panel. Turning this diff --git a/debug_toolbar/locale/de/LC_MESSAGES/django.po b/debug_toolbar/locale/de/LC_MESSAGES/django.po index 0d661a7..c7d2d14 100644 --- a/debug_toolbar/locale/de/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-21 15:26-0700\n" +"POT-Creation-Date: 2009-09-11 18:05-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,11 +16,20 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/sql.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:11 +#: templates/debug_toolbar/panels/sql_profile.html:12 +#: templates/debug_toolbar/panels/sql_select.html:11 +msgid "Time" +msgstr "Zeit" + #: templates/debug_toolbar/base.html:24 msgid "Hide" msgstr "Verbergen" -#: templates/debug_toolbar/base.html:56 +#: templates/debug_toolbar/base.html:55 msgid "Close" msgstr "Schließen" @@ -44,15 +53,6 @@ msgstr "" msgid "Breakdown" msgstr "" -#: templates/debug_toolbar/panels/cache.html:39 -#: templates/debug_toolbar/panels/logger.html:8 -#: templates/debug_toolbar/panels/sql.html:6 -#: templates/debug_toolbar/panels/sql_explain.html:7 -#: templates/debug_toolbar/panels/sql_profile.html:7 -#: templates/debug_toolbar/panels/sql_select.html:7 -msgid "Time" -msgstr "Zeit" - #: templates/debug_toolbar/panels/cache.html:40 msgid "Type" msgstr "Typ" @@ -65,104 +65,147 @@ msgstr "Parameter" msgid "Function" msgstr "Funktion" -#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/headers.html:5 msgid "Key" msgstr "Schlüssel" -#: templates/debug_toolbar/panels/headers.html:7 -#: templates/debug_toolbar/panels/request_vars.html:13 -#: templates/debug_toolbar/panels/request_vars.html:41 -#: templates/debug_toolbar/panels/request_vars.html:65 -#: templates/debug_toolbar/panels/request_vars.html:89 -#: templates/debug_toolbar/panels/settings_vars.html:7 -#: templates/debug_toolbar/panels/timer.html:11 +#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/request_vars.html:12 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:60 +#: templates/debug_toolbar/panels/request_vars.html:82 +#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/timer.html:10 msgid "Value" msgstr "Wert" -#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/logger.html:6 msgid "Level" msgstr "Niveau" -#: templates/debug_toolbar/panels/logger.html:9 +#: templates/debug_toolbar/panels/logger.html:8 msgid "Message" msgstr "Nachricht" -#: templates/debug_toolbar/panels/logger.html:10 +#: templates/debug_toolbar/panels/logger.html:9 msgid "Location" msgstr "Ort" -#: templates/debug_toolbar/panels/logger.html:25 +#: templates/debug_toolbar/panels/logger.html:24 msgid "No messages logged" msgstr "Keine Nachricht gespeichert" -#: templates/debug_toolbar/panels/request_vars.html:26 -msgid "None" -msgstr "Nichts" +#: templates/debug_toolbar/panels/request_vars.html:11 +#: templates/debug_toolbar/panels/request_vars.html:37 +#: templates/debug_toolbar/panels/request_vars.html:59 +#: templates/debug_toolbar/panels/request_vars.html:81 +msgid "Variable" +msgstr "Variable" -#: templates/debug_toolbar/panels/request_vars.html:54 +#: templates/debug_toolbar/panels/request_vars.html:51 msgid "No SESSION data" msgstr "Keine SESSION-Daten" -#: templates/debug_toolbar/panels/request_vars.html:78 +#: templates/debug_toolbar/panels/request_vars.html:73 msgid "No GET data" msgstr "Keine GET-Daten" -#: templates/debug_toolbar/panels/request_vars.html:102 +#: templates/debug_toolbar/panels/request_vars.html:95 msgid "No POST data" msgstr "Keine POST-Daten" -#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/settings_vars.html:5 msgid "Setting" msgstr "Einstellung" -#: templates/debug_toolbar/panels/signals.html:6 +#: templates/debug_toolbar/panels/signals.html:5 msgid "Signal" msgstr "Signal" -#: templates/debug_toolbar/panels/sql.html:7 +#: templates/debug_toolbar/panels/sql.html:6 msgid "Action" msgstr "Aktion" -#: templates/debug_toolbar/panels/sql.html:31 +#: templates/debug_toolbar/panels/sql.html:30 msgid "Line" msgstr "Zeile" -#: templates/debug_toolbar/panels/sql.html:32 +#: templates/debug_toolbar/panels/sql.html:31 msgid "Method" msgstr "Methode" -#: templates/debug_toolbar/panels/sql.html:33 +#: templates/debug_toolbar/panels/sql.html:32 msgid "File" msgstr "Datei" -#: templates/debug_toolbar/panels/sql_explain.html:2 -#: templates/debug_toolbar/panels/sql_profile.html:2 -#: templates/debug_toolbar/panels/sql_select.html:2 -#: templates/debug_toolbar/panels/template_source.html:2 +#: templates/debug_toolbar/panels/sql_explain.html:3 +#: templates/debug_toolbar/panels/sql_profile.html:3 +#: templates/debug_toolbar/panels/sql_select.html:3 +#: templates/debug_toolbar/panels/template_source.html:3 msgid "Back" msgstr "Zurück" -#: templates/debug_toolbar/panels/sql_explain.html:5 -#: templates/debug_toolbar/panels/sql_profile.html:5 -#: templates/debug_toolbar/panels/sql_select.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:4 +msgid "SQL Explained" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:9 +#: templates/debug_toolbar/panels/sql_profile.html:10 +#: templates/debug_toolbar/panels/sql_select.html:9 msgid "Executed SQL" msgstr "Ausgeführtes SQL" -#: templates/debug_toolbar/panels/sql_select.html:30 +#: templates/debug_toolbar/panels/sql_profile.html:4 +msgid "SQL Profiled" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:4 +msgid "SQL Selected" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:34 msgid "Empty set" msgstr "Leeres Set" -#: templates/debug_toolbar/panels/templates.html:14 +#: templates/debug_toolbar/panels/templates.html:13 msgid "Template" msgstr "Template" -#: templates/debug_toolbar/panels/timer.html:10 +#: templates/debug_toolbar/panels/timer.html:9 msgid "Resource" msgstr "Ressource" -#: templates/debug_toolbar/panels/request_vars.html:12 -#: templates/debug_toolbar/panels/request_vars.html:40 -#: templates/debug_toolbar/panels/request_vars.html:64 -#: templates/debug_toolbar/panels/request_vars.html:88 -msgid "Variable" -msgstr "Variable" +#: panels/logger.py:56 +msgid "Logging" +msgstr "Logging" + +#: panels/signals.py:39 +msgid "Signals" +msgstr "Signals" + +#: panels/settings_vars.py:16 +msgid "Settings" +msgstr "Einstellungen" + +#: panels/template.py:46 +msgid "Templates" +msgstr "Templates" + +#: panels/version.py:12 +msgid "Django Version" +msgstr "Django-Version" + +#: templates/debug_toolbar/redirect.html:9 +msgid "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>." +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:25 +msgid "No COOKIE data" +msgstr "Keine COOKIE-Daten" + +#: templates/debug_toolbar/panels/sql_profile.html:35 +msgid "Error" +msgstr "Fehler" + +#~ msgid "None" +#~ msgstr "Nichts" diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.mo b/debug_toolbar/locale/en/LC_MESSAGES/django.mo Binary files differnew file mode 100644 index 0000000..e1e540c --- /dev/null +++ b/debug_toolbar/locale/en/LC_MESSAGES/django.mo diff --git a/debug_toolbar/locale/en/LC_MESSAGES/django.po b/debug_toolbar/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..0a5da25 --- /dev/null +++ b/debug_toolbar/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,212 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Percy Pérez-Pinedo, 2009. +# +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-11 18:05-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panels/logger.py:56 +msgid "Logging" +msgstr "" + +#: panels/settings_vars.py:16 +msgid "Settings" +msgstr "" + +#: panels/signals.py:39 +msgid "Signals" +msgstr "" + +#: panels/template.py:46 +msgid "Templates" +msgstr "" + +#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/sql.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:11 +#: templates/debug_toolbar/panels/sql_profile.html:12 +#: templates/debug_toolbar/panels/sql_select.html:11 +msgid "Time" +msgstr "" + +#: panels/version.py:12 +msgid "Django Version" +msgstr "" + +#: templates/debug_toolbar/base.html:24 +msgid "Hide" +msgstr "" + +#: templates/debug_toolbar/base.html:55 +msgid "Close" +msgstr "" + +#: templates/debug_toolbar/redirect.html:9 +msgid "" +"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>." +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:14 +msgid "Total Calls" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:16 +msgid "Total Time" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:18 +msgid "Hits" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:20 +msgid "Misses" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:35 +msgid "Breakdown" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:40 +msgid "Type" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:41 +msgid "Parameters" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:42 +msgid "Function" +msgstr "" + +#: templates/debug_toolbar/panels/headers.html:5 +msgid "Key" +msgstr "" + +#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/request_vars.html:12 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:60 +#: templates/debug_toolbar/panels/request_vars.html:82 +#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/timer.html:10 +msgid "Value" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:6 +msgid "Level" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:8 +msgid "Message" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:9 +msgid "Location" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:24 +msgid "No messages logged" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:11 +#: templates/debug_toolbar/panels/request_vars.html:37 +#: templates/debug_toolbar/panels/request_vars.html:59 +#: templates/debug_toolbar/panels/request_vars.html:81 +msgid "Variable" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:25 +msgid "No COOKIE data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:51 +msgid "No SESSION data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:73 +msgid "No GET data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:95 +msgid "No POST data" +msgstr "" + +#: templates/debug_toolbar/panels/settings_vars.html:5 +msgid "Setting" +msgstr "" + +#: templates/debug_toolbar/panels/signals.html:5 +msgid "Signal" +msgstr "" + +#: templates/debug_toolbar/panels/sql.html:6 +msgid "Action" +msgstr "" + +#: templates/debug_toolbar/panels/sql.html:30 +msgid "Line" +msgstr "" + +#: templates/debug_toolbar/panels/sql.html:31 +msgid "Method" +msgstr "" + +#: templates/debug_toolbar/panels/sql.html:32 +msgid "File" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:3 +#: templates/debug_toolbar/panels/sql_profile.html:3 +#: templates/debug_toolbar/panels/sql_select.html:3 +#: templates/debug_toolbar/panels/template_source.html:3 +msgid "Back" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:4 +msgid "SQL Explained" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:9 +#: templates/debug_toolbar/panels/sql_profile.html:10 +#: templates/debug_toolbar/panels/sql_select.html:9 +msgid "Executed SQL" +msgstr "" + +#: templates/debug_toolbar/panels/sql_profile.html:4 +msgid "SQL Profiled" +msgstr "" + +#: templates/debug_toolbar/panels/sql_profile.html:35 +msgid "Error" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:4 +msgid "SQL Selected" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:34 +msgid "Empty set" +msgstr "" + +#: templates/debug_toolbar/panels/templates.html:13 +msgid "Template" +msgstr "" + +#: templates/debug_toolbar/panels/timer.html:9 +msgid "Resource" +msgstr "" diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po index fe7e60b..3434eba 100644 --- a/debug_toolbar/locale/es/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Percy Pérez-Pinedo <percyp3@gmail.com>, 2009. -# +# # Caracteres especiales: á, é, í, ó, ú, ñ, -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-21 15:26-0700\n" +"POT-Creation-Date: 2009-09-11 18:05-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -34,11 +34,11 @@ msgid "Templates" msgstr "Plantillas" #: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 -#: templates/debug_toolbar/panels/logger.html:8 -#: templates/debug_toolbar/panels/sql.html:6 -#: templates/debug_toolbar/panels/sql_explain.html:7 -#: templates/debug_toolbar/panels/sql_profile.html:7 -#: templates/debug_toolbar/panels/sql_select.html:7 +#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/sql.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:11 +#: templates/debug_toolbar/panels/sql_profile.html:12 +#: templates/debug_toolbar/panels/sql_select.html:11 msgid "Time" msgstr "Tiempo" @@ -50,10 +50,19 @@ msgstr "Versión Django" msgid "Hide" msgstr "Ocultar" -#: templates/debug_toolbar/base.html:56 +#: templates/debug_toolbar/base.html:55 msgid "Close" msgstr "Cerrar" +#: templates/debug_toolbar/redirect.html:9 +msgid "" +"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>." +msgstr "" + #: templates/debug_toolbar/panels/cache.html:14 msgid "Total Calls" msgstr "Total Llamadas" @@ -62,6 +71,18 @@ msgstr "Total Llamadas" msgid "Total Time" msgstr "Tiempo Total" +#: templates/debug_toolbar/panels/cache.html:18 +msgid "Hits" +msgstr "Visitas" + +#: templates/debug_toolbar/panels/cache.html:20 +msgid "Misses" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:35 +msgid "Breakdown" +msgstr "" + #: templates/debug_toolbar/panels/cache.html:40 msgid "Type" msgstr "Tipo" @@ -74,117 +95,125 @@ msgstr "Parámetros" msgid "Function" msgstr "Función" -#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/headers.html:5 msgid "Key" msgstr "Llave" -#: templates/debug_toolbar/panels/headers.html:7 -#: templates/debug_toolbar/panels/request_vars.html:13 -#: templates/debug_toolbar/panels/request_vars.html:41 -#: templates/debug_toolbar/panels/request_vars.html:65 -#: templates/debug_toolbar/panels/request_vars.html:89 -#: templates/debug_toolbar/panels/settings_vars.html:7 -#: templates/debug_toolbar/panels/timer.html:11 +#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/request_vars.html:12 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:60 +#: templates/debug_toolbar/panels/request_vars.html:82 +#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/timer.html:10 msgid "Value" msgstr "Valor" -#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/logger.html:6 msgid "Level" msgstr "Nivel" -#: templates/debug_toolbar/panels/logger.html:9 +#: templates/debug_toolbar/panels/logger.html:8 msgid "Message" msgstr "Mensaje" -#: templates/debug_toolbar/panels/request_vars.html:26 -msgid "None" -msgstr "Ninguno" +#: templates/debug_toolbar/panels/logger.html:9 +msgid "Location" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:24 +msgid "No messages logged" +msgstr "No hay mensajes registrados" + +#: templates/debug_toolbar/panels/request_vars.html:11 +#: templates/debug_toolbar/panels/request_vars.html:37 +#: templates/debug_toolbar/panels/request_vars.html:59 +#: templates/debug_toolbar/panels/request_vars.html:81 +#, fuzzy +msgid "Variable" +msgstr "Variable" + +#: templates/debug_toolbar/panels/request_vars.html:25 +#, fuzzy +msgid "No COOKIE data" +msgstr "No GET datos" -#: templates/debug_toolbar/panels/request_vars.html:54 +#: templates/debug_toolbar/panels/request_vars.html:51 msgid "No SESSION data" msgstr "No SESSION datos" -#: templates/debug_toolbar/panels/request_vars.html:78 +#: templates/debug_toolbar/panels/request_vars.html:73 msgid "No GET data" msgstr "No GET datos" -#: templates/debug_toolbar/panels/request_vars.html:102 +#: templates/debug_toolbar/panels/request_vars.html:95 msgid "No POST data" msgstr "No POST datos" -#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/settings_vars.html:5 msgid "Setting" msgstr "Configuración" -#: templates/debug_toolbar/panels/signals.html:6 +#: templates/debug_toolbar/panels/signals.html:5 msgid "Signal" msgstr "Señal" -#: templates/debug_toolbar/panels/sql.html:7 +#: templates/debug_toolbar/panels/sql.html:6 msgid "Action" msgstr "Acción" -#: templates/debug_toolbar/panels/sql.html:31 +#: templates/debug_toolbar/panels/sql.html:30 msgid "Line" msgstr "Línea" -#: templates/debug_toolbar/panels/sql.html:32 +#: templates/debug_toolbar/panels/sql.html:31 msgid "Method" msgstr "Método" -#: templates/debug_toolbar/panels/sql.html:33 +#: templates/debug_toolbar/panels/sql.html:32 msgid "File" msgstr "Archivo" -#: templates/debug_toolbar/panels/sql_explain.html:2 -#: templates/debug_toolbar/panels/sql_profile.html:2 -#: templates/debug_toolbar/panels/sql_select.html:2 -#: templates/debug_toolbar/panels/template_source.html:2 +#: templates/debug_toolbar/panels/sql_explain.html:3 +#: templates/debug_toolbar/panels/sql_profile.html:3 +#: templates/debug_toolbar/panels/sql_select.html:3 +#: templates/debug_toolbar/panels/template_source.html:3 msgid "Back" msgstr "Regresar" -#: templates/debug_toolbar/panels/sql_explain.html:5 -#: templates/debug_toolbar/panels/sql_profile.html:5 -#: templates/debug_toolbar/panels/sql_select.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:4 +msgid "SQL Explained" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:9 +#: templates/debug_toolbar/panels/sql_profile.html:10 +#: templates/debug_toolbar/panels/sql_select.html:9 msgid "Executed SQL" msgstr "SQL Ejecutado" -#: templates/debug_toolbar/panels/sql_select.html:30 +#: templates/debug_toolbar/panels/sql_profile.html:4 +msgid "SQL Profiled" +msgstr "" + +#: templates/debug_toolbar/panels/sql_profile.html:35 +msgid "Error" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:4 +msgid "SQL Selected" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:34 msgid "Empty set" msgstr "Set Vacío" -#: templates/debug_toolbar/panels/templates.html:15 +#: templates/debug_toolbar/panels/templates.html:13 msgid "Template" msgstr "Plantilla" -#: templates/debug_toolbar/panels/timer.html:10 +#: templates/debug_toolbar/panels/timer.html:9 msgid "Resource" msgstr "Recurso" -#: templates/debug_toolbar/panels/cache.html:18 -msgid "Hits" -msgstr "Visitas" - -#: templates/debug_toolbar/panels/cache.html:35 -msgid "Breakdown" -msgstr "" - -#: templates/debug_toolbar/panels/cache.html:20 -msgid "Misses" -msgstr "" - -#: templates/debug_toolbar/panels/request_vars.html:12 -#: templates/debug_toolbar/panels/request_vars.html:40 -#: templates/debug_toolbar/panels/request_vars.html:64 -#: templates/debug_toolbar/panels/request_vars.html:88 -#, fuzzy -msgid "Variable" -msgstr "Variable" - -#: templates/debug_toolbar/panels/logger.html:25 -msgid "No messages logged" -msgstr "No hay mensajes registrados" - -#: templates/debug_toolbar/panels/logger.html:10 -msgid "Location" -msgstr "" +#~ msgid "None" +#~ msgstr "Ninguno" diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po index 7365992..5a4db1f 100644 --- a/debug_toolbar/locale/he/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-24 22:59-0500\n" +"POT-Creation-Date: 2009-09-11 18:05-0700\n" "PO-Revision-Date: 2009-08-24 23:08-0600\n" "Last-Translator: Alex <alex.gaynor@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,6 +15,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: panels/logger.py:56 +msgid "Logging" +msgstr "" + +#: panels/settings_vars.py:16 +msgid "Settings" +msgstr "" + +#: panels/signals.py:39 +#, fuzzy +msgid "Signals" +msgstr "סימן" + +#: panels/template.py:46 +#, fuzzy +msgid "Templates" +msgstr "תבנית" + +#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/sql.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:11 +#: templates/debug_toolbar/panels/sql_profile.html:12 +#: templates/debug_toolbar/panels/sql_select.html:11 +msgid "Time" +msgstr "זמן" + +#: panels/version.py:12 +msgid "Django Version" +msgstr "" + #: templates/debug_toolbar/base.html:24 msgid "Hide" msgstr "הסתיר" @@ -23,6 +54,15 @@ msgstr "הסתיר" msgid "Close" msgstr "סגור" +#: templates/debug_toolbar/redirect.html:9 +msgid "" +"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>." +msgstr "" + #: templates/debug_toolbar/panels/cache.html:14 msgid "Total Calls" msgstr "" @@ -31,6 +71,10 @@ msgstr "" msgid "Total Time" msgstr "זמן" +#: templates/debug_toolbar/panels/cache.html:18 +msgid "Hits" +msgstr "הצלחות" + #: templates/debug_toolbar/panels/cache.html:20 msgid "Misses" msgstr "" @@ -39,15 +83,6 @@ msgstr "" msgid "Breakdown" msgstr "" -#: templates/debug_toolbar/panels/cache.html:39 -#: templates/debug_toolbar/panels/logger.html:8 -#: templates/debug_toolbar/panels/sql.html:6 -#: templates/debug_toolbar/panels/sql_explain.html:10 -#: templates/debug_toolbar/panels/sql_profile.html:10 -#: templates/debug_toolbar/panels/sql_select.html:10 -msgid "Time" -msgstr "זמן" - #: templates/debug_toolbar/panels/cache.html:40 msgid "Type" msgstr "סוג" @@ -60,68 +95,80 @@ msgstr "" msgid "Function" msgstr "" -#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/headers.html:5 msgid "Key" msgstr "" -#: templates/debug_toolbar/panels/headers.html:7 -#: templates/debug_toolbar/panels/request_vars.html:13 -#: templates/debug_toolbar/panels/request_vars.html:41 -#: templates/debug_toolbar/panels/request_vars.html:65 -#: templates/debug_toolbar/panels/request_vars.html:89 -#: templates/debug_toolbar/panels/settings_vars.html:7 -#: templates/debug_toolbar/panels/timer.html:11 +#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/request_vars.html:12 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:60 +#: templates/debug_toolbar/panels/request_vars.html:82 +#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/timer.html:10 msgid "Value" msgstr "" -#: templates/debug_toolbar/panels/logger.html:9 +#: templates/debug_toolbar/panels/logger.html:6 +msgid "Level" +msgstr "רמה" + +#: templates/debug_toolbar/panels/logger.html:8 msgid "Message" msgstr "הודעה" -#: templates/debug_toolbar/panels/logger.html:10 +#: templates/debug_toolbar/panels/logger.html:9 msgid "Location" msgstr "מקום" -#: templates/debug_toolbar/panels/logger.html:25 +#: templates/debug_toolbar/panels/logger.html:24 msgid "No messages logged" msgstr "אין הודעות" -#: templates/debug_toolbar/panels/request_vars.html:12 -#: templates/debug_toolbar/panels/request_vars.html:40 -#: templates/debug_toolbar/panels/request_vars.html:64 -#: templates/debug_toolbar/panels/request_vars.html:88 +#: templates/debug_toolbar/panels/request_vars.html:11 +#: templates/debug_toolbar/panels/request_vars.html:37 +#: templates/debug_toolbar/panels/request_vars.html:59 +#: templates/debug_toolbar/panels/request_vars.html:81 msgid "Variable" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:26 +#: templates/debug_toolbar/panels/request_vars.html:25 msgid "No COOKIE data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:54 +#: templates/debug_toolbar/panels/request_vars.html:51 msgid "No SESSION data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:78 +#: templates/debug_toolbar/panels/request_vars.html:73 msgid "No GET data" msgstr "" -#: templates/debug_toolbar/panels/request_vars.html:102 +#: templates/debug_toolbar/panels/request_vars.html:95 msgid "No POST data" msgstr "" -#: templates/debug_toolbar/panels/signals.html:6 +#: templates/debug_toolbar/panels/settings_vars.html:5 +msgid "Setting" +msgstr "" + +#: templates/debug_toolbar/panels/signals.html:5 msgid "Signal" msgstr "סימן" -#: templates/debug_toolbar/panels/sql.html:31 +#: templates/debug_toolbar/panels/sql.html:6 +msgid "Action" +msgstr "" + +#: templates/debug_toolbar/panels/sql.html:30 msgid "Line" msgstr "שורה" -#: templates/debug_toolbar/panels/sql.html:32 +#: templates/debug_toolbar/panels/sql.html:31 msgid "Method" msgstr "" -#: templates/debug_toolbar/panels/sql.html:33 +#: templates/debug_toolbar/panels/sql.html:32 msgid "File" msgstr "קובץ" @@ -132,36 +179,36 @@ msgstr "קובץ" msgid "Back" msgstr "חזרה" -#: templates/debug_toolbar/panels/sql_explain.html:8 -#: templates/debug_toolbar/panels/sql_profile.html:8 -#: templates/debug_toolbar/panels/sql_select.html:8 -msgid "Executed SQL" +#: templates/debug_toolbar/panels/sql_explain.html:4 +msgid "SQL Explained" msgstr "" -#: templates/debug_toolbar/panels/templates.html:15 -msgid "Template" +#: templates/debug_toolbar/panels/sql_explain.html:9 +#: templates/debug_toolbar/panels/sql_profile.html:10 +#: templates/debug_toolbar/panels/sql_select.html:9 +msgid "Executed SQL" msgstr "" -#: templates/debug_toolbar/panels/timer.html:10 -msgid "Resource" +#: templates/debug_toolbar/panels/sql_profile.html:4 +msgid "SQL Profiled" msgstr "" -#: templates/debug_toolbar/panels/cache.html:18 -msgid "Hits" -msgstr "הצלחות" - -#: templates/debug_toolbar/panels/logger.html:7 -msgid "Level" -msgstr "רמה" - -#: templates/debug_toolbar/panels/sql.html:7 -msgid "Action" +#: templates/debug_toolbar/panels/sql_profile.html:35 +msgid "Error" msgstr "" -#: templates/debug_toolbar/panels/settings_vars.html:6 -msgid "Setting" +#: templates/debug_toolbar/panels/sql_select.html:4 +msgid "SQL Selected" msgstr "" -#: templates/debug_toolbar/panels/sql_select.html:33 +#: templates/debug_toolbar/panels/sql_select.html:34 msgid "Empty set" msgstr "תוצאות ריק" + +#: templates/debug_toolbar/panels/templates.html:13 +msgid "Template" +msgstr "תבנית" + +#: templates/debug_toolbar/panels/timer.html:9 +msgid "Resource" +msgstr "" diff --git a/debug_toolbar/locale/ru/LC_MESSAGES/django.po b/debug_toolbar/locale/ru/LC_MESSAGES/django.po new file mode 100644 index 0000000..a7de97c --- /dev/null +++ b/debug_toolbar/locale/ru/LC_MESSAGES/django.po @@ -0,0 +1,233 @@ +# Django Debug Toolbar in Russian. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Mikhail Korobov, 2009. +# +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-09-12 23:31+0600\n" +"PO-Revision-Date: \n" +"Last-Translator: Mikhail Korobov <kmike84@gmail.com>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: panels/headers.py:36 +msgid "HTTP Headers" +msgstr "Заголовки HTTP" + +#: panels/logger.py:56 +msgid "Logging" +msgstr "Журналирование" + +#: panels/request_vars.py:13 +msgid "Request Vars" +msgstr "Запрос" + +#: panels/settings_vars.py:16 +msgid "Settings" +msgstr "Настройки" + +#: panels/signals.py:39 +msgid "Signals" +msgstr "Сигналы" + +#: panels/template.py:46 +msgid "Templates" +msgstr "Шаблоны" + +#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39 +#: templates/debug_toolbar/panels/logger.html:7 +#: templates/debug_toolbar/panels/sql.html:5 +#: templates/debug_toolbar/panels/sql_explain.html:11 +#: templates/debug_toolbar/panels/sql_profile.html:12 +#: templates/debug_toolbar/panels/sql_select.html:11 +msgid "Time" +msgstr "Время" + +#: panels/version.py:12 +msgid "Django Version" +msgstr "Версия Django" + +#: templates/debug_toolbar/base.html:23 +msgid "Hide" +msgstr "Скрыть" + +#: templates/debug_toolbar/base.html:54 +msgid "Close" +msgstr "Закрыть" + +#: templates/debug_toolbar/redirect.html:9 +msgid "" +"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>." +msgstr "" +"Django Debug Toolbar в отладочных целях перехватила редирект на адрес, " +"указанный выше. Вы можете нажать на ссылку, чтобы продолжить обычное " +"выполнение. Если хотите отключить это поведение, установитев словаре " +"<code>DEBUG_TOOLBAR_CONFIG</code> ключ <code>INTERCEPT_REDIRECTS</" +"code>равным <code>False</code>." + +#: templates/debug_toolbar/panels/cache.html:14 +msgid "Total Calls" +msgstr "Всего вызовов" + +#: templates/debug_toolbar/panels/cache.html:16 +msgid "Total Time" +msgstr "Общее время" + +#: templates/debug_toolbar/panels/cache.html:18 +msgid "Hits" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:20 +msgid "Misses" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:35 +msgid "Breakdown" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:40 +msgid "Type" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:41 +msgid "Parameters" +msgstr "" + +#: templates/debug_toolbar/panels/cache.html:42 +msgid "Function" +msgstr "" + +#: templates/debug_toolbar/panels/headers.html:5 +msgid "Key" +msgstr "Заголовок" + +#: templates/debug_toolbar/panels/headers.html:6 +#: templates/debug_toolbar/panels/request_vars.html:12 +#: templates/debug_toolbar/panels/request_vars.html:38 +#: templates/debug_toolbar/panels/request_vars.html:60 +#: templates/debug_toolbar/panels/request_vars.html:82 +#: templates/debug_toolbar/panels/settings_vars.html:6 +#: templates/debug_toolbar/panels/timer.html:10 +msgid "Value" +msgstr "Значение" + +#: templates/debug_toolbar/panels/logger.html:6 +msgid "Level" +msgstr "Уровень" + +#: templates/debug_toolbar/panels/logger.html:8 +msgid "Message" +msgstr "Сообщение" + +#: templates/debug_toolbar/panels/logger.html:9 +msgid "Location" +msgstr "Место" + +#: templates/debug_toolbar/panels/logger.html:24 +msgid "No messages logged" +msgstr "Сообщений нет" + +#: templates/debug_toolbar/panels/request_vars.html:11 +#: templates/debug_toolbar/panels/request_vars.html:37 +#: templates/debug_toolbar/panels/request_vars.html:59 +#: templates/debug_toolbar/panels/request_vars.html:81 +msgid "Variable" +msgstr "Переменная" + +#: templates/debug_toolbar/panels/request_vars.html:25 +msgid "No COOKIE data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:51 +msgid "No SESSION data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:73 +msgid "No GET data" +msgstr "" + +#: templates/debug_toolbar/panels/request_vars.html:95 +msgid "No POST data" +msgstr "" + +#: templates/debug_toolbar/panels/settings_vars.html:5 +msgid "Setting" +msgstr "Параметр" + +#: templates/debug_toolbar/panels/signals.html:5 +msgid "Signal" +msgstr "Сигналы" + +#: templates/debug_toolbar/panels/sql.html:6 +msgid "Action" +msgstr "Действие" + +#: templates/debug_toolbar/panels/sql.html:8 +msgid "Query" +msgstr "Запрос" + +#: templates/debug_toolbar/panels/sql.html:30 +msgid "Line" +msgstr "Строка" + +#: templates/debug_toolbar/panels/sql.html:31 +msgid "Method" +msgstr "Метод" + +#: templates/debug_toolbar/panels/sql.html:32 +msgid "File" +msgstr "Файл" + +#: templates/debug_toolbar/panels/sql_explain.html:3 +#: templates/debug_toolbar/panels/sql_profile.html:3 +#: templates/debug_toolbar/panels/sql_select.html:3 +#: templates/debug_toolbar/panels/template_source.html:3 +msgid "Back" +msgstr "Назад" + +#: templates/debug_toolbar/panels/sql_explain.html:4 +msgid "SQL Explained" +msgstr "" + +#: templates/debug_toolbar/panels/sql_explain.html:9 +#: templates/debug_toolbar/panels/sql_profile.html:10 +#: templates/debug_toolbar/panels/sql_select.html:9 +msgid "Executed SQL" +msgstr "Запрос" + +#: templates/debug_toolbar/panels/sql_profile.html:4 +msgid "SQL Profiled" +msgstr "" + +#: templates/debug_toolbar/panels/sql_profile.html:35 +msgid "Error" +msgstr "Ошибка" + +#: templates/debug_toolbar/panels/sql_select.html:4 +msgid "SQL Selected" +msgstr "" + +#: templates/debug_toolbar/panels/sql_select.html:34 +msgid "Empty set" +msgstr "Ничего" + +#: templates/debug_toolbar/panels/templates.html:13 +msgid "Template" +msgstr "" + +#: templates/debug_toolbar/panels/timer.html:9 +msgid "Resource" +msgstr "Ресурс" + +#~ msgid "Template Source" +#~ msgstr "Исходный код шаблона" diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 316f4df..0f65c9c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -9,16 +9,17 @@ #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: 12px; - line-height: 1.5em; - color: #000; - vertical-align: baseline; - background: transparent; - font-family: sans-serif; + margin:0; + padding:0; + border:0; + outline:0; + font-size:12px; + line-height:1.5em; + color:#000; + vertical-align:baseline; + background:transparent; + font-family:sans-serif; + text-align:left; } #djDebug #djDebugToolbar { @@ -130,10 +131,11 @@ #djDebug pre { background-color:#ffffff; + overflow:auto; } -#djDebug tr.djDebugOdd pre { - background-color:#eeeeee; +#djDebug tr.djDebugOdd { + background-color:#f5f5f5; } #djDebug .panelContent { @@ -200,6 +202,7 @@ background-color:#fff; display:block; margin-top:0.8em; + overflow: auto; } #djDebug .panelContent tbody td, #djDebug .panelContent tbody th { @@ -208,11 +211,9 @@ } #djDebug .panelContent thead th { padding:1px 6px 1px 3px; - background:#fefefe; text-align:left; - font-weight:normal; - font-size:11px; - border:1px solid #ddd; + font-weight:bold; + font-size:14px; } #djDebug .panelContent tbody th { width:12em; diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index 8155e2f..fc4162f 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -26,6 +26,7 @@ jQuery(function($j) { }); $j('#djDebug a.close').click(function() { $j(document).trigger('close.djDebug'); + $j('#djDebugToolbar li').removeClass('active'); return false; }); $j('#djDebug a.remoteCall').click(function() { diff --git a/debug_toolbar/media/debug_toolbar/toolbar.min.css b/debug_toolbar/media/debug_toolbar/toolbar.min.css index 3de6dac..135b0bb 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.min.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.min.css @@ -1 +1 @@ -#djDebug{color:#000;background:#FFF;}#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:12px;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:fixed;top:0;bottom:0;right:0;opacity:.9;}#djDebug #djDebugToolbar small{color:#999;}#djDebug #djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebug #djDebugToolbar li{border-bottom:1px solid #222;color:#fff;display:block;font-weight:bold;float:none;margin:0;padding:0;position:relative;width:auto;}#djDebug #djDebugToolbar li>a,#djDebug #djDebugToolbar li>div.contentless{font-weight:normal;font-style:normal;text-decoration:none;display:block;font-size:16px;padding:10px 10px 5px 25px;color:#fff;}#djDebug #djDebugToolbar li a:hover{color:#111;background-color:#ffc;}#djDebug #djDebugToolbar li.active{background-image:url(indicator.png);background-repeat:no-repeat;background-position:left center;background-color:#333;padding-left:10px;}#djDebug #djDebugToolbar li.active a:hover{color:#b36a60;background-color:transparent;}#djDebug #djDebugToolbar li small{font-size:12px;color:#999;font-style:normal;text-decoration:none;font-variant:small-caps;}#djDebug #djDebugToolbarHandle{position:fixed;background:#fff;border:1px solid #111;top:30px;right:0;z-index:100000000;opacity:.75;}#djDebug a#djShowToolBarButton{display:block;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:.5;}#djDebug a#djShowToolBarButton:hover{background-color:#111;padding-right:6px;border-top-color:#FFE761;border-left-color:#FFE761;border-bottom-color:#FFE761;opacity:1.0;}#djDebug pre{background-color:#fff;}#djDebug tr.djDebugOdd pre{background-color:#eee;}#djDebug .panelContent{display:none;position:fixed;margin:0;top:0;right:200px;bottom:0;left:0;background-color:#eee;color:#666;z-index:100000000;}#djDebug .panelContent>div{border-bottom:1px solid #ddd;}#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:0 0 0 20px;}#djDebug .djDebugPanelContent .scroll{height:100%;overflow:auto;display:block;padding:0 10px 0 0;}#djDebug h3{font-size:24px;font-weight:normal;line-height:50px;}#djDebug h4{font-size:20px;font-weight:bold;margin-top:.8em;}#djDebug .panelContent table{border:1px solid #ccc;border-collapse:collapse;width:100%;background-color:#fff;display:block;margin-top:.8em;}#djDebug .panelContent tbody td,#djDebug .panelContent tbody th{vertical-align:top;padding:2px 3px;}#djDebug .panelContent thead th{padding:1px 6px 1px 3px;background:#fefefe;text-align:left;font-weight:normal;font-size:11px;border:1px solid #ddd;}#djDebug .panelContent tbody th{width:12em;text-align:right;color:#666;padding-right:.5em;}#djDebug .panelContent code{font-family:Consolas,Monaco,"Bitstream Vera Sans Mono","Lucida Console",monospace;}#djDebug .panelContent .close{text-indent:-9999999px;display:block;position:absolute;top:4px;right:15px;height:40px;width:40px;background:url(close.png) no-repeat center center;}#djDebug .panelContent .close:hover{background-image:url(close_hover.png);}#djDebug .panelContent .close.back{background-image:url(back.png);}#djDebug .panelContent .close.back:hover{background-image:url(back_hover.png);}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dt{margin-top:.75em;}#djDebug .panelContent dd{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 .djDebugSqlWrap{position:relative;}#djDebug .djDebugSql{z-index:100000002;}#djDebug span.djDebugLineChart{border-top:3px solid #777;position:absolute;bottom:0;top:0;left:0;display:block;z-index:1000000001;}#djDebug span.djDebugLineChartWarning{border-top-color:#900;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#000;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#000;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#000;font-weight:bold;}#djDebug .highlight .s{color:#333;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#000;font-weight:bold;}#djDebug .highlight .na{color:#333;}#djDebug .highlight .nt{color:#000;font-weight:bold;}#djDebug .highlight .nv{color:#333;}#djDebug .highlight .s2{color:#333;}#djDebug .highlight .cp{color:#333;}
\ No newline at end of file +#djDebug{color:#000;background:#FFF;}#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:12px;line-height:1.5em;color:#000;vertical-align:baseline;background:transparent;font-family:sans-serif;text-align:left;}#djDebug #djDebugToolbar{background:#111;width:200px;z-index:100000000;position:fixed;top:0;bottom:0;right:0;opacity:.9;}#djDebug #djDebugToolbar small{color:#999;}#djDebug #djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebug #djDebugToolbar li{border-bottom:1px solid #222;color:#fff;display:block;font-weight:bold;float:none;margin:0;padding:0;position:relative;width:auto;}#djDebug #djDebugToolbar li>a,#djDebug #djDebugToolbar li>div.contentless{font-weight:normal;font-style:normal;text-decoration:none;display:block;font-size:16px;padding:10px 10px 5px 25px;color:#fff;}#djDebug #djDebugToolbar li a:hover{color:#111;background-color:#ffc;}#djDebug #djDebugToolbar li.active{background-image:url(indicator.png);background-repeat:no-repeat;background-position:left center;background-color:#333;padding-left:10px;}#djDebug #djDebugToolbar li.active a:hover{color:#b36a60;background-color:transparent;}#djDebug #djDebugToolbar li small{font-size:12px;color:#999;font-style:normal;text-decoration:none;font-variant:small-caps;}#djDebug #djDebugToolbarHandle{position:fixed;background:#fff;border:1px solid #111;top:30px;right:0;z-index:100000000;opacity:.75;}#djDebug a#djShowToolBarButton{display:block;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:.5;}#djDebug a#djShowToolBarButton:hover{background-color:#111;padding-right:6px;border-top-color:#FFE761;border-left-color:#FFE761;border-bottom-color:#FFE761;opacity:1.0;}#djDebug pre{background-color:#fff;overflow:auto;}#djDebug tr.djDebugOdd{background-color:#f5f5f5;}#djDebug .panelContent{display:none;position:fixed;margin:0;top:0;right:200px;bottom:0;left:0;background-color:#eee;color:#666;z-index:100000000;}#djDebug .panelContent>div{border-bottom:1px solid #ddd;}#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:0 0 0 20px;}#djDebug .djDebugPanelContent .scroll{height:100%;overflow:auto;display:block;padding:0 10px 0 0;}#djDebug h3{font-size:24px;font-weight:normal;line-height:50px;}#djDebug h4{font-size:20px;font-weight:bold;margin-top:.8em;}#djDebug .panelContent table{border:1px solid #ccc;border-collapse:collapse;width:100%;background-color:#fff;display:block;margin-top:.8em;overflow:auto;}#djDebug .panelContent tbody td,#djDebug .panelContent tbody th{vertical-align:top;padding:2px 3px;}#djDebug .panelContent thead th{padding:1px 6px 1px 3px;text-align:left;font-weight:bold;font-size:14px;}#djDebug .panelContent tbody th{width:12em;text-align:right;color:#666;padding-right:.5em;}#djDebug .panelContent code{font-family:Consolas,Monaco,"Bitstream Vera Sans Mono","Lucida Console",monospace;}#djDebug .panelContent .close{text-indent:-9999999px;display:block;position:absolute;top:4px;right:15px;height:40px;width:40px;background:url(close.png) no-repeat center center;}#djDebug .panelContent .close:hover{background-image:url(close_hover.png);}#djDebug .panelContent .close.back{background-image:url(back.png);}#djDebug .panelContent .close.back:hover{background-image:url(back_hover.png);}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dt{margin-top:.75em;}#djDebug .panelContent dd{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 .djDebugSqlWrap{position:relative;}#djDebug .djDebugSql{z-index:100000002;}#djDebug span.djDebugLineChart{border-top:3px solid #777;position:absolute;bottom:0;top:0;left:0;display:block;z-index:1000000001;}#djDebug span.djDebugLineChartWarning{border-top-color:#900;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#000;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#000;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#000;font-weight:bold;}#djDebug .highlight .s{color:#333;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#000;font-weight:bold;}#djDebug .highlight .na{color:#333;}#djDebug .highlight .nt{color:#000;font-weight:bold;}#djDebug .highlight .nv{color:#333;}#djDebug .highlight .s2{color:#333;}#djDebug .highlight .cp{color:#333;}
\ No newline at end of file diff --git a/debug_toolbar/media/debug_toolbar/toolbar.min.js b/debug_toolbar/media/debug_toolbar/toolbar.min.js index 4df4d68..2545497 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.min.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.min.js @@ -1 +1 @@ -jQuery.noConflict();jQuery(function(b){var a="dj_debug_panel";b.djDebug=function(d,c){b.djDebug.init()};b.extend(b.djDebug,{init:function(){var c=null;b("#djDebugPanelList li a").click(function(){if(!this.className){return false}c=b("#djDebug #"+this.className);if(c.is(":visible")){b(document).trigger("close.djDebug");b(this).parent().removeClass("active")}else{b(".panelContent").hide();c.show();b.djDebug.open();b("#djDebugToolbar li").removeClass("active");b(this).parent().addClass("active")}return false});b("#djDebug a.close").click(function(){b(document).trigger("close.djDebug");return false});b("#djDebug a.remoteCall").click(function(){b("#djDebugWindow").load(this.href,{},function(){b("#djDebugWindow a.back").click(function(){b(this).parent().parent().hide();return false})});b("#djDebugWindow").show();return false});b("#djDebugTemplatePanel a.djTemplateShowContext").click(function(){b.djDebug.toggle_arrow(b(this).children(".toggleArrow"));b.djDebug.toggle_content(b(this).parent().next());return false});b("#djDebugSQLPanel a.djSQLShowStacktrace").click(function(){b.djDebug.toggle_content(b(this).parent().next());return false});b("#djHideToolBarButton").click(function(){b.djDebug.hide_toolbar(true);return false});b("#djShowToolBarButton").click(function(){b.djDebug.show_toolbar();return false});if(b.cookie(a)){b.djDebug.hide_toolbar(false)}else{b.djDebug.show_toolbar(false)}},open:function(){},toggle_content:function(c){if(c.is(":visible")){c.hide()}else{c.show()}},close:function(){b(document).trigger("close.djDebug");return false},hide_toolbar:function(c){b("#djDebugWindow").hide();b(".panelContent").hide();b("#djDebugToolbar li").removeClass("active");b("#djDebugToolbar").hide("fast");b("#djDebugToolbarHandle").show();b(document).unbind("keydown.djDebug");if(c){b.cookie(a,"hide",{path:"/",expires:10})}},show_toolbar:function(c){b(document).bind("keydown.djDebug",function(d){if(d.keyCode==27){b.djDebug.close()}});b("#djDebugToolbarHandle").hide();if(c){b("#djDebugToolbar").show("fast")}else{b("#djDebugToolbar").show()}b.cookie(a,null,{path:"/",expires:-1})},toggle_arrow:function(d){var c=String.fromCharCode(9654);var e=String.fromCharCode(9660);d.html(d.html()==c?e:c)}});b(document).bind("close.djDebug",function(){if(b("#djDebugWindow").is(":visible")){b("#djDebugWindow").hide();return}if(b(".panelContent").is(":visible")){b(".panelContent").hide();return}if(b("#djDebugToolbar").is(":visible")){b.djDebug.hide_toolbar(true);return}})});jQuery(function(){jQuery.djDebug()});jQuery.cookie=function(b,j,m){if(typeof j!="undefined"){m=m||{};if(j===null){j="";m.expires=-1}var e="";if(m.expires&&(typeof m.expires=="number"||m.expires.toUTCString)){var f;if(typeof m.expires=="number"){f=new Date();f.setTime(f.getTime()+(m.expires*24*60*60*1000))}else{f=m.expires}e="; expires="+f.toUTCString()}var l=m.path?"; path="+(m.path):"";var g=m.domain?"; domain="+(m.domain):"";var a=m.secure?"; secure":"";document.cookie=[b,"=",encodeURIComponent(j),e,l,g,a].join("")}else{var d=null;if(document.cookie&&document.cookie!=""){var k=document.cookie.split(";");for(var h=0;h<k.length;h++){var c=jQuery.trim(k[h]);if(c.substring(0,b.length+1)==(b+"=")){d=decodeURIComponent(c.substring(b.length+1));break}}}return d}};
\ No newline at end of file +jQuery.noConflict();jQuery(function(b){var a="dj_debug_panel";b.djDebug=function(d,c){b.djDebug.init()};b.extend(b.djDebug,{init:function(){var c=null;b("#djDebugPanelList li a").click(function(){if(!this.className){return false}c=b("#djDebug #"+this.className);if(c.is(":visible")){b(document).trigger("close.djDebug");b(this).parent().removeClass("active")}else{b(".panelContent").hide();c.show();b.djDebug.open();b("#djDebugToolbar li").removeClass("active");b(this).parent().addClass("active")}return false});b("#djDebug a.close").click(function(){b(document).trigger("close.djDebug");b("#djDebugToolbar li").removeClass("active");return false});b("#djDebug a.remoteCall").click(function(){b("#djDebugWindow").load(this.href,{},function(){b("#djDebugWindow a.back").click(function(){b(this).parent().parent().hide();return false})});b("#djDebugWindow").show();return false});b("#djDebugTemplatePanel a.djTemplateShowContext").click(function(){b.djDebug.toggle_arrow(b(this).children(".toggleArrow"));b.djDebug.toggle_content(b(this).parent().next());return false});b("#djDebugSQLPanel a.djSQLShowStacktrace").click(function(){b.djDebug.toggle_content(b(this).parent().next());return false});b("#djHideToolBarButton").click(function(){b.djDebug.hide_toolbar(true);return false});b("#djShowToolBarButton").click(function(){b.djDebug.show_toolbar();return false});if(b.cookie(a)){b.djDebug.hide_toolbar(false)}else{b.djDebug.show_toolbar(false)}},open:function(){},toggle_content:function(c){if(c.is(":visible")){c.hide()}else{c.show()}},close:function(){b(document).trigger("close.djDebug");return false},hide_toolbar:function(c){b("#djDebugWindow").hide();b(".panelContent").hide();b("#djDebugToolbar li").removeClass("active");b("#djDebugToolbar").hide("fast");b("#djDebugToolbarHandle").show();b(document).unbind("keydown.djDebug");if(c){b.cookie(a,"hide",{path:"/",expires:10})}},show_toolbar:function(c){b(document).bind("keydown.djDebug",function(d){if(d.keyCode==27){b.djDebug.close()}});b("#djDebugToolbarHandle").hide();if(c){b("#djDebugToolbar").show("fast")}else{b("#djDebugToolbar").show()}b.cookie(a,null,{path:"/",expires:-1})},toggle_arrow:function(d){var c=String.fromCharCode(9654);var e=String.fromCharCode(9660);d.html(d.html()==c?e:c)}});b(document).bind("close.djDebug",function(){if(b("#djDebugWindow").is(":visible")){b("#djDebugWindow").hide();return}if(b(".panelContent").is(":visible")){b(".panelContent").hide();return}if(b("#djDebugToolbar").is(":visible")){b.djDebug.hide_toolbar(true);return}})});jQuery(function(){jQuery.djDebug()});jQuery.cookie=function(b,j,m){if(typeof j!="undefined"){m=m||{};if(j===null){j="";m.expires=-1}var e="";if(m.expires&&(typeof m.expires=="number"||m.expires.toUTCString)){var f;if(typeof m.expires=="number"){f=new Date();f.setTime(f.getTime()+(m.expires*24*60*60*1000))}else{f=m.expires}e="; expires="+f.toUTCString()}var l=m.path?"; path="+(m.path):"";var g=m.domain?"; domain="+(m.domain):"";var a=m.secure?"; secure":"";document.cookie=[b,"=",encodeURIComponent(j),e,l,g,a].join("")}else{var d=null;if(document.cookie&&document.cookie!=""){var k=document.cookie.split(";");for(var h=0;h<k.length;h++){var c=jQuery.trim(k[h]);if(c.substring(0,b.length+1)==(b+"=")){d=decodeURIComponent(c.substring(b.length+1));break}}}return d}};
\ No newline at end of file diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py index 3903b54..0c9bc61 100644 --- a/debug_toolbar/panels/sql.py +++ b/debug_toolbar/panels/sql.py @@ -1,6 +1,6 @@ +from datetime import datetime import os import SocketServer -from datetime import datetime import traceback import django @@ -22,15 +22,45 @@ socketserver_path = os.path.realpath(os.path.dirname(SocketServer.__file__)) # get a copy of the toolbar object with access to its config dictionary SQL_WARNING_THRESHOLD = getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}).get('SQL_WARNING_THRESHOLD', 500) +# Note: This isn't intended to catch ALL possible SQL keywords, just a good common set. +# Note: Subsets are listed last to avoid matching a subset of a keyword. This +# whole thing could be greatly improved but for now this works. SQL_KEYWORDS = ( - 'SELECT', + 'ALTER', + 'AND', + 'ASC', + 'AS', + 'AVG', + 'COUNT', + 'CREATE', + 'DESC', + 'DELETE', + 'DISTINCT', + 'DROP', 'FROM', - 'WHERE', + 'GROUP BY', + 'HAVING', 'INNER JOIN', + 'INSERT', + 'IN', 'LEFT OUTER JOIN', + 'LIKE', + 'LIMIT', + 'MAX', + 'MIN', + 'OFFSET', + 'ON', 'ORDER BY', - 'HAVING', - 'GROUP BY', + 'OR', + 'SELECT', + 'SET', + 'STDDEV_POP', + 'STDDEV_SAMP', + 'SUM', + 'UPDATE', + 'VAR_POP', + 'VAR_SAMP', + 'WHERE', ) def tidy_stacktrace(strace): @@ -43,7 +73,8 @@ def tidy_stacktrace(strace): trace = [] for s in strace[:-1]: s_path = os.path.realpath(s[0]) - if getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}).get('HIDE_DJANGO_SQL', True) and django_path in s_path and not 'django/contrib' in s_path: + if getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}).get('HIDE_DJANGO_SQL', True) \ + and django_path in s_path and not 'django/contrib' in s_path: continue if socketserver_path in s_path: continue @@ -78,7 +109,8 @@ class DatabaseStatTracker(util.CursorDebugWrapper): 'stacktrace': stacktrace, 'start_time': start, 'stop_time': stop, - 'is_slow': (duration > SQL_WARNING_THRESHOLD) + 'is_slow': (duration > SQL_WARNING_THRESHOLD), + 'is_select': sql.lower().strip().startswith('select'), }) util.CursorDebugWrapper = DatabaseStatTracker diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index f220b62..c82f099 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -1,5 +1,4 @@ {% 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,4 +64,3 @@ {% 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 81188a9..ba8a2c3 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -14,7 +14,9 @@ <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><br> + {% if query.is_select %} + <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> + {% endif %} <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><br> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html index 57fa538..586bc25 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html @@ -1,31 +1,33 @@ {% load i18n %} <div class="djDebugPanelTitle"> <a class="close back" href="">{% trans "Back" %}</a> - <h3>SQL Explained</h3> + <h3>{% trans "SQL Explained" %}</h3> </div> <div class="djDebugPanelContent"> - <dl> - <dt>{% trans "Executed SQL" %}</dt> - <dd>{{ sql|safe }}</dd> - <dt>{% trans "Time" %}</dt> - <dd>{{ duration }} ms</dd> - </dl> - <table> - <thead> - <tr> - {% for h in headers %} - <th>{{ h|upper }}</th> - {% endfor %} - </tr> - </thead> - <tbody> - {% for row in result %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - {% for column in row %} - <td>{{ column|escape }}</td> + <div class="scroll"> + <dl> + <dt>{% trans "Executed SQL" %}</dt> + <dd>{{ sql|safe }}</dd> + <dt>{% trans "Time" %}</dt> + <dd>{{ duration }} ms</dd> + </dl> + <table> + <thead> + <tr> + {% for h in headers %} + <th>{{ h|upper }}</th> {% endfor %} </tr> - {% endfor %} - </tbody> - </table> + </thead> + <tbody> + {% for row in result %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + {% for column in row %} + <td>{{ column|escape }}</td> + {% endfor %} + </tr> + {% endfor %} + </tbody> + </table> + </div> </div> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html index a3d3240..f551a6f 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html @@ -1,38 +1,40 @@ {% load i18n %} <div class="djDebugPanelTitle"> <a class="close back" href="">{% trans "Back" %}</a> - <h3>SQL Profiled</h3> + <h3>{% trans "SQL Profiled" %}</h3> </div> <div class="djDebugPanelContent"> - {% if result %} - <dl> - <dt>{% trans "Executed SQL" %}</dt> - <dd>{{ sql|safe }}</dd> - <dt>{% trans "Time" %}</dt> - <dd>{{ duration }} ms</dd> - </dl> - <table> - <thead> - <tr> - {% for h in headers %} - <th>{{ h|upper }}</th> - {% endfor %} - </tr> - </thead> - <tbody> - {% for row in result %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - {% for column in row %} - <td>{{ column|escape }}</td> + <div class="scroll"> + {% if result %} + <dl> + <dt>{% trans "Executed SQL" %}</dt> + <dd>{{ sql|safe }}</dd> + <dt>{% trans "Time" %}</dt> + <dd>{{ duration }} ms</dd> + </dl> + <table> + <thead> + <tr> + {% for h in headers %} + <th>{{ h|upper }}</th> {% endfor %} </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <dl> - <dt>{% trans 'Error' %}</dt> - <dd>{{ result_error }}</dd> - </dl> - {% endif %} + </thead> + <tbody> + {% for row in result %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + {% for column in row %} + <td>{{ column|escape }}</td> + {% endfor %} + </tr> + {% endfor %} + </tbody> + </table> + {% else %} + <dl> + <dt>{% trans 'Error' %}</dt> + <dd>{{ result_error }}</dd> + </dl> + {% endif %} + </div> </div> diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html index a240b07..fd839eb 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html @@ -1,35 +1,37 @@ {% load i18n %} <div class="djDebugPanelTitle"> <a class="close back" href="">{% trans "Back" %}</a> - <h3>SQL Selected</h3> + <h3>{% trans "SQL Selected" %}</h3> </div> <div class="djDebugPanelContent"> - <dl> - <dt>{% trans "Executed SQL" %}</dt> - <dd>{{ sql|safe }}</dd> - <dt>{% trans "Time" %}</dt> - <dd>{{ duration }} ms</dd> - </dl> - {% if result %} - <table> - <thead> - <tr> - {% for h in headers %} - <th>{{ h|upper }}</th> - {% endfor %} - </tr> - </thead> - <tbody> - {% for row in result %} - <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> - {% for column in row %} - <td>{{ column|escape }}</td> + <div class="scroll"> + <dl> + <dt>{% trans "Executed SQL" %}</dt> + <dd>{{ sql|safe }}</dd> + <dt>{% trans "Time" %}</dt> + <dd>{{ duration }} ms</dd> + </dl> + {% if result %} + <table> + <thead> + <tr> + {% for h in headers %} + <th>{{ h|upper }}</th> {% endfor %} </tr> - {% endfor %} - </tbody> - </table> - {% else %} - <p>{% trans "Empty set" %}</p> - {% endif %} + </thead> + <tbody> + {% for row in result %} + <tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}"> + {% for column in row %} + <td>{{ column|escape }}</td> + {% endfor %} + </tr> + {% endfor %} + </tbody> + </table> + {% else %} + <p>{% trans "Empty set" %}</p> + {% endif %} + </div> </div> diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html index 068fe8c..93dd67c 100644 --- a/debug_toolbar/templates/debug_toolbar/redirect.html +++ b/debug_toolbar/templates/debug_toolbar/redirect.html @@ -4,7 +4,7 @@ </head> <body> <h1>HttpResponseRedirect</h1> -<p>Location: <a href="{{ redirect_to|urlencode }}">{{ redirect_to }}</a></p> +<p>Location: <a href="{{ redirect_to }}">{{ 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>." %} </p> |