From 2bb3401d06c423b49748f2ec4f1570cd0c9e83a4 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Wed, 20 Apr 2011 17:41:04 +0000 Subject: [PATCH] Fixed various validation errors caught by the validator.nu HTML5 validator. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16051 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templates/admin/change_list.html | 2 +- django/contrib/admin/templates/admin/change_list_results.html | 2 +- django/contrib/admin/templates/admin/delete_confirmation.html | 2 +- .../admin/templates/admin/delete_selected_confirmation.html | 2 +- django/contrib/admin/templates/admin/search_form.html | 2 +- .../admin/templates/registration/password_change_form.html | 2 +- .../admin/templates/registration/password_reset_confirm.html | 2 +- .../admin/templates/registration/password_reset_form.html | 2 +- django/contrib/formtools/templates/formtools/form.html | 2 +- django/contrib/formtools/templates/formtools/preview.html | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 33b5201665..2e7c8e3b39 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -87,7 +87,7 @@ {% endif %} {% endblock %} -
{% csrf_token %} + {% csrf_token %} {% if cl.formset %}
{{ cl.formset.management_form }}
{% endif %} diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html index 891268faba..b3fa224e6b 100644 --- a/django/contrib/admin/templates/admin/change_list_results.html +++ b/django/contrib/admin/templates/admin/change_list_results.html @@ -5,7 +5,7 @@ {% endif %} {% if results %}
- +
{% for header in result_headers %}
diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 0e6d47e68d..9187b6035b 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -32,7 +32,7 @@ {% else %}

{% 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 }}
- {% csrf_token %} + {% csrf_token %}
diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index 127519bea7..cedf14e6d2 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -33,7 +33,7 @@ {% for deletable_object in deletable_objects %}
    {{ deletable_object|unordered_list }}
{% endfor %} - {% csrf_token %} + {% csrf_token %}
{% for obj in queryset %} diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html index 3e14a110eb..b53fe428da 100644 --- a/django/contrib/admin/templates/admin/search_form.html +++ b/django/contrib/admin/templates/admin/search_form.html @@ -1,7 +1,7 @@ {% load adminmedia %} {% load i18n %} {% if cl.search_fields %} -
+
diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index 23d6c1d8af..d313a79dd1 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -9,7 +9,7 @@ {% block content %}
-{% csrf_token %} +{% csrf_token %}
{% if form.errors %}

diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index df9cf1b316..546ae0feba 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -13,7 +13,7 @@

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

-{% csrf_token %} +{% csrf_token %} {{ form.new_password1.errors }}

{{ form.new_password1 }}

{{ form.new_password2.errors }} diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index d3a128428a..575e237726 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -11,7 +11,7 @@

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

-{% csrf_token %} +{% csrf_token %} {{ form.email.errors }}

{{ form.email }}

diff --git a/django/contrib/formtools/templates/formtools/form.html b/django/contrib/formtools/templates/formtools/form.html index 2f2de1f637..cfb5c6cb52 100644 --- a/django/contrib/formtools/templates/formtools/form.html +++ b/django/contrib/formtools/templates/formtools/form.html @@ -4,7 +4,7 @@ {% if form.errors %}

Please correct the following errors

{% else %}

Submit

{% endif %} -
{% csrf_token %} +{% csrf_token %} {{ form }}
diff --git a/django/contrib/formtools/templates/formtools/preview.html b/django/contrib/formtools/templates/formtools/preview.html index eb88b1ec2e..dea3a99b04 100644 --- a/django/contrib/formtools/templates/formtools/preview.html +++ b/django/contrib/formtools/templates/formtools/preview.html @@ -15,7 +15,7 @@

Security hash: {{ hash_value }}

-{% csrf_token %} +{% csrf_token %} {% for field in form %}{{ field.as_hidden }} {% endfor %} @@ -25,7 +25,7 @@

Or edit it again

-{% csrf_token %} +{% csrf_token %} {{ form }}