Commit efae9a16 authored by Luke Plant's avatar Luke Plant
Browse files

[1.2.X] Fixed #2283 (again) - comment form templates don't validate as XHTML 

Thanks to hjoreteg/thejaswi_puthraya for the report and patch.

Backport of [13855] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13856 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 2d7a3e71

django/contrib/comments/templates/comments/400-debug.html

+2 −2
Original line number Diff line number Diff line 
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

<html lang="en">

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" lang="en">

<head>

  <meta http-equiv="content-type" content="text/html; charset=utf-8" />

  <title>Comment post not allowed (400)</title>

django/contrib/comments/templates/comments/approve.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  <h1>{% trans "Really make this comment public?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">{% csrf_token %}

    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}

    {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}

    <p class="submit">

      <input type="submit" name="submit" value="{% trans "Approve" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

    </p>

django/contrib/comments/templates/comments/base.html

+3 −2
Original line number Diff line number Diff line 
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">

<html lang="en">

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head>

  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

  <title>{% block title %}{% endblock %}</title>

django/contrib/comments/templates/comments/delete.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
<h1>{% trans "Really remove this comment?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">{% csrf_token %}

    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}

    {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}

    <p class="submit">

    <input type="submit" name="submit" value="{% trans "Remove" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

    </p>

django/contrib/comments/templates/comments/flag.html

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
<h1>{% trans "Really flag this comment?" %}</h1>

  <blockquote>{{ comment|linebreaks }}</blockquote>

  <form action="." method="post">{% csrf_token %}

    {% if next %}<input type="hidden" name="next" value="{{ next }}" id="next" />{% endif %}

    {% if next %}<div><input type="hidden" name="next" value="{{ next }}" id="next" /></div>{% endif %}

    <p class="submit">

    <input type="submit" name="submit" value="{% trans "Flag" %}" /> or <a href="{{ comment.get_absolute_url }}">cancel</a>

    </p>