From fe3df822111d3b56000deca354b0bceed7bde9cc Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 24 Nov 2013 10:42:43 +0100 Subject: Rename all panels consistently. Enforce absolute imports to avoid clashing with built-in package names. Thanks Jannis for his feedback. --- .../templates/debug_toolbar/panels/logger.html | 28 ----- .../templates/debug_toolbar/panels/logging.html | 28 +++++ .../templates/debug_toolbar/panels/request.html | 124 +++++++++++++++++++++ .../debug_toolbar/panels/request_vars.html | 124 --------------------- .../templates/debug_toolbar/panels/settings.html | 17 +++ .../debug_toolbar/panels/settings_vars.html | 17 --- .../debug_toolbar/panels/sql_explain.html | 4 +- .../debug_toolbar/panels/sql_profile.html | 4 +- .../templates/debug_toolbar/panels/sql_select.html | 4 +- .../debug_toolbar/panels/template_source.html | 4 +- 10 files changed, 177 insertions(+), 177 deletions(-) delete mode 100644 debug_toolbar/templates/debug_toolbar/panels/logger.html create mode 100644 debug_toolbar/templates/debug_toolbar/panels/logging.html create mode 100644 debug_toolbar/templates/debug_toolbar/panels/request.html delete mode 100644 debug_toolbar/templates/debug_toolbar/panels/request_vars.html create mode 100644 debug_toolbar/templates/debug_toolbar/panels/settings.html delete mode 100644 debug_toolbar/templates/debug_toolbar/panels/settings_vars.html (limited to 'debug_toolbar/templates') diff --git a/debug_toolbar/templates/debug_toolbar/panels/logger.html b/debug_toolbar/templates/debug_toolbar/panels/logger.html deleted file mode 100644 index 3908f4f..0000000 --- a/debug_toolbar/templates/debug_toolbar/panels/logger.html +++ /dev/null @@ -1,28 +0,0 @@ -{% load i18n %} -{% if records %} - - - - - - - - - - - - {% for record in records %} - - - - - - - - {% endfor %} - -
{% trans "Level" %}{% trans "Time" %}{% trans "Channel" %}{% trans "Message" %}{% trans "Location" %}
{{ record.level }}{{ record.time|date:"h:i:s m/d/Y" }}{{ record.channel|default:"-" }}{{ record.message|linebreaksbr }}{{ record.file }}:{{ record.line }}
-{% else %} -

{% trans "No messages logged" %}.

-{% endif %} - diff --git a/debug_toolbar/templates/debug_toolbar/panels/logging.html b/debug_toolbar/templates/debug_toolbar/panels/logging.html new file mode 100644 index 0000000..3908f4f --- /dev/null +++ b/debug_toolbar/templates/debug_toolbar/panels/logging.html @@ -0,0 +1,28 @@ +{% load i18n %} +{% if records %} + + + + + + + + + + + + {% for record in records %} + + + + + + + + {% endfor %} + +
{% trans "Level" %}{% trans "Time" %}{% trans "Channel" %}{% trans "Message" %}{% trans "Location" %}
{{ record.level }}{{ record.time|date:"h:i:s m/d/Y" }}{{ record.channel|default:"-" }}{{ record.message|linebreaksbr }}{{ record.file }}:{{ record.line }}
+{% else %} +

{% trans "No messages logged" %}.

+{% endif %} + diff --git a/debug_toolbar/templates/debug_toolbar/panels/request.html b/debug_toolbar/templates/debug_toolbar/panels/request.html new file mode 100644 index 0000000..a8277a4 --- /dev/null +++ b/debug_toolbar/templates/debug_toolbar/panels/request.html @@ -0,0 +1,124 @@ +{% load i18n %} + +

{% trans 'View information' %}

+ + + + + + + + + + + + + + + + + +
{% trans 'View Function' %}{% trans 'Arguments' %}{% trans 'Keyword Arguments' %}{% trans 'URL Name' %}
{{ view_func }}{{ view_args|pprint }}{{ view_kwargs|pprint }}{{ view_urlname }}
+ +{% if cookies %} +

{% trans "COOKIES Variables" %}

+ + + + + + + + + + + + + {% for key, value in cookies %} + + + + + {% endfor %} + +
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
+{% else %} +

{% trans "No COOKIE data" %}

+{% endif %} + +{% if session %} +

{% trans "SESSION Variables" %}

+ + + + + + + + + + + + + {% for key, value in session %} + + + + + {% endfor %} + +
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
+{% else %} +

{% trans "No SESSION data" %}

+{% endif %} + +{% if get %} +

{% trans "GET Variables" %}

+ + + + + + + + + + + + + {% for key, value in get %} + + + + + {% endfor %} + +
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
+{% else %} +

{% trans "No GET data" %}

+{% endif %} + +{% if post %} +

{% trans "POST Variables" %}

+ + + + + + + + + + + {% for key, value in post %} + + + + + {% endfor %} + +
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
+{% else %} +

{% trans "No POST data" %}

+{% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html b/debug_toolbar/templates/debug_toolbar/panels/request_vars.html deleted file mode 100644 index a8277a4..0000000 --- a/debug_toolbar/templates/debug_toolbar/panels/request_vars.html +++ /dev/null @@ -1,124 +0,0 @@ -{% load i18n %} - -

{% trans 'View information' %}

- - - - - - - - - - - - - - - - - -
{% trans 'View Function' %}{% trans 'Arguments' %}{% trans 'Keyword Arguments' %}{% trans 'URL Name' %}
{{ view_func }}{{ view_args|pprint }}{{ view_kwargs|pprint }}{{ view_urlname }}
- -{% if cookies %} -

{% trans "COOKIES Variables" %}

- - - - - - - - - - - - - {% for key, value in cookies %} - - - - - {% endfor %} - -
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
-{% else %} -

{% trans "No COOKIE data" %}

-{% endif %} - -{% if session %} -

{% trans "SESSION Variables" %}

- - - - - - - - - - - - - {% for key, value in session %} - - - - - {% endfor %} - -
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
-{% else %} -

{% trans "No SESSION data" %}

-{% endif %} - -{% if get %} -

{% trans "GET Variables" %}

- - - - - - - - - - - - - {% for key, value in get %} - - - - - {% endfor %} - -
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
-{% else %} -

{% trans "No GET data" %}

-{% endif %} - -{% if post %} -

{% trans "POST Variables" %}

- - - - - - - - - - - {% for key, value in post %} - - - - - {% endfor %} - -
{% trans "Variable" %}{% trans "Value" %}
{{ key|pprint }}{{ value|pprint }}
-{% else %} -

{% trans "No POST data" %}

-{% endif %} diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings.html b/debug_toolbar/templates/debug_toolbar/panels/settings.html new file mode 100644 index 0000000..f6b5afe --- /dev/null +++ b/debug_toolbar/templates/debug_toolbar/panels/settings.html @@ -0,0 +1,17 @@ +{% load i18n %} + + + + + + + + + {% for name, value in settings.items %} + + + + + {% endfor %} + +
{% trans "Setting" %}{% trans "Value" %}
{{ name }}{{ value|pprint }}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html b/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html deleted file mode 100644 index f6b5afe..0000000 --- a/debug_toolbar/templates/debug_toolbar/panels/settings_vars.html +++ /dev/null @@ -1,17 +0,0 @@ -{% load i18n %} - - - - - - - - - {% for name, value in settings.items %} - - - - - {% endfor %} - -
{% trans "Setting" %}{% trans "Value" %}
{{ name }}{{ value|pprint }}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html index 0d47ada..6bc2f8d 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html @@ -1,9 +1,9 @@ {% load i18n %} -
+
{% trans "Back" %}

{% trans "SQL Explained" %}

-
+
{% trans "Executed SQL" %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html index c0d90b4..e154de5 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html @@ -1,9 +1,9 @@ {% load i18n %} -
+
{% trans "Back" %}

{% trans "SQL Profiled" %}

-
+
{% if result %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html index 7a57c75..6263364 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html +++ b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html @@ -1,9 +1,9 @@ {% load i18n %} -
+
{% trans "Back" %}

{% trans "SQL Selected" %}

-
+
{% trans "Executed SQL" %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/template_source.html b/debug_toolbar/templates/debug_toolbar/panels/template_source.html index 7dedde3..829842c 100644 --- a/debug_toolbar/templates/debug_toolbar/panels/template_source.html +++ b/debug_toolbar/templates/debug_toolbar/panels/template_source.html @@ -1,9 +1,9 @@ {% load i18n %} -
+
{% trans "Back" %}

{% trans 'Template Source' %}: {{ template_name }}

-
+
{% if not source.pygmentized %} {{ source }} -- cgit v1.2.3