From 34a4af50be5c8a9ddf147b8c1315f8f227590e1e Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Tue, 14 Sep 2010 14:22:35 +0000 Subject: [PATCH] Fixed #2283 (again) - comment form templates don't validate as XHTML Thanks to hjoreteg/thejaswi_puthraya for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13855 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/comments/templates/comments/400-debug.html | 4 ++-- django/contrib/comments/templates/comments/approve.html | 2 +- django/contrib/comments/templates/comments/base.html | 5 +++-- django/contrib/comments/templates/comments/delete.html | 2 +- django/contrib/comments/templates/comments/flag.html | 2 +- django/contrib/comments/templates/comments/form.html | 4 ++-- django/contrib/comments/templates/comments/preview.html | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/django/contrib/comments/templates/comments/400-debug.html b/django/contrib/comments/templates/comments/400-debug.html index 3c4532b9b0..29593b574b 100644 --- a/django/contrib/comments/templates/comments/400-debug.html +++ b/django/contrib/comments/templates/comments/400-debug.html @@ -1,5 +1,5 @@ - - + + Comment post not allowed (400) diff --git a/django/contrib/comments/templates/comments/approve.html b/django/contrib/comments/templates/comments/approve.html index 1a3a3fd80c..78d15dbb0e 100644 --- a/django/contrib/comments/templates/comments/approve.html +++ b/django/contrib/comments/templates/comments/approve.html @@ -7,7 +7,7 @@

{% trans "Really make this comment public?" %}

{{ comment|linebreaks }}
{% csrf_token %} - {% if next %}{% endif %} + {% if next %}
{% endif %}

or cancel

diff --git a/django/contrib/comments/templates/comments/base.html b/django/contrib/comments/templates/comments/base.html index 36fc66f7d1..b787246c9c 100644 --- a/django/contrib/comments/templates/comments/base.html +++ b/django/contrib/comments/templates/comments/base.html @@ -1,5 +1,6 @@ - - + +.dtd"> + {% block title %}{% endblock %} diff --git a/django/contrib/comments/templates/comments/delete.html b/django/contrib/comments/templates/comments/delete.html index 5ff2add9c5..50c9a4d1b1 100644 --- a/django/contrib/comments/templates/comments/delete.html +++ b/django/contrib/comments/templates/comments/delete.html @@ -7,7 +7,7 @@

{% trans "Really remove this comment?" %}

{{ comment|linebreaks }}
{% csrf_token %} - {% if next %}{% endif %} + {% if next %}
{% endif %}

or cancel

diff --git a/django/contrib/comments/templates/comments/flag.html b/django/contrib/comments/templates/comments/flag.html index 0b9ab1ccb2..ca7c77f111 100644 --- a/django/contrib/comments/templates/comments/flag.html +++ b/django/contrib/comments/templates/comments/flag.html @@ -7,7 +7,7 @@

{% trans "Really flag this comment?" %}

{{ comment|linebreaks }}
{% csrf_token %} - {% if next %}{% endif %} + {% if next %}
{% endif %}

or cancel

diff --git a/django/contrib/comments/templates/comments/form.html b/django/contrib/comments/templates/comments/form.html index 30f031128c..2a9ad557dd 100644 --- a/django/contrib/comments/templates/comments/form.html +++ b/django/contrib/comments/templates/comments/form.html @@ -1,9 +1,9 @@ {% load comments i18n %} {% csrf_token %} - {% if next %}{% endif %} + {% if next %}
{% endif %} {% for field in form %} {% if field.is_hidden %} - {{ field }} +
{{ field }}
{% else %} {% if field.errors %}{{ field.errors }}{% endif %}

{% csrf_token %} - {% if next %}{% endif %} + {% if next %}

{% endif %} {% if form.errors %}

{% blocktrans count form.errors|length as counter %}Please correct the error below{% plural %}Please correct the errors below{% endblocktrans %}

{% else %} @@ -18,7 +18,7 @@ {% endif %} {% for field in form %} {% if field.is_hidden %} - {{ field }} +
{{ field }}
{% else %} {% if field.errors %}{{ field.errors }}{% endif %}