Author: lukeplant
Date: 2010-09-14 09:24:15 -0500 (Tue, 14 Sep 2010)
New Revision: 13856
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/400-debug.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/approve.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/base.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/delete.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/flag.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/form.html
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/preview.html
Log:
[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
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/400-debug.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/400-debug.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/400-debug.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -1,5 +1,5 @@
-<!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>
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/approve.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/approve.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/approve.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -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>
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/base.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/base.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/base.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -1,5 +1,6 @@
-<!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>
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/delete.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/delete.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/delete.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -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>
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/flag.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/flag.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/flag.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -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>
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/form.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/form.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/form.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -1,9 +1,9 @@
{% load comments i18n %}
<form action="{% comment_form_target %}" method="post">{% csrf_token %}
- {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif
%}
+ {% if next %}<div><input type="hidden" name="next" value="{{ next }}"
/></div>{% endif %}
{% for field in form %}
{% if field.is_hidden %}
- {{ field }}
+ <div>{{ field }}</div>
{% else %}
{% if field.errors %}{{ field.errors }}{% endif %}
<p
Modified:
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/preview.html
===================================================================
---
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/preview.html
2010-09-14 14:22:35 UTC (rev 13855)
+++
django/branches/releases/1.2.X/django/contrib/comments/templates/comments/preview.html
2010-09-14 14:24:15 UTC (rev 13856)
@@ -6,7 +6,7 @@
{% block content %}
{% load comments %}
<form action="{% comment_form_target %}" method="post">{% csrf_token %}
- {% if next %}<input type="hidden" name="next" value="{{ next }}" />{%
endif %}
+ {% if next %}<div><input type="hidden" name="next" value="{{ next }}"
/></div>{% endif %}
{% if form.errors %}
<h1>{% blocktrans count form.errors|length as counter %}Please correct the
error below{% plural %}Please correct the errors below{% endblocktrans %}</h1>
{% else %}
@@ -18,7 +18,7 @@
{% endif %}
{% for field in form %}
{% if field.is_hidden %}
- {{ field }}
+ <div>{{ field }}</div>
{% else %}
{% if field.errors %}{{ field.errors }}{% endif %}
<p
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
