From 6bdb7b95299717f5137291e09aad420f7f80f2de Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 8 Sep 2008 05:19:28 +0000 Subject: [PATCH] Fixed #8172 -- Improved a whole bunch of contrib templates (admin, databrowse, admindocs, etc.) to remove unnecessary 'escape' filters, given autoescaping. Also removed unnecessary {% if %} tags and shortened some {% if %}/{% else %} tags to use {% firstof %}. Thanks for the patch, benspaulding git-svn-id: http://code.djangoproject.com/svn/django/trunk@8984 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../templates/admin/auth/user/change_password.html | 6 +++--- django/contrib/admin/templates/admin/base.html | 8 ++++---- django/contrib/admin/templates/admin/change_list.html | 4 ++-- .../admin/templates/admin/delete_confirmation.html | 8 ++++---- .../admin/templates/admin/edit_inline/tabular.html | 4 ++-- django/contrib/admin/templates/admin/filter.html | 4 ++-- django/contrib/admin/templates/admin/index.html | 2 +- .../contrib/admin/templates/admin/object_history.html | 4 ++-- django/contrib/admin/templates/admin/pagination.html | 2 +- django/contrib/admin/templates/admin/search_form.html | 4 ++-- .../admin/templates/admin/template_validator.html | 4 ++-- .../templates/registration/password_change_form.html | 6 +++--- .../templates/registration/password_reset_confirm.html | 4 ++-- .../templates/registration/password_reset_form.html | 2 +- .../admindocs/templates/admin_doc/model_detail.html | 2 +- .../admindocs/templates/admin_doc/template_detail.html | 10 +++++----- .../templates/admin_doc/template_filter_index.html | 4 ++-- .../templates/admin_doc/template_tag_index.html | 4 ++-- .../admindocs/templates/admin_doc/view_index.html | 2 +- .../databrowse/templates/databrowse/calendar_day.html | 4 ++-- .../templates/databrowse/calendar_month.html | 4 ++-- .../databrowse/templates/databrowse/choice_detail.html | 8 ++++---- .../databrowse/templates/databrowse/choice_list.html | 2 +- .../templates/databrowse/fieldchoice_detail.html | 8 ++++---- .../templates/databrowse/fieldchoice_homepage.html | 2 +- .../templates/databrowse/fieldchoice_list.html | 8 ++++---- .../databrowse/templates/databrowse/homepage.html | 2 +- .../databrowse/templates/databrowse/model_detail.html | 2 +- .../databrowse/templates/databrowse/object_detail.html | 8 ++++---- .../contrib/formtools/templates/formtools/preview.html | 2 +- django/contrib/gis/templates/gis/admin/openlayers.js | 10 +++++----- django/contrib/sitemaps/templates/sitemap.xml | 5 ++--- django/contrib/sitemaps/templates/sitemap_index.xml | 5 ++--- django/views/static.py | 9 ++++++--- 34 files changed, 82 insertions(+), 81 deletions(-) diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index f1c4a8d34a..db40c4a25b 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -8,8 +8,8 @@ {% block breadcrumbs %}{% if not is_popup %}
{% trans "Home" %} › - {{ opts.verbose_name_plural|capfirst|escape }} › - {{ original|truncatewords:"18"|escape }} › + {{ opts.verbose_name_plural|capfirst }} › + {{ original|truncatewords:"18" }} › {% trans 'Change password' %}
{% endif %}{% endblock %} @@ -23,7 +23,7 @@

{% endif %} -

{% blocktrans with original.username|escape as username %}Enter a new password for the user {{ username }}.{% endblocktrans %}

+

{% blocktrans with original.username as username %}Enter a new password for the user {{ username }}.{% endblocktrans %}

diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index f99e6d88b6..fdf0f28221 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -22,22 +22,22 @@ {% block branding %}{% endblock %} {% if user.is_authenticated and user.is_staff %} -
{% trans 'Welcome,' %} {% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %}
+
{% trans 'Welcome,' %} {% firstof user.first_name user.username %}. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %}
{% endif %} {% block nav-global %}{% endblock %} - {% block breadcrumbs %}
{% trans 'Home' %}{% if title %} › {{ title|escape }}{% endif %}
{% endblock %} + {% block breadcrumbs %}
{% trans 'Home' %}{% if title %} › {{ title }}{% endif %}
{% endblock %} {% endif %} {% if messages %} - + {% endif %}
{% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title|escape }}

{% endif %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} {% block content %} {% block object-tools %}{% endblock %} {{ content }} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index b66f67edf6..c5a9ea9c90 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -5,7 +5,7 @@ {% block bodyclass %}change-list{% endblock %} -{% if not is_popup %}{% block breadcrumbs %}
{% trans "Home" %} › {{ app_label|capfirst|escape }} › {{ cl.opts.verbose_name_plural|capfirst|escape }}
{% endblock %}{% endif %} +{% if not is_popup %}{% block breadcrumbs %}
{% trans "Home" %} › {{ app_label|capfirst }} › {{ cl.opts.verbose_name_plural|capfirst }}
{% endblock %}{% endif %} {% block coltype %}flex{% endblock %} @@ -13,7 +13,7 @@
{% block object-tools %} {% if has_add_permission %} - + {% endif %} {% endblock %}
diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 2a6c4b4ad5..42802f57bc 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -4,23 +4,23 @@ {% block breadcrumbs %}
{% trans "Home" %} › - {{ app_label|capfirst|escape }} › + {{ app_label|capfirst }} › {{ opts.verbose_name_plural|capfirst }} › - {{ object|escape|truncatewords:"18" }} › + {{ object|truncatewords:"18" }} › {% trans 'Delete' %}
{% endblock %} {% block content %} {% if perms_lacking %} -

{% blocktrans with object|escape as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

+

{% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

    {% for obj in perms_lacking %}
  • {{ obj }}
    • {% endfor %}
{% else %} -

{% blocktrans with object|escape as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

+

{% blocktrans with object as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

    {{ deleted_objects|unordered_list }}
diff --git a/django/contrib/admin/templates/admin/edit_inline/tabular.html b/django/contrib/admin/templates/admin/edit_inline/tabular.html index d77d63c676..e21cf10dea 100644 --- a/django/contrib/admin/templates/admin/edit_inline/tabular.html +++ b/django/contrib/admin/templates/admin/edit_inline/tabular.html @@ -3,13 +3,13 @@
{{ inline_admin_formset.formset.management_form }}
-

{{ inline_admin_formset.opts.verbose_name_plural|capfirst|escape }}

+

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

{{ inline_admin_formset.formset.non_form_errors }} {% for field in inline_admin_formset.fields %} {% if not field.is_hidden %} - + {% endif %} {% endfor %} {% if inline_admin_formset.formset.can_delete %}{% endif %} diff --git a/django/contrib/admin/templates/admin/filter.html b/django/contrib/admin/templates/admin/filter.html index bcc64ac7e4..9ef69ffda7 100644 --- a/django/contrib/admin/templates/admin/filter.html +++ b/django/contrib/admin/templates/admin/filter.html @@ -1,8 +1,8 @@ {% load i18n %} -

{% blocktrans with title|escape as filter_title %} By {{ filter_title }} {% endblocktrans %}

+

{% blocktrans with title as filter_title %} By {{ filter_title }} {% endblocktrans %}

diff --git a/django/contrib/admin/templates/admin/index.html b/django/contrib/admin/templates/admin/index.html index ba0c381fad..9eb60b8071 100644 --- a/django/contrib/admin/templates/admin/index.html +++ b/django/contrib/admin/templates/admin/index.html @@ -59,7 +59,7 @@ {% else %} {% endif %} diff --git a/django/contrib/admin/templates/admin/object_history.html b/django/contrib/admin/templates/admin/object_history.html index 5c357b224d..38b1c34ac8 100644 --- a/django/contrib/admin/templates/admin/object_history.html +++ b/django/contrib/admin/templates/admin/object_history.html @@ -4,7 +4,7 @@ {% block breadcrumbs %}
{% trans 'Home' %} › - {{ app_label|capfirst|escape }} › + {{ app_label|capfirst }} › {{ module_name }} › {{ object|truncatewords:"18" }} › {% trans 'History' %} @@ -28,7 +28,7 @@ {% for action in action_list %}
- + {% endfor %} diff --git a/django/contrib/admin/templates/admin/pagination.html b/django/contrib/admin/templates/admin/pagination.html index 0640a4690b..7694e4c5b0 100644 --- a/django/contrib/admin/templates/admin/pagination.html +++ b/django/contrib/admin/templates/admin/pagination.html @@ -6,6 +6,6 @@ {% paginator_number cl i %} {% endfor %} {% endif %} -{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name|escape }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} +{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} {% if show_all_url %}  {% trans 'Show all' %}{% endif %}

diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index b232aa917d..97ef8f18b7 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -4,13 +4,13 @@
- + {% if show_result_count %} {% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %} ({% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}) {% endif %} {% for pair in cl.params.items %} - {% ifnotequal pair.0 search_var %}{% endifnotequal %} + {% ifnotequal pair.0 search_var %}{% endifnotequal %} {% endfor %}
diff --git a/django/contrib/admin/templates/admin/template_validator.html b/django/contrib/admin/templates/admin/template_validator.html index 510614386c..d221807486 100644 --- a/django/contrib/admin/templates/admin/template_validator.html +++ b/django/contrib/admin/templates/admin/template_validator.html @@ -12,11 +12,11 @@
- {% if form.errors.site %}{{ form.errors.site }}{% endif %} + {{ form.errors.site }}

{{ form.site }}

- {% if form.errors.template %}{{ form.errors.template }}{% endif %} + {{ form.errors.template }}

{{ form.template }}

diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index 4facc0ec01..384f852305 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -13,11 +13,11 @@ -{% if form.old_password.errors %}{{ form.old_password.errors }}{% endif %} +{{ form.old_password.errors }}

{{ form.old_password }}

-{% if form.new_password1.errors %}{{ form.new_password1.errors }}{% endif %} +{{ form.new_password1.errors }}

{{ form.new_password1 }}

-{% if form.new_password2.errors %}{{ form.new_password2.errors }}{% endif %} +{{ form.new_password2.errors }}

{{ form.new_password2 }}

diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index 9ba0e5af27..0d3eb385c9 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -14,9 +14,9 @@

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

-{% if form.new_password1.errors %}{{ form.new_password1.errors }}{% endif %} +{{ form.new_password1.errors }}

{{ form.new_password1 }}

-{% if form.new_password2.errors %}{{ form.new_password2.errors }}{% endif %} +{{ form.new_password2.errors }}

{{ form.new_password2 }}

diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index 4ecebc77a1..704066c68a 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -12,7 +12,7 @@

{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}

-{% if form.email.errors %}{{ form.email.errors }}{% endif %} +{{ form.email.errors }}

{{ form.email }}

diff --git a/django/contrib/admindocs/templates/admin_doc/model_detail.html b/django/contrib/admindocs/templates/admin_doc/model_detail.html index 414397f23a..828df18377 100644 --- a/django/contrib/admindocs/templates/admin_doc/model_detail.html +++ b/django/contrib/admindocs/templates/admin_doc/model_detail.html @@ -34,7 +34,7 @@ - + {% endfor %} diff --git a/django/contrib/admindocs/templates/admin_doc/template_detail.html b/django/contrib/admindocs/templates/admin_doc/template_detail.html index a8b02bd189..c04dedc530 100644 --- a/django/contrib/admindocs/templates/admin_doc/template_detail.html +++ b/django/contrib/admindocs/templates/admin_doc/template_detail.html @@ -1,18 +1,18 @@ {% extends "admin/base_site.html" %} {% load i18n %} -{% block breadcrumbs %}
Home › Documentation › Templates › {{ name|escape }}
{% endblock %} +{% block breadcrumbs %}
Home › Documentation › Templates › {{ name }}
{% endblock %} -{% block title %}Template: {{ name|escape }}{% endblock %} +{% block title %}Template: {{ name }}{% endblock %} {% block content %} -

Template: "{{ name|escape }}"

+

Template: "{{ name }}"

{% regroup templates|dictsort:"site_id" by site as templates_by_site %} {% for group in templates_by_site %} -

Search path for template "{{ name|escape }}" on {{ group.grouper }}:

+

Search path for template "{{ name }}" on {{ group.grouper }}:

    {% for template in group.list|dictsort:"order" %} -
  1. {{ template.file|escape }}{% if not template.exists %} (does not exist){% endif %}
    2. +
  2. {{ template.file }}{% if not template.exists %} (does not exist){% endif %}
    3. {% endfor %}
{% endfor %} diff --git a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html index 902396d416..53383edc23 100644 --- a/django/contrib/admindocs/templates/admin_doc/template_filter_index.html +++ b/django/contrib/admindocs/templates/admin_doc/template_filter_index.html @@ -12,7 +12,7 @@ {% regroup filters|dictsort:"library" by library as filter_libraries %} {% for library in filter_libraries %}
-

{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}

+

{% firstof library.grouper "Built-in filters" %}

{% if library.grouper %}

To use these filters, put {% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %} in your template before using the filter.

{% endif %} {% for filter in library.list|dictsort:"name" %}

{{ filter.name }}

@@ -33,7 +33,7 @@ {% regroup filters|dictsort:"library" by library as filter_libraries %} {% for library in filter_libraries %}
-

{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}

+

{% firstof library.grouper "Built-in filters" %}

    {% for filter in library.list|dictsort:"name" %}
  • {{ filter.name }}
    • diff --git a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html index ea49529393..a4ad66fd96 100644 --- a/django/contrib/admindocs/templates/admin_doc/template_tag_index.html +++ b/django/contrib/admindocs/templates/admin_doc/template_tag_index.html @@ -12,7 +12,7 @@ {% regroup tags|dictsort:"library" by library as tag_libraries %} {% for library in tag_libraries %}
    -

    {% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}

    +

    {% firstof library.grouper "Built-in tags" %}

    {% if library.grouper %}

    To use these tags, put {% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %} in your template before using the tag.

    {% endif %} {% for tag in library.list|dictsort:"name" %}

    {{ tag.name }}

    @@ -33,7 +33,7 @@ {% regroup tags|dictsort:"library" by library as tag_libraries %} {% for library in tag_libraries %}
    -

    {% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}

    +

    {% firstof library.grouper "Built-in tags" %}

      {% for tag in library.list|dictsort:"name" %}
    • {{ tag.name }}
      • diff --git a/django/contrib/admindocs/templates/admin_doc/view_index.html b/django/contrib/admindocs/templates/admin_doc/view_index.html index 4099005828..6b10fa65e3 100644 --- a/django/contrib/admindocs/templates/admin_doc/view_index.html +++ b/django/contrib/admindocs/templates/admin_doc/view_index.html @@ -29,7 +29,7 @@ {% for view in site_views.list|dictsort:"url" %} {% ifchanged %} -

      {{ view.url|escape }}

      +

      {{ view.url }}

      View function: {{ view.module }}.{{ view.name }}

      {{ view.title }}

      diff --git a/django/contrib/databrowse/templates/databrowse/calendar_day.html b/django/contrib/databrowse/templates/databrowse/calendar_day.html index bbb62cc814..b0a221d5d3 100644 --- a/django/contrib/databrowse/templates/databrowse/calendar_day.html +++ b/django/contrib/databrowse/templates/databrowse/calendar_day.html @@ -6,11 +6,11 @@ -

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural|escape }}{% else %}{{ model.verbose_name|escape }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F j, Y" }}

      +

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F j, Y" }}

      diff --git a/django/contrib/databrowse/templates/databrowse/calendar_month.html b/django/contrib/databrowse/templates/databrowse/calendar_month.html index 70b7deb75a..f6a616911b 100644 --- a/django/contrib/databrowse/templates/databrowse/calendar_month.html +++ b/django/contrib/databrowse/templates/databrowse/calendar_month.html @@ -6,11 +6,11 @@ -

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural|escape }}{% else %}{{ model.verbose_name|escape }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F Y" }}

      +

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.verbose_name }} on {{ day|date:"F Y" }}

      diff --git a/django/contrib/databrowse/templates/databrowse/choice_detail.html b/django/contrib/databrowse/templates/databrowse/choice_detail.html index 6cb73e73ec..0abc536515 100644 --- a/django/contrib/databrowse/templates/databrowse/choice_detail.html +++ b/django/contrib/databrowse/templates/databrowse/choice_detail.html @@ -1,16 +1,16 @@ {% extends "databrowse/base_site.html" %} -{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value|escape }}{% endblock %} +{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value }}{% endblock %} {% block content %} - + -

      {{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value|escape }}

      +

      {{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}: {{ value }}

      diff --git a/django/contrib/databrowse/templates/databrowse/choice_list.html b/django/contrib/databrowse/templates/databrowse/choice_list.html index 95cd88b0bf..58675e82bf 100644 --- a/django/contrib/databrowse/templates/databrowse/choice_list.html +++ b/django/contrib/databrowse/templates/databrowse/choice_list.html @@ -10,7 +10,7 @@ diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html index 7801f3f631..2dd55d48ac 100644 --- a/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html +++ b/django/contrib/databrowse/templates/databrowse/fieldchoice_detail.html @@ -1,16 +1,16 @@ {% extends "databrowse/base_site.html" %} -{% block title %}{{ model.verbose_name_plural|capfirst|escape }} with {{ field.field.verbose_name|escape }} {{ value|escape }}{% endblock %} +{% block title %}{{ model.verbose_name_plural|capfirst }} with {{ field.field.verbose_name }} {{ value }}{% endblock %} {% block content %} - + -

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural|escape }}{% else %}{{ model.verbose_name|escape }}{% endif %} with {{ field.field.verbose_name|escape }} {{ value|escape }}

      +

      {{ object_list.count }} {% if object_list.count|pluralize %}{{ model.verbose_name_plural }}{% else %}{{ model.verbose_name }}{% endif %} with {{ field.field.verbose_name }} {{ value }}

      diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html index 3259824061..b82c22d5b4 100644 --- a/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html +++ b/django/contrib/databrowse/templates/databrowse/fieldchoice_homepage.html @@ -1,6 +1,6 @@ {% extends "databrowse/base_site.html" %} -{% block title %}Browsable fields in {{ model.verbose_name_plural|escape }}{% endblock %} +{% block title %}Browsable fields in {{ model.verbose_name_plural }}{% endblock %} {% block content %} diff --git a/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html b/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html index 71b906d3e7..bb60a0e871 100644 --- a/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html +++ b/django/contrib/databrowse/templates/databrowse/fieldchoice_list.html @@ -1,16 +1,16 @@ {% extends "databrowse/base_site.html" %} -{% block title %}{{ model.verbose_name_plural|capfirst|escape }} by {{ field.field.verbose_name|escape }}{% endblock %} +{% block title %}{{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}{% endblock %} {% block content %} - + -

      {{ model.verbose_name_plural|capfirst|escape }} by {{ field.field.verbose_name|escape }}

      +

      {{ model.verbose_name_plural|capfirst }} by {{ field.field.verbose_name }}

      diff --git a/django/contrib/databrowse/templates/databrowse/homepage.html b/django/contrib/databrowse/templates/databrowse/homepage.html index 718e577416..0f6708f5fd 100644 --- a/django/contrib/databrowse/templates/databrowse/homepage.html +++ b/django/contrib/databrowse/templates/databrowse/homepage.html @@ -11,7 +11,7 @@

      {{ model.verbose_name_plural|capfirst }}

      {% for object in model.sample_objects %} - {{ object|escape }}, + {{ object }}, {% endfor %} More →

      diff --git a/django/contrib/databrowse/templates/databrowse/model_detail.html b/django/contrib/databrowse/templates/databrowse/model_detail.html index b66bc093dd..11c6808f14 100644 --- a/django/contrib/databrowse/templates/databrowse/model_detail.html +++ b/django/contrib/databrowse/templates/databrowse/model_detail.html @@ -12,7 +12,7 @@ diff --git a/django/contrib/databrowse/templates/databrowse/object_detail.html b/django/contrib/databrowse/templates/databrowse/object_detail.html index 7c1bd3e16d..81c37f7736 100644 --- a/django/contrib/databrowse/templates/databrowse/object_detail.html +++ b/django/contrib/databrowse/templates/databrowse/object_detail.html @@ -4,9 +4,9 @@ {% block content %} - + -

      {{ object.model.verbose_name|capfirst }}: {{ object|escape }}

      +

      {{ object.model.verbose_name|capfirst }}: {{ object }}

{{ field.label|capfirst|escape }}{{ field.label|capfirst }}{% trans "Delete?" %}
{{ action.action_time|date:_("DATETIME_FORMAT") }}{{ action.user.username }}{% if action.user.first_name %} ({{ action.user.first_name }} {{ action.user.last_name }}){% endif %}{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %} {{ action.change_message }}
{{ field.name }} {{ field.data_type }}{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}{{ field.verbose }}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}
{% for field in object.fields %} @@ -15,7 +15,7 @@ @@ -29,7 +29,7 @@ {% if related_object.object_list %} {% else %} diff --git a/django/contrib/formtools/templates/formtools/preview.html b/django/contrib/formtools/templates/formtools/preview.html index 983115758f..c53ce91724 100644 --- a/django/contrib/formtools/templates/formtools/preview.html +++ b/django/contrib/formtools/templates/formtools/preview.html @@ -8,7 +8,7 @@ {% for field in form %} - + {% endfor %}
{% if field.urls %} {% for value, url in field.urls %} -{% if url %}{% endif %}{{ value|escape }}{% if url %}{% endif %}{% if not forloop.last %}, {% endif %} +{% if url %}{% endif %}{{ value }}{% if url %}{% endif %}{% if not forloop.last %}, {% endif %} {% endfor %} {% else %}None{% endif %}
{{ field.label }}:{{ field.data|escape }}{{ field.data }}
diff --git a/django/contrib/gis/templates/gis/admin/openlayers.js b/django/contrib/gis/templates/gis/admin/openlayers.js index 719426127c..17aed153b3 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.js +++ b/django/contrib/gis/templates/gis/admin/openlayers.js @@ -2,11 +2,11 @@ {% block vars %}var {{ module }} = {}; {{ module }}.map = null; {{ module }}.controls = null; {{ module }}.panel = null; {{ module }}.re = new RegExp("^SRID=\d+;(.+)", "i"); {{ module }}.layers = {}; {{ module }}.wkt_f = new OpenLayers.Format.WKT(); -{{ module }}.is_collection = {% if is_collection %}true{% else %}false{% endif %}; +{{ module }}.is_collection = {{ is_collection|yesno:"true,false" }}; {{ module }}.collection_type = '{{ collection_type }}'; -{{ module }}.is_linestring = {% if is_linestring %}true{% else %}false{% endif %}; -{{ module }}.is_polygon = {% if is_polygon %}true{% else %}false{% endif %}; -{{ module }}.is_point = {% if is_point %}true{% else %}false{% endif %}; +{{ module }}.is_linestring = {{ is_linestring|yesno:"true,false" }}; +{{ module }}.is_polygon = {{ is_polygon|yesno:"true,false" }}; +{{ module }}.is_point = {{ is_point|yesno:"true,false" }}; {% endblock %} {{ module }}.get_ewkt = function(feat){return 'SRID={{ srid }};' + {{ module }}.wkt_f.write(feat);} {{ module }}.read_wkt = function(wkt){ @@ -147,7 +147,7 @@ {% if scale_text %}{{ module }}.map.addControl(new OpenLayers.Control.Scale());{% endif %} {% if layerswitcher %}{{ module }}.map.addControl(new OpenLayers.Control.LayerSwitcher());{% endif %} // Then add optional behavior controls - {% if scrollable %}{% else %}{{ module }}.map.getControlsByClass('OpenLayers.Control.Navigation')[0].disableZoomWheel();{% endif %} + {% if not scrollable %}{{ module }}.map.getControlsByClass('OpenLayers.Control.Navigation')[0].disableZoomWheel();{% endif %} {% endblock %} if (wkt){ {{ module }}.enableEditing(); diff --git a/django/contrib/sitemaps/templates/sitemap.xml b/django/contrib/sitemaps/templates/sitemap.xml index c0d529d62e..30ca3c024e 100644 --- a/django/contrib/sitemaps/templates/sitemap.xml +++ b/django/contrib/sitemaps/templates/sitemap.xml @@ -1,9 +1,9 @@ -{% autoescape off %} + {% spaceless %} {% for url in urlset %} - {{ url.location|escape }} + {{ url.location }} {% if url.lastmod %}{{ url.lastmod|date:"Y-m-d" }}{% endif %} {% if url.changefreq %}{{ url.changefreq }}{% endif %} {% if url.priority %}{{ url.priority }}{% endif %} @@ -11,4 +11,3 @@ {% endfor %} {% endspaceless %} -{% endautoescape %} diff --git a/django/contrib/sitemaps/templates/sitemap_index.xml b/django/contrib/sitemaps/templates/sitemap_index.xml index 497ae8bb81..f19e622c55 100644 --- a/django/contrib/sitemaps/templates/sitemap_index.xml +++ b/django/contrib/sitemaps/templates/sitemap_index.xml @@ -1,5 +1,4 @@ -{% autoescape off %} + -{% for location in sitemaps %}{{ location|escape }}{% endfor %} +{% for location in sitemaps %}{{ location }}{% endfor %} -{% endautoescape %} diff --git a/django/views/static.py b/django/views/static.py index 5a4d3ab55c..4ae4d8e60d 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -73,13 +73,16 @@ DEFAULT_DIRECTORY_INDEX_TEMPLATE = """ - Index of {{ directory|escape }} + Index of {{ directory }} -

Index of {{ directory|escape }}

+

Index of {{ directory }}

    + {% ifnotequal directory "/" %} +
  • ../
    • + {% endifnotequal %} {% for f in file_list %} -
  • {{ f|escape }}
    • +
  • {{ f }}
    • {% endfor %}