From 5151e5ff87ab56352df8d6979c14542aa18b2538 Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 2 Jan 2009 23:19:45 -0800 Subject: working on translating the django toolbar into Spanish. Translating panel template: cache.html --- .../templates/debug_toolbar/panels/cache.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/cache.html b/debug_toolbar/templates/debug_toolbar/panels/cache.html index 3142783..7667740 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/cache.html +++ b/debug_toolbar/templates/debug_toolbar/panels/cache.html @@ -1,3 +1,4 @@ +{% load i18n %}

Cache Usage

@@ -11,13 +12,13 @@ - + - + - + - + @@ -32,14 +33,14 @@
Total Calls{% trans "Total Calls" %} {{ cache_calls }}Total Time{% trans "Total Time" %} {{ cache_time }}msHits{% trans "Hits" %} {{ cache.hits }}Misses{% trans "Misses" %} {{ cache.misses }}
{% if cache.calls %} -

Breakdown

+

{% trans "Breakdown" %}

- - - - + + + + -- cgit v1.2.3 From 22fde8255f935dbadcd958ee04fc3f0a94a64704 Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 2 Jan 2009 23:26:02 -0800 Subject: finished adding "trans" to panel template headers.html --- debug_toolbar/templates/debug_toolbar/panels/headers.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index 3ac7fd3..0a1578d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -1,9 +1,10 @@ +{% load i18n %}

HTTP Headers

Time (ms)TypeParametersFunction{% trans "Time (ms)" %}{% trans "Type" %}{% trans "Parameters" %}{% trans "Function" %}
- - + + -- cgit v1.2.3 From 74763c3eb7e8debdf502697dfa28b0122cc9a628 Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 2 Jan 2009 23:36:49 -0800 Subject: trans fue incorporado a logger.html --- debug_toolbar/templates/debug_toolbar/panels/headers.html | 2 +- debug_toolbar/templates/debug_toolbar/panels/logger.html | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index 0a1578d..00b28e2 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -4,7 +4,7 @@ - + diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html index c079065..112cc7d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/logger.html +++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html @@ -1,12 +1,13 @@ +{% load i18n %}

Log Messages

{% if records %}
KeyValue{% trans "Key" %}{% trans "Value" %}
{% trans "Key" %}{% trans "Value" %}{% trans Value %}
- - - - + + + + @@ -21,6 +22,6 @@
LevelTimeMessageLocation{% trans "Level" %}{% trans "Time" %}{% trans "Message" %}{% trans "Location" %}
{% else %} -

No messages logged.

+

{% trans "No messages logged" %}.

{% endif %} -- cgit v1.2.3 From 77c0f4d0b1bb7392b5893cc2fc055ec7605c4fed Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 2 Jan 2009 23:39:15 -0800 Subject: adding i18n to request_vars template --- debug_toolbar/templates/debug_toolbar/panels/request_vars.html | 1 + 1 file changed, 1 insertion(+) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html index fe317ae..0885711 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html @@ -1,3 +1,4 @@ +{% load i18n %}

COOKIES Variables

{% if cookies %} -- cgit v1.2.3 From 5387dbaecb4cd339279dad1b970e15231b9b5deb Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 2 Jan 2009 23:44:30 -0800 Subject: added trans to request_vars.html --- .../templates/debug_toolbar/panels/headers.html | 2 +- .../debug_toolbar/panels/request_vars.html | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index 00b28e2..0a1578d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -4,7 +4,7 @@ - + diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html index 0885711..751e1da 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html @@ -8,8 +8,8 @@ - - + + @@ -22,7 +22,7 @@
{% trans "Key" %}{% trans Value %}{% trans "Value" %}
KeyValue{% trans "Key" %}{% trans "Value" %}
{% else %} -

None

+

{% trans "None" %}

{% endif %}

SESSION Variables

{% if session %} @@ -33,8 +33,8 @@ - Key - Value + {% trans "Key" %} + {% trans "Value" %} @@ -47,15 +47,15 @@ {% else %} -

None

+

{% trans "None" %}

{% endif %}

GET Variables

{% if get %} - - + + @@ -68,15 +68,15 @@
KeyValue{% trans "Key" %}{% trans "Value" %}
{% else %} -

None

+

{% trans "None" %}

{% endif %}

POST Variables

{% if post %} - - + + @@ -89,5 +89,5 @@
KeyValue{% trans "Key" %}{% trans "Value" %}
{% else %} -

None

+

{% trans "None" %}

{% endif %} -- cgit v1.2.3 From 88fbcdcaaf9d8cced4d321ffed395b7937b9aa2a Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Sun, 4 Jan 2009 15:07:34 -0800 Subject: added "trans" to the templates to be translated --- debug_toolbar/templates/debug_toolbar/panels/settings_vars.html | 5 +++-- debug_toolbar/templates/debug_toolbar/panels/sql.html | 7 ++++--- debug_toolbar/templates/debug_toolbar/panels/sql_explain.html | 7 ++++--- debug_toolbar/templates/debug_toolbar/panels/sql_profile.html | 7 ++++--- debug_toolbar/templates/debug_toolbar/panels/sql_select.html | 9 +++++---- .../templates/debug_toolbar/panels/template_source.html | 3 ++- debug_toolbar/templates/debug_toolbar/panels/timer.html | 5 +++-- debug_toolbar/templates/debug_toolbar/redirect.html | 7 +++++-- 8 files changed, 30 insertions(+), 20 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html index 1d332bf..1e84edf 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html @@ -1,9 +1,10 @@ +{% load i18n %}

Settings from {{ settings.SETTINGS_MODULE }}

- - + + diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 7de2220..0dc82e6 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -1,10 +1,11 @@ +{% load i18n %}

SQL Queries

SettingValue{% trans "Setting" %}{% trans "Value" %}
- - - + + + diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html index dc306f0..cb3ca5e 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html @@ -1,9 +1,10 @@ -« Back +{% load i18n %} +« {% trans "Back" %}

SQL Explained

-
Executed SQL
+
{% trans "Executed SQL" %}
{{ sql|safe }}
-
Time
+
{% trans "Time" %}
{{ time }} ms
Time (ms)ActionQuery{% trans "Time (ms)" %}{% trans "Action" %}{% trans "Query" %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html index c1d04ce..c058b2b 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html @@ -1,9 +1,10 @@ -« Back +{% load i18n %} +« {% trans "Back" %}

SQL Profiled

-
Executed SQL
+
{% trans "Executed SQL" %}
{{ sql|safe }}
-
Time
+
{% trans "Time" %}
{{ time }} ms
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html index 73109ef..c2ab7b6 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html @@ -1,9 +1,10 @@ -« Back +{% load i18n %} +« {% trans "Back" %}

SQL Selected

-
Executed SQL
+
{% trans "Executed SQL" %}
{{ sql|safe }}
-
Time
+
{% trans "Time" %}
{{ time }} ms
{% if result %} @@ -26,5 +27,5 @@
{% else %} -

Empty set

+

{% trans "Empty set" %}

{% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index 572522b..e716691 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html +++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html @@ -1,3 +1,4 @@ -« Back +{% load i18n %} +« {% trans "Back" %}

Template Source: {{ template_name }}

{{ source }} diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index 1b077c6..2d409b0 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/timer.html +++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html @@ -1,3 +1,4 @@ +{% load i18n %}

Resource Usage

@@ -6,8 +7,8 @@ - - + + diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html index afdccc4..d0585ca 100644 --- a/debug_toolbar/templates/debug_toolbar/redirect.html +++ b/debug_toolbar/templates/debug_toolbar/redirect.html @@ -1,3 +1,4 @@ +{% load i18n %} @@ -5,9 +6,11 @@

HttpResponseRedirect

Location: {{ redirect_to }}

- The Django Debug Toolbar has intercepted a redirect to the above URL for + {% 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 + redirect as normal. If you'd like to disable this feature, set the" + %} DEBUG_TOOLBAR_CONFIG dictionary's key INTERCEPT_REDIRECTS to False.

-- cgit v1.2.3 From 2339b5e95a2ecf0cc64ccef8d50e669f5caff69a Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Sun, 4 Jan 2009 16:32:52 -0800 Subject: added "trans" to base and redirect templates --- debug_toolbar/templates/debug_toolbar/base.html | 3 ++- debug_toolbar/templates/debug_toolbar/redirect.html | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index a6c8aef..fca6256 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -1,3 +1,4 @@ +{% load i18n %} - + +
KeyValue{% trans "Key" %}{% trans "Value" %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index 005ffe6..b14a50c 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -1,4 +1,3 @@ -

HTTP Headers

diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html index 2117529..e6ce945 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/logger.html +++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html @@ -1,4 +1,3 @@ -

Log Messages

{% if records %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html index b7d53ee..a65d0a5 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html @@ -1,4 +1,4 @@ -

COOKIES Variables

+

COOKIES Variables

{% if cookies %}
@@ -23,7 +23,7 @@ {% else %}

None

{% endif %} -

SESSION Variables

+

SESSION Variables

{% if session %}
@@ -48,7 +48,7 @@ {% else %}

None

{% endif %} -

GET Variables

+

GET Variables

{% if get %}
@@ -69,7 +69,7 @@ {% else %}

None

{% endif %} -

POST Variables

+

POST Variables

{% if post %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html index 93f0b34..c53ee4d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html @@ -1,4 +1,3 @@ -

Settings from {{ settings.SETTINGS_MODULE }}

diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html index e9a189e..7875700 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/signals.html +++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html @@ -1,4 +1,3 @@ -

Signals

diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index f05ea97..717d54d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -1,4 +1,3 @@ -

SQL Queries

diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index 6c918b1..78519c9 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -1,4 +1,3 @@ -

Template path{{ template_dirs|length|pluralize }}:

{% if template_dirs %}
    {% for template in template_dirs %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index 831ff86..39e9eb1 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/timer.html +++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html @@ -1,4 +1,3 @@ -

    Resource Usage

-- cgit v1.2.3 From 463aa185a001f72b7c906209920cd70932123157 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:06:45 +0300 Subject: Added hover state for close button, scroll padding --- debug_toolbar/media/debug_toolbar/close_hover.png | Bin 0 -> 1158 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 debug_toolbar/media/debug_toolbar/close_hover.png (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/close_hover.png b/debug_toolbar/media/debug_toolbar/close_hover.png new file mode 100644 index 0000000..f868e80 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/close_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 4211099..7ac200c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -158,6 +158,7 @@ position: relative; overflow: auto; height: 90%; + padding: 0px 10px 10px 0px; } #djDebug .panelContent p a, #djDebug .panelContent dl a { @@ -230,6 +231,10 @@ width: 40px; } +#djDebug .panelContent .close:hover { + background-image: url(close_hover.png); +} + #djDebug .panelContent dt, #djDebug .panelContent dd { display: block; } -- cgit v1.2.3 From 59874f33145722c6bb2d1fedb3d0679e6ce2caba Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:07:09 +0300 Subject: Proper handling of template panel title --- debug_toolbar/panels/template.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index 985a9d8..6eb826f 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -7,6 +7,7 @@ from django.dispatch import Signal from django.template.context import get_standard_processors from django.template.loader import render_to_string from django.test.signals import template_rendered +from django.template.defaultfilters import pluralize from debug_toolbar.panels import DebugPanel # Code taken and adapted from Simon Willison and Django Snippets: @@ -45,7 +46,7 @@ class TemplateDebugPanel(DebugPanel): return 'Templates' def title(self): - return 'Template path{{ template_dirs|length|pluralize }}:' + return 'Template path%s:' % pluralize(len(self.templates)) def url(self): return '' -- cgit v1.2.3 From e11bfdac25d48019377f64131b78f4462e9d005f Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:18:47 +0300 Subject: oops, retitled templates panel --- debug_toolbar/panels/template.py | 3 +-- debug_toolbar/templates/debug_toolbar/panels/templates.html | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py index 6eb826f..8c6a972 100644 --- a/debug_toolbar/panels/template.py +++ b/debug_toolbar/panels/template.py @@ -7,7 +7,6 @@ from django.dispatch import Signal from django.template.context import get_standard_processors from django.template.loader import render_to_string from django.test.signals import template_rendered -from django.template.defaultfilters import pluralize from debug_toolbar.panels import DebugPanel # Code taken and adapted from Simon Willison and Django Snippets: @@ -46,7 +45,7 @@ class TemplateDebugPanel(DebugPanel): return 'Templates' def title(self): - return 'Template path%s:' % pluralize(len(self.templates)) + return 'Templates' def url(self): return '' diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index 78519c9..01240f7 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -1,3 +1,4 @@ +

Template path{{ template_dirs|length|pluralize }}

{% if template_dirs %}
    {% for template in template_dirs %} @@ -7,7 +8,7 @@ {% else %}

    None

    {% endif %} -

    Template{{ templates|length|pluralize }}

    +

    Template{{ templates|length|pluralize }}

    {% if templates %}
    {% for template in templates %} @@ -22,7 +23,7 @@ {% else %}

    None

    {% endif %} -

    Context processor{{ context_processors|length|pluralize }}

    +

    Context processor{{ context_processors|length|pluralize }}

    {% if context_processors %}
    {% for key, value in context_processors.iteritems %} -- cgit v1.2.3 From 5f905eedd36213b88a3cb10dadaa6fd733229c3c Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:19:10 +0300 Subject: Panel title larger, is monospaced --- debug_toolbar/media/debug_toolbar/toolbar.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 7ac200c..de71ad2 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -170,13 +170,30 @@ #djDebug .panelContent h3 { color: #111; - font-size: 20px; + font-size: 24px; line-height: 25px; margin-top: 2px; margin-bottom: 0.5em; font-variant: small-caps; } + + +#djDebug .panelContent h4 { + font-weight: normal; +} + +#djDebug .panelContent code { + font-family: + Consolas, + Monaco, + "Bitstream Vera Sans Mono", + "Lucida Console", + monospace; + font-size: inherit; +} + + #djDebug .panelContent p { padding: 0 5px; } -- cgit v1.2.3 From f60a5e3b048728240bb4d85dd1fb5e2c9ea6fa2d Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 17:04:54 +0300 Subject: panel width, content boxing, safe scrolling --- debug_toolbar/media/debug_toolbar/back.png | Bin 0 -> 1078 bytes debug_toolbar/media/debug_toolbar/back_hover.png | Bin 0 -> 1084 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 63 ++++++- debug_toolbar/templates/debug_toolbar/base.html | 6 +- .../templates/debug_toolbar/panels/headers.html | 34 ++-- .../templates/debug_toolbar/panels/logger.html | 51 +++--- .../debug_toolbar/panels/request_vars.html | 187 +++++++++++---------- .../debug_toolbar/panels/settings_vars.html | 34 ++-- .../templates/debug_toolbar/panels/signals.html | 36 ++-- .../templates/debug_toolbar/panels/sql.html | 99 +++++------ .../debug_toolbar/panels/template_source.html | 12 +- .../templates/debug_toolbar/panels/templates.html | 62 ++++--- .../templates/debug_toolbar/panels/timer.html | 42 ++--- 13 files changed, 355 insertions(+), 271 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/back.png create mode 100644 debug_toolbar/media/debug_toolbar/back_hover.png (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/back.png b/debug_toolbar/media/debug_toolbar/back.png new file mode 100644 index 0000000..fa6a36b Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/back.png differ diff --git a/debug_toolbar/media/debug_toolbar/back_hover.png b/debug_toolbar/media/debug_toolbar/back_hover.png new file mode 100644 index 0000000..774f97c Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/back_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index de71ad2..faf3b7a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -137,10 +137,11 @@ display: none; position: absolute; margin: 0; + margin-left: 30px; padding: 10px 20px; top: 15px; width: auto; - max-width: 700px; + /*max-width: 800px;*/ min-width: 500px; right: 200px; bottom: 15px; @@ -154,18 +155,41 @@ background: transparent url(panel_bg.png) repeat left top; } -#djDebug .panelContent .panelScroll { - position: relative; +#djDebug .panelContent .panelScrollWrap { overflow: auto; height: 90%; - padding: 0px 10px 10px 0px; + width: 100%; +} + +#djDebug .panelContent .panelScrollContent { + width: auto; + margin-right: 10px; } -#djDebug .panelContent p a, #djDebug .panelContent dl a { +#djDebug .panelContent .boxed { + background-color: #fff; + padding: 5px; + border: 1px solid #c6d6da; +} + + + +#djDebug .panelContent p a, #djDebug .panelContent dt a { color: #000; + padding: 2px 4px; } -#djDebug .panelContent p a:hover, #djDebug .panelContent dl a:hover { - color: #900; +#djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { + background-color: #ffc; +} + +#djDebug .panelContent p a, #djDebug .panelContent dd a { + color: #000; + background-color: #eee; + padding: 2px 4px; +} +#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { + color: #111; + background-color: #ffc; } #djDebug .panelContent h3 { @@ -181,6 +205,9 @@ #djDebug .panelContent h4 { font-weight: normal; + margin-top: 0.5em; + font-size: 20px; + line-height: 24px; } #djDebug .panelContent code { @@ -204,17 +231,21 @@ } #djDebug .panelContent table { - width: 100%; + /*width: 90%;*/ clear: both; border: 0; padding: 0; + margin: 0; + border-collapse: collapse; + border-spacing: 0; } #djDebug .panelContent table a { color: #000; + padding: 2px 4px; } #djDebug .panelContent table a:hover { - color: #900; + background-color: #ffc; } #djDebug .panelContent table th { @@ -252,10 +283,24 @@ 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: 0.75em; +} + #djDebug .panelContent dd { margin-left: 10px; } diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 5f4b7e7..a44d31e 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -54,8 +54,10 @@
    Close

    {{ panel.title|safe }}

    -
    - {{ panel.content|safe }} +
    +
    + {{ panel.content|safe }} +
    {% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/headers.html b/debug_toolbar/templates/debug_toolbar/panels/headers.html index b14a50c..a6b6b59 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/headers.html +++ b/debug_toolbar/templates/debug_toolbar/panels/headers.html @@ -1,16 +1,18 @@ -
- - - - - - - - {% for key, value in headers.iteritems %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|escape }}
+
+ + + + + + + + + {% for key, value in headers.iteritems %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|escape }}
+
\ No newline at end of file diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html index e6ce945..2bfab05 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/logger.html +++ b/debug_toolbar/templates/debug_toolbar/panels/logger.html @@ -1,25 +1,26 @@ -{% if records %} - - - - - - - - - - - {% for record in records %} - - - - - - - {% endfor %} - -
LevelTimeMessageLocation
{{ record.level }}{{ record.time|date:"h:i:s m/d/Y" }}{{ record.message }}{{ record.file }}:{{ record.line }}
-{% else %} -

No messages logged.

-{% endif %} - +
+ {% if records %} + + + + + + + + + + + {% for record in records %} + + + + + + + {% endfor %} + +
LevelTimeMessageLocation
{{ record.level }}{{ record.time|date:"h:i:s m/d/Y" }}{{ record.message }}{{ record.file }}:{{ record.line }}
+ {% else %} +

No messages logged.

+ {% endif %} +
diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html index a65d0a5..d8c81ba 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html @@ -1,92 +1,103 @@

COOKIES Variables

-{% if cookies %} - - - - - - - - - - - - - {% for key, value in cookies %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|escape }}
-{% else %} -

None

-{% endif %} +
+ {% if cookies %} + + + + + + + + + + + + + {% for key, value in cookies %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|escape }}
+ {% else %} +

None

+ {% endif %} +
+

SESSION Variables

-{% if session %} - - - - - - - - - - - - - {% for key, value in session %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|escape }}
-{% else %} -

None

-{% endif %} +
+ {% if session %} + + + + + + + + + + + + + {% for key, value in session %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|escape }}
+ {% else %} +

None

+ {% endif %} +
+

GET Variables

-{% if get %} - - - - - - - - - {% for key, value in get %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|join:", "|escape }}
-{% else %} -

None

-{% endif %} +
+ {% if get %} + + + + + + + + + {% for key, value in get %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|join:", "|escape }}
+ {% else %} +

None

+ {% endif %} +
+

POST Variables

-{% if post %} - - - - - - - - - {% for key, value in post %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|join:", "|escape }}
-{% else %} -

None

-{% endif %} +
+ {% if post %} + + + + + + + + + {% for key, value in post %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|join:", "|escape }}
+ {% else %} +

None

+ {% 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 c53ee4d..8c65700 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html +++ b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html @@ -1,16 +1,18 @@ - - - - - - - - - {% for var in settings.items|dictsort:"0" %} - - - - - {% endfor %} - -
SettingValue
{{ var.0 }}{{ var.1|pprint }}
+
+ + + + + + + + + {% for var in settings.items|dictsort:"0" %} + + + + + {% endfor %} + +
SettingValue
{{ var.0 }}{{ var.1|pprint }}
+
\ No newline at end of file diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html index 7875700..c7a7733 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/signals.html +++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html @@ -1,18 +1,20 @@ - - - - - - - - - - {% for name, signal, receivers in signals %} - - - - +
+
SignalProviding ArgsReceivers
{{ name|escape }}{{ signal.providing_args|join:", " }}{{ receivers|join:", " }}
+ + + + + - {% endfor %} - -
SignalProviding ArgsReceivers
+ + + {% for name, signal, receivers in signals %} + + {{ name|escape }} + {{ signal.providing_args|join:", " }} + {{ receivers|join:", " }} + + {% endfor %} + + + \ No newline at end of file diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 717d54d..bb805e6 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -1,48 +1,51 @@ - - - - - - - - - - - {% for query in queries %} - - - - - - - {% endfor %} - -
Time (ms)ActionStacktraceQuery
{{ query.time|floatformat:"2" }} - {% if query.params %} - SELECT - EXPLAIN - {% if is_mysql %} - PROFILE - {% endif %} - {% endif %} - - {% if query.stacktrace %} -
Toggle Stacktrace
- - {% endif %} - 		{{ query.sql|safe }}
+
+ + + + + + + + + + + {% for query in queries %} + + + + + + + {% endfor %} + +
Time (ms)ActionStacktraceQuery
{{ query.time|floatformat:"2" }} + {% if query.params %} + SELECT + EXPLAIN + {% if is_mysql %} + PROFILE + {% endif %} + {% endif %} + + {% if query.stacktrace %} +
Toggle Stacktrace
+ + {% endif %} + 		{{ query.sql|safe }}
+
+ diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index 572522b..2094a3f 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html +++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html @@ -1,3 +1,9 @@ -« Back -

Template Source: {{ template_name }}

-{{ source }} +Back +

Template Source: {{ template_name }}

+
+
+
+ {{ source }} +
+
+
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index 01240f7..622321f 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -1,4 +1,5 @@

Template path{{ template_dirs|length|pluralize }}

+
{% if template_dirs %}
    {% for template in template_dirs %} @@ -8,32 +9,39 @@ {% else %}

    None

    {% endif %} +
+

Template{{ templates|length|pluralize }}

-{% if templates %} -
-{% for template in templates %} -
{{ template.template.name|addslashes }}
-
{{ template.template.origin_name|addslashes }}
-
-
Toggle Context
- -
-{% endfor %} -
-{% else %} -

None

-{% endif %} +
+ {% if templates %} +
+ {% for template in templates %} +
{{ template.template.name|addslashes }}
+
{{ template.template.origin_name|addslashes }}
+
+
Toggle Context
+ +
+ {% endfor %} +
+ {% else %} +

None

+ {% endif %} +
+

Context processor{{ context_processors|length|pluralize }}

-{% if context_processors %} -
-{% for key, value in context_processors.iteritems %} -
{{ key|escape }}
-
-
Toggle Context
- -
-{% endfor %} -
-{% else %} -

None

-{% endif %} +
+ {% if context_processors %} +
+ {% for key, value in context_processors.iteritems %} +
{{ key|escape }}
+
+
Toggle Context
+ +
+ {% endfor %} +
+ {% else %} +

None

+ {% endif %} +
\ No newline at end of file diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index 39e9eb1..ba801b2 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/timer.html +++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html @@ -1,20 +1,22 @@ - - - - - - - - - - - - - {% for key, value in rows %} - - - - - {% endfor %} - -
KeyValue
{{ key|escape }}{{ value|escape }}
+
+ + + + + + + + + + + + + {% for key, value in rows %} + + + + + {% endfor %} + +
KeyValue
{{ key|escape }}{{ value|escape }}
+
-- cgit v1.2.3 From 70c97b31a1b0ef4c8002460653df1f7b85fca525 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:15:34 -0700 Subject: Standardized CSS to use tabs. --- debug_toolbar/media/debug_toolbar/toolbar.css | 202 +++++++++++++------------- 1 file changed, 101 insertions(+), 101 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index faf3b7a..e513b6c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,44 +1,44 @@ #djDebug * { - color: #000; - float: none; - margin: 0; - padding: 0; - position: static; - text-align: left; + color: #000; + float: none; + margin: 0; + padding: 0; + position: static; + text-align: left; font-family: Cambria, Georgia, serif; font-size: 16px; } #djDebugToolbar { - background: #111; - width: 200px; - z-index: 100000000; - position:absolute; - top:0; - bottom:0; - right:0; + background: #111; + width: 200px; + z-index: 100000000; + position:absolute; + top:0; + bottom:0; + right:0; opacity:0.9; } #djDebugToolbar small { - color:#999; + color:#999; } #djDebugToolbarHandle { - position:absolute; - background: #111; - top:0; - right:0; - height: 25px; - width: 25px; - z-index: 100000000; + position:absolute; + background: #111; + top:0; + right:0; + height: 25px; + width: 25px; + z-index: 100000000; } #djDebugToolbarHandle ul li { - list-style-type:none; - padding: 0; + list-style-type:none; + padding: 0; } #djDebugToolbarHandle ul li a { @@ -59,21 +59,21 @@ } #djDebugToolbar ul { - margin: 0; - padding: 0; - list-style: none; + margin: 0; + padding: 0; + list-style: none; } #djDebugToolbar li { - border-bottom: 1px solid #222; - color: #fff; - display: block; - font-weight: bold; - float: none; - margin: 0; - padding: 0; - position: relative; - width: auto; + border-bottom: 1px solid #222; + color: #fff; + display: block; + font-weight: bold; + float: none; + margin: 0; + padding: 0; + position: relative; + width: auto; } @@ -121,33 +121,33 @@ #djDebugToolbar #djDebugButton { - color: #92ef3f; + color: #92ef3f; } #djDebug pre { - background-color: #ffffff; + background-color: #ffffff; } #djDebug tr.djDebugOdd pre { - background-color: #eeeeee; + background-color: #eeeeee; } #djDebug .panelContent { - - display: none; - position: absolute; - margin: 0; - margin-left: 30px; - padding: 10px 20px; - top: 15px; - width: auto; - /*max-width: 800px;*/ - min-width: 500px; - right: 200px; - bottom: 15px; - color: #111; - z-index: 1000000; - /*overflow: auto;*/ + + display: none; + position: absolute; + margin: 0; + margin-left: 30px; + padding: 10px 20px; + top: 15px; + width: auto; + /*max-width: 800px;*/ + min-width: 500px; + right: 200px; + bottom: 15px; + color: #111; + z-index: 1000000; + /*overflow: auto;*/ border-left: 10px solid #c6d6da; border-top: 10px solid #c6d6da; border-bottom: 10px solid #c6d6da; @@ -175,29 +175,29 @@ #djDebug .panelContent p a, #djDebug .panelContent dt a { - color: #000; - padding: 2px 4px; + color: #000; + padding: 2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { background-color: #ffc; } #djDebug .panelContent p a, #djDebug .panelContent dd a { - color: #000; - background-color: #eee; - padding: 2px 4px; + color: #000; + background-color: #eee; + padding: 2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { - color: #111; + color: #111; background-color: #ffc; } #djDebug .panelContent h3 { - color: #111; - font-size: 24px; - line-height: 25px; - margin-top: 2px; - margin-bottom: 0.5em; + color: #111; + font-size: 24px; + line-height: 25px; + margin-top: 2px; + margin-bottom: 0.5em; font-variant: small-caps; } @@ -214,66 +214,66 @@ font-family: Consolas, Monaco, - "Bitstream Vera Sans Mono", - "Lucida Console", - monospace; - font-size: inherit; + "Bitstream Vera Sans Mono", + "Lucida Console", + monospace; + font-size: inherit; } #djDebug .panelContent p { - padding: 0 5px; + padding: 0 5px; } #djDebug .panelContent p, #djDebug .panelContent table, #djDebug .panelContent ol, #djDebug .panelContent ul, #djDebug .panelContent dl { - margin: 5px 0 15px; - background-color: #fff; + margin: 5px 0 15px; + background-color: #fff; } #djDebug .panelContent table { - /*width: 90%;*/ - clear: both; - border: 0; - padding: 0; - margin: 0; - border-collapse: collapse; - border-spacing: 0; + /*width: 90%;*/ + clear: both; + border: 0; + padding: 0; + margin: 0; + border-collapse: collapse; + border-spacing: 0; } #djDebug .panelContent table a { - color: #000; - padding: 2px 4px; + color: #000; + padding: 2px 4px; } #djDebug .panelContent table a:hover { - background-color: #ffc; + background-color: #ffc; } #djDebug .panelContent table th { - background-color: #333; - font-weight: bold; - color: #fff; - padding: 3px 7px 3px; - text-align: left; - cursor: pointer; + background-color: #333; + font-weight: bold; + color: #fff; + padding: 3px 7px 3px; + text-align: left; + cursor: pointer; } #djDebug .panelContent table td { - padding: 5px 10px; - font-size: 14px; - background: #fff; - color: #000; - vertical-align: top; - border: 0; + padding: 5px 10px; + font-size: 14px; + background: #fff; + color: #000; + vertical-align: top; + border: 0; } #djDebug .panelContent table tr.djDebugOdd td { background: #eee; } #djDebug .panelContent .close { - text-indent: -9999999px; - display: block; - position: absolute; - top: 5px; - left: -25px; + text-indent: -9999999px; + display: block; + position: absolute; + top: 5px; + left: -25px; background: url(close.png) no-repeat center center; height: 40px; width: 40px; @@ -294,15 +294,15 @@ #djDebug .panelContent dt, #djDebug .panelContent dd { - display: block; + display: block; } #djDebug .panelContent dt { - margin-top: 0.75em; + margin-top: 0.75em; } #djDebug .panelContent dd { - margin-left: 10px; + margin-left: 10px; } #djDebug .highlight { color: #000; } -- cgit v1.2.3 From f2ad1c6d92a44aafb6ad991abbecb56771808178 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:27:06 -0700 Subject: Adding debug toolbar reset CSS. --- debug_toolbar/media/debug_toolbar/toolbar.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index e513b6c..fa1d329 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,3 +1,20 @@ +/* Debug Toolbar CSS Reset, adapted from YUI 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; -- cgit v1.2.3 From 58c6a530619617e20a1f0e4dbeb5e687153c89c3 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:27:50 -0700 Subject: Removed extra line spaces. --- debug_toolbar/media/debug_toolbar/toolbar.css | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index fa1d329..a4ded24 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -41,8 +41,6 @@ color:#999; } - - #djDebugToolbarHandle { position:absolute; background: #111; @@ -93,8 +91,6 @@ width: auto; } - - #djDebugToolbar li>a, #djDebugToolbar li>div.contentless { font-weight: normal; @@ -136,7 +132,6 @@ font-variant: normal; } - #djDebugToolbar #djDebugButton { color: #92ef3f; } @@ -189,8 +184,6 @@ border: 1px solid #c6d6da; } - - #djDebug .panelContent p a, #djDebug .panelContent dt a { color: #000; padding: 2px 4px; @@ -218,8 +211,6 @@ font-variant: small-caps; } - - #djDebug .panelContent h4 { font-weight: normal; margin-top: 0.5em; @@ -237,7 +228,6 @@ font-size: inherit; } - #djDebug .panelContent p { padding: 0 5px; } @@ -308,8 +298,6 @@ background-image: url(back_hover.png); } - - #djDebug .panelContent dt, #djDebug .panelContent dd { display: block; } -- cgit v1.2.3 From 70c3ac3f98e9ff98d39c33f38fe6daa4437908e5 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:47:05 -0700 Subject: Deserify font family. --- debug_toolbar/media/debug_toolbar/toolbar.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index a4ded24..2a60537 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -22,8 +22,7 @@ padding: 0; position: static; text-align: left; - font-family: Cambria, Georgia, serif; - font-size: 16px; + font-family:sans-serif; } #djDebugToolbar { @@ -219,12 +218,7 @@ } #djDebug .panelContent code { - font-family: - Consolas, - Monaco, - "Bitstream Vera Sans Mono", - "Lucida Console", - monospace; + font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; font-size: inherit; } -- cgit v1.2.3 From 19ac04d32c1405cabe668464b8149b525d63f026 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:53:50 -0700 Subject: A few font size adjustments and removing declarations that have no effect. --- debug_toolbar/media/debug_toolbar/toolbar.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 2a60537..6c61ac0 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -97,7 +97,7 @@ font-variant: small-caps; text-decoration: none; display: block; - font-size: 18px; + font-size: 16px; padding: 10px 10px 5px 25px; color: #fff; } @@ -202,11 +202,7 @@ } #djDebug .panelContent h3 { - color: #111; font-size: 24px; - line-height: 25px; - margin-top: 2px; - margin-bottom: 0.5em; font-variant: small-caps; } -- cgit v1.2.3 From 94a64b13ec3770ae7e8e378ce2ddcc489766bd0a Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:54:11 -0700 Subject: Pegged the panels to fill available space and moved close button. --- debug_toolbar/media/debug_toolbar/toolbar.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 6c61ac0..676969c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -148,14 +148,11 @@ display: none; position: absolute; margin: 0; - margin-left: 30px; padding: 10px 20px; - top: 15px; - width: auto; - /*max-width: 800px;*/ - min-width: 500px; + top: 2px; right: 200px; - bottom: 15px; + bottom: 2px; + left: 2px; color: #111; z-index: 1000000; /*overflow: auto;*/ @@ -269,11 +266,11 @@ text-indent: -9999999px; display: block; position: absolute; - top: 5px; - left: -25px; - background: url(close.png) no-repeat center center; + top: 0; + right: 10px; height: 40px; width: 40px; + background: url(close.png) no-repeat center center; } #djDebug .panelContent .close:hover { -- cgit v1.2.3 From 105152318f49c077c879a1b1ed9fc37e45b90c69 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 21 Aug 2009 08:06:39 -0700 Subject: Remove added border on hover which was causing flicker and scrollbars to appear. --- debug_toolbar/media/debug_toolbar/toolbar.css | 1 - 1 file changed, 1 deletion(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 676969c..6156fb7 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -69,7 +69,6 @@ #djDebugToolbarHandle ul li a:hover { color: #111; background-color: #9fbb54; - border: 1px solid #111; } #djDebugToolbar ul { -- cgit v1.2.3 From e0a81fd78aa2a6e5096a8b207484fa19cc5c034f Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 21 Aug 2009 13:30:24 -0700 Subject: testing some changes --- debug_toolbar/locale/es/LC_MESSAGES/django.mo | Bin 1052 -> 1081 bytes debug_toolbar/locale/es/LC_MESSAGES/django.po | 4 ++++ debug_toolbar/templates/debug_toolbar/base.html | 2 +- .../templates/debug_toolbar/panels/signals.html | 2 +- debug_toolbar/templates/debug_toolbar/panels/sql.html | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo index 295c214..d8d3edd 100644 Binary files a/debug_toolbar/locale/es/LC_MESSAGES/django.mo and b/debug_toolbar/locale/es/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po index 07c8d30..ad12522 100644 --- a/debug_toolbar/locale/es/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po @@ -18,6 +18,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "Hide" +msgstr "Ocultar" + + #: templates/debug_toolbar/base.html:30 msgid "Close" msgstr "Cerrar" diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 66d126e..748001d 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -20,7 +20,7 @@ @@ -61,7 +61,7 @@ - + @@ -75,7 +75,7 @@
{% trans "Key" %}{% trans "Variable" %} {% trans "Value" %}
{% else %} -

{% trans "None" %}

+

{% trans "No GET data" %}

{% endif %} @@ -85,7 +85,7 @@ - + @@ -99,6 +99,6 @@
{% trans "Key" %}{% trans "Variable" %} {% trans "Value" %}
{% else %} -

{% trans "None" %}

+

{% trans "No POST data" %}

{% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/signals.html b/debug_toolbar/templates/debug_toolbar/panels/signals.html index 3936dba..fccf7ff 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/signals.html +++ b/debug_toolbar/templates/debug_toolbar/panels/signals.html @@ -1,3 +1,4 @@ +{% load i18n %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 4c100e9..4bb7c9a 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -28,7 +28,7 @@
- + -- cgit v1.2.3 From 8fa547a2a34086455b4af9e327906b6f96b12b24 Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 21 Aug 2009 15:11:13 -0700 Subject: added i18n support (Spanish) for timer.html --- debug_toolbar/locale/es/LC_MESSAGES/django.mo | Bin 1285 -> 1318 bytes debug_toolbar/locale/es/LC_MESSAGES/django.po | 11 ++++++----- .../templates/debug_toolbar/panels/timer.html | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo index be1a7cc..1c8f042 100644 Binary files a/debug_toolbar/locale/es/LC_MESSAGES/django.mo and b/debug_toolbar/locale/es/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po index 3928554..a40979d 100644 --- a/debug_toolbar/locale/es/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-21 14:46-0700\n" +"POT-Creation-Date: 2009-08-21 15:06-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,7 +67,6 @@ msgid "Function" msgstr "Función" #: templates/debug_toolbar/panels/headers.html:6 -#: templates/debug_toolbar/panels/timer.html:10 msgid "Key" msgstr "Llave" @@ -137,7 +136,6 @@ msgstr "Acción" msgid "Line" msgstr "Línea" - #: templates/debug_toolbar/panels/sql_explain.html:2 #: templates/debug_toolbar/panels/sql_profile.html:2 #: templates/debug_toolbar/panels/sql_select.html:2 @@ -155,5 +153,8 @@ msgstr "SQL Ejecutado" msgid "Empty set" msgstr "Set Vacío" -# msgid "Settings from" -# msgstr "Configuraciones de" +#: templates/debug_toolbar/panels/timer.html:10 +msgid "Resource" +msgstr "Recurso" + + diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html index 70ba61e..d089276 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/timer.html +++ b/debug_toolbar/templates/debug_toolbar/panels/timer.html @@ -7,7 +7,7 @@ - + -- cgit v1.2.3 From b5087075c1354b1512bb25a38e7f7c0afd1067d0 Mon Sep 17 00:00:00 2001 From: Percy Perez-Pinedo Date: Fri, 21 Aug 2009 15:36:00 -0700 Subject: spanish version of the debug toolbar templates is mostly done' --- debug_toolbar/locale/es/LC_MESSAGES/django.mo | Bin 1318 -> 1413 bytes debug_toolbar/locale/es/LC_MESSAGES/django.po | 17 ++++++++++++++--- debug_toolbar/templates/debug_toolbar/panels/sql.html | 6 +++--- .../templates/debug_toolbar/panels/templates.html | 3 ++- 4 files changed, 19 insertions(+), 7 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo index 1c8f042..a09808b 100644 Binary files a/debug_toolbar/locale/es/LC_MESSAGES/django.mo and b/debug_toolbar/locale/es/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po index a40979d..2d4c199 100644 --- a/debug_toolbar/locale/es/LC_MESSAGES/django.po +++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-21 15:06-0700\n" +"POT-Creation-Date: 2009-08-21 15:26-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,6 +48,7 @@ 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 @@ -136,6 +137,14 @@ msgstr "Acción" msgid "Line" msgstr "Línea" +#: templates/debug_toolbar/panels/sql.html:32 +msgid "Method" +msgstr "Método" + +#: templates/debug_toolbar/panels/sql.html:33 +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 @@ -153,8 +162,10 @@ msgstr "SQL Ejecutado" msgid "Empty set" msgstr "Set Vacío" +#: templates/debug_toolbar/panels/templates.html:14 +msgid "Template" +msgstr "Plantilla" + #: templates/debug_toolbar/panels/timer.html:10 msgid "Resource" msgstr "Recurso" - - diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html index 4bb7c9a..cac2e47 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html @@ -3,7 +3,7 @@
Line{% trans "Line" %} Method File
{% trans "Key" %}{% trans "Resource" %} {% trans "Value" %}
- + @@ -29,8 +29,8 @@
Time (ms){% trans "Time" %} (ms) {% trans "Action" %} Stacktrace Query
- - + + {% for file, line, method in query.stacktrace %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/debug_toolbar/templates/debug_toolbar/panels/templates.html index 622321f..194e477 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/templates.html +++ b/debug_toolbar/templates/debug_toolbar/panels/templates.html @@ -1,3 +1,4 @@ +{% load i18n %}

Template path{{ template_dirs|length|pluralize }}

{% if template_dirs %} @@ -11,7 +12,7 @@ {% endif %}
-

Template{{ templates|length|pluralize }}

+

{% trans "Template" %}{{ templates|length|pluralize }}

{% if templates %}
-- cgit v1.2.3 From ecd7f2abe62996b19720e9ade61b45eafac590e8 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Mon, 24 Aug 2009 11:24:38 -0700 Subject: Make panel content stylings look like Django's debug template. --- debug_toolbar/media/debug_toolbar/toolbar.css | 98 +++++++++++----------- debug_toolbar/media/debug_toolbar/toolbar.js | 2 +- debug_toolbar/templates/debug_toolbar/base.html | 14 ++-- .../debug_toolbar/panels/sql_explain.html | 52 ++++++------ .../debug_toolbar/panels/sql_profile.html | 52 ++++++------ .../templates/debug_toolbar/panels/sql_select.html | 60 ++++++------- 6 files changed, 146 insertions(+), 132 deletions(-) (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 029148c..9da3f32 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -133,75 +133,78 @@ } #djDebug .panelContent { - display:none; position:absolute; margin:0; - padding:10px 20px; - top:2px; + top:0; right:200px; - bottom:2px; - left:2px; - color:#111; + bottom:0; + left:0; + background-color:#f6f6f6; + color:#666; z-index:1000000; - /*overflow:auto;*/ - border-left:10px solid #c6d6da; - border-top:10px solid #c6d6da; - border-bottom:10px solid #c6d6da; - opacity:1.0; - background:transparent url(panel_bg.png) repeat left top; -} - -#djDebug .panelContent .panelScrollWrap { overflow:auto; - height:90%; - width:100%; } -#djDebug .panelContent .panelScrollContent { - width:auto; - margin-right:10px; +#djDebug .panelContent > div { + border-bottom:1px solid #ddd; + padding:10px 20px; } -#djDebug .panelContent .boxed { - background-color:#fff; - padding:5px; - border:1px solid #c6d6da; +.djDebugPanelTitle { + background-color:#ffc; + color:#666; } - -#djDebug .panelContent p a, #djDebug .panelContent dt a { - color:#000; - padding:2px 4px; +#djDebug h3 { + font-size:24px; + font-weight:bold; + font-variant:small-caps; } -#djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { - background-color:#ffc; + +#djDebug h4 { + font-size:20px; + font-weight:bold; } -#djDebug .panelContent p a, #djDebug .panelContent dd a { - color:#000; +#djDebug .panelContent { background-color:#eee; - padding:2px 4px; -} -#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { - color:#111; - background-color:#ffc; + color:#000; } -#djDebug .panelContent h3 { - font-size:24px; - font-variant:small-caps; +#djDebug .panelContent table { + border:1px solid #ccc; + border-collapse:collapse; + width:100%; + background-color:#fff; } - -#djDebug .panelContent h4 { +#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; - margin-top:0.5em; - font-size:20px; - line-height:24px; + 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; - font-size:inherit; + font-size:12px; +} +/* +#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { + color:#111; + background-color:#ffc; } #djDebug .panelContent p { @@ -212,9 +215,7 @@ margin:5px 0 15px; background-color:#fff; } - #djDebug .panelContent table { - /*width:90%;*/ clear:both; border:0; padding:0; @@ -250,6 +251,7 @@ #djDebug .panelContent table tr.djDebugOdd td { background:#eee; } +*/ #djDebug .panelContent .close { text-indent:-9999999px; diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index 355a66f..b20a487 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -31,7 +31,7 @@ jQuery(function($j) { $j('#djDebug a.remoteCall').click(function() { $j('#djDebugWindow').load(this.href, {}, function() { $j('#djDebugWindow a.back').click(function() { - $j(this).parent().hide(); + $j(this).parent().parent().hide(); return false; }); }); diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index 401677a..d0f4562 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -50,13 +50,13 @@ {% for panel in panels %} {% if panel.has_content %}
- Close -

{{ panel.title|safe }}

-
-
- {{ panel.content|safe }} -
-
+
+ Close +

{{ panel.title|safe }}

+
+
+ {{ panel.content|safe }} +
{% endif %} {% endfor %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html index a163b25..d26a8a3 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html @@ -1,26 +1,30 @@ -« Back -

SQL Explained

-
-
Executed SQL
- 
{{ sql|safe }}
-
Time
-
{{ time }} ms
-
-
{% trans "Line" %}MethodFile{% trans "Method" %}{% trans "File" %}
- - - {% for h in headers %} - - {% endfor %} - - - - {% for row in result %} - - {% for column in row %} - +
+ « Back +

SQL Explained

+
+
+
+
Executed SQL
+ 
{{ sql|safe }}
+
Time
+
{{ time }} ms
+
+
{{ h|upper }}
{{ column|escape }}
+ + + {% for h in headers %} + {% endfor %} - {% endfor %} - -
{{ h|upper }}
+ + + {% for row in result %} + + {% for column in row %} + {{ column|escape }} + {% endfor %} + + {% endfor %} + + +
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html index e46f41d..c5410f8 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html @@ -1,26 +1,30 @@ -« Back -

SQL Profiled

-
-
Executed SQL
- 
{{ sql|safe }}
-
Time
-
{{ time }} ms
-
- - - - {% for h in headers %} - - {% endfor %} - - - - {% for row in result %} - - {% for column in row %} - +
+ « Back +

SQL Profiled

+
+
+
+
Executed SQL
+ 
{{ sql|safe }}
+
Time
+
{{ time }} ms
+
+
{{ h|upper }}
{{ column|escape }}
+ + + {% for h in headers %} + {% endfor %} - {% endfor %} - -
{{ h|upper }}
+ + + {% for row in result %} + + {% for column in row %} + {{ column|escape }} + {% endfor %} + + {% endfor %} + + + diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html index 17e7d48..4fc928d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html @@ -1,30 +1,34 @@ -« Back -

SQL Selected

-
-
Executed SQL
- 
{{ sql|safe }}
-
Time
-
{{ time }} ms
-
-{% if result %} - - - - {% for h in headers %} - - {% endfor %} - - - - {% for row in result %} - - {% for column in row %} - +
+ « Back +

SQL Selected

+
+
+
+
Executed SQL
+ 
{{ sql|safe }}
+
Time
+
{{ time }} ms
+
+ {% if result %} +
{{ h|upper }}
{{ column|escape }}
+ + + {% for h in headers %} + {% endfor %} - {% endfor %} - -
{{ h|upper }}
-{% else %} -

Empty set

-{% endif %} + + + {% for row in result %} + + {% for column in row %} + {{ column|escape }} + {% endfor %} + + {% endfor %} + + + {% else %} +

Empty set

+ {% endif %} + -- cgit v1.2.3 From 7fa494e0dc1aa519ab937625e2f6f940861717f2 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 01:04:12 +0300 Subject: Updated graphics for new colorscheme --- debug_toolbar/media/debug_toolbar/back.png | Bin 1078 -> 1039 bytes debug_toolbar/media/debug_toolbar/back_hover.png | Bin 1084 -> 1030 bytes debug_toolbar/media/debug_toolbar/close.png | Bin 1130 -> 1045 bytes debug_toolbar/media/debug_toolbar/close_hover.png | Bin 1158 -> 1155 bytes debug_toolbar/media/debug_toolbar/djdt_vertical.png | Bin 0 -> 2054 bytes debug_toolbar/media/debug_toolbar/indicator.png | Bin 278 -> 282 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/djdt_vertical.png (limited to 'debug_toolbar') diff --git a/debug_toolbar/media/debug_toolbar/back.png b/debug_toolbar/media/debug_toolbar/back.png index fa6a36b..6ac8a52 100644 Binary files a/debug_toolbar/media/debug_toolbar/back.png and b/debug_toolbar/media/debug_toolbar/back.png differ diff --git a/debug_toolbar/media/debug_toolbar/back_hover.png b/debug_toolbar/media/debug_toolbar/back_hover.png index 774f97c..452b673 100644 Binary files a/debug_toolbar/media/debug_toolbar/back_hover.png and b/debug_toolbar/media/debug_toolbar/back_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/close.png b/debug_toolbar/media/debug_toolbar/close.png index c22e2e8..c0e8135 100644 Binary files a/debug_toolbar/media/debug_toolbar/close.png and b/debug_toolbar/media/debug_toolbar/close.png differ diff --git a/debug_toolbar/media/debug_toolbar/close_hover.png b/debug_toolbar/media/debug_toolbar/close_hover.png index f868e80..5b2c812 100644 Binary files a/debug_toolbar/media/debug_toolbar/close_hover.png and b/debug_toolbar/media/debug_toolbar/close_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/djdt_vertical.png b/debug_toolbar/media/debug_toolbar/djdt_vertical.png new file mode 100644 index 0000000..c204965 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/djdt_vertical.png differ diff --git a/debug_toolbar/media/debug_toolbar/indicator.png b/debug_toolbar/media/debug_toolbar/indicator.png index a21fc6e..dd2e0de 100644 Binary files a/debug_toolbar/media/debug_toolbar/indicator.png and b/debug_toolbar/media/debug_toolbar/indicator.png differ -- cgit v1.2.3 From 2fcfa87b1addcb903185af943d6f7a20c0cfa6bf Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Mon, 24 Aug 2009 16:16:10 -0700 Subject: Merge locale work by Percy. --- debug_toolbar/locale/es/LC_MESSAGES/django.mo | Bin 0 -> 1413 bytes debug_toolbar/locale/es/LC_MESSAGES/django.po | 171 +++++++++++++++++++++ debug_toolbar/templates/debug_toolbar/base.html | 5 +- .../templates/debug_toolbar/panels/cache.html | 19 +-- .../templates/debug_toolbar/panels/headers.html | 5 +- .../templates/debug_toolbar/panels/logger.html | 13 +- .../debug_toolbar/panels/request_vars.html | 27 ++-- .../debug_toolbar/panels/settings_vars.html | 5 +- .../templates/debug_toolbar/panels/signals.html | 3 +- .../templates/debug_toolbar/panels/sql.html | 14 +- .../debug_toolbar/panels/sql_explain.html | 7 +- .../debug_toolbar/panels/sql_profile.html | 7 +- .../templates/debug_toolbar/panels/sql_select.html | 9 +- .../debug_toolbar/panels/template_source.html | 5 +- .../templates/debug_toolbar/panels/templates.html | 3 +- .../templates/debug_toolbar/panels/timer.html | 7 +- .../templates/debug_toolbar/redirect.html | 5 +- 17 files changed, 245 insertions(+), 60 deletions(-) create mode 100644 debug_toolbar/locale/es/LC_MESSAGES/django.mo create mode 100644 debug_toolbar/locale/es/LC_MESSAGES/django.po (limited to 'debug_toolbar') diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.mo b/debug_toolbar/locale/es/LC_MESSAGES/django.mo new file mode 100644 index 0000000..a09808b Binary files /dev/null and b/debug_toolbar/locale/es/LC_MESSAGES/django.mo differ diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po new file mode 100644 index 0000000..2d4c199 --- /dev/null +++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po @@ -0,0 +1,171 @@ +# Django Debug Toolbar en Español. +# 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. +# +# Caracteres especiales: á, é, í, ó, ú, ñ, +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-21 15:26-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: templates/debug_toolbar/base.html:24 +msgid "Hide" +msgstr "Ocultar" + +#: templates/debug_toolbar/base.html:56 +msgid "Close" +msgstr "Cerrar" + +#: templates/debug_toolbar/panels/cache.html:14 +msgid "Total Calls" +msgstr "Total Llamadas" + +#: templates/debug_toolbar/panels/cache.html:16 +msgid "Total Time" +msgstr "Tiempo Total" + +#: 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: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 "Tiempo" + +#: templates/debug_toolbar/panels/cache.html:40 +msgid "Type" +msgstr "Tipo" + +#: templates/debug_toolbar/panels/cache.html:41 +msgid "Parameters" +msgstr "Parámetros" + +#: templates/debug_toolbar/panels/cache.html:42 +msgid "Function" +msgstr "Función" + +#: templates/debug_toolbar/panels/headers.html:6 +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 +msgid "Value" +msgstr "Valor" + +#: templates/debug_toolbar/panels/logger.html:7 +msgid "Level" +msgstr "Nivel" + +#: templates/debug_toolbar/panels/logger.html:9 +msgid "Message" +msgstr "Mensaje" + +#: templates/debug_toolbar/panels/logger.html:10 +msgid "Location" +msgstr "" + +#: templates/debug_toolbar/panels/logger.html:25 +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 +#, fuzzy +msgid "Variable" +msgstr "Variable" + +#: templates/debug_toolbar/panels/request_vars.html:26 +msgid "None" +msgstr "Ninguno" + +#: templates/debug_toolbar/panels/request_vars.html:54 +msgid "No SESSION data" +msgstr "No SESSION datos" + +#: templates/debug_toolbar/panels/request_vars.html:78 +msgid "No GET data" +msgstr "No GET datos" + +#: templates/debug_toolbar/panels/request_vars.html:102 +msgid "No POST data" +msgstr "No POST datos" + +#: templates/debug_toolbar/panels/settings_vars.html:6 +msgid "Setting" +msgstr "Configuración" + +#: templates/debug_toolbar/panels/signals.html:6 +msgid "Signal" +msgstr "Señal" + +#: templates/debug_toolbar/panels/sql.html:7 +msgid "Action" +msgstr "Acción" + +#: templates/debug_toolbar/panels/sql.html:31 +msgid "Line" +msgstr "Línea" + +#: templates/debug_toolbar/panels/sql.html:32 +msgid "Method" +msgstr "Método" + +#: templates/debug_toolbar/panels/sql.html:33 +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 +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 +msgid "Executed SQL" +msgstr "SQL Ejecutado" + +#: templates/debug_toolbar/panels/sql_select.html:30 +msgid "Empty set" +msgstr "Set Vacío" + +#: templates/debug_toolbar/panels/templates.html:14 +msgid "Template" +msgstr "Plantilla" + +#: templates/debug_toolbar/panels/timer.html:10 +msgid "Resource" +msgstr "Recurso" diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html index d0f4562..b80daef 100644 --- a/debug_toolbar/templates/debug_toolbar/base.html +++ b/debug_toolbar/templates/debug_toolbar/base.html @@ -1,3 +1,4 @@ +{% load i18n %} - - +