From 4393fea6821b322c7806a6acf83c6e37e5ca3607 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sun, 5 Oct 2008 05:17:29 +0000
Subject: [PATCH] [1.0.X] Fixed #8869 -- Fixed comments templates to be
well-formed XHTML. Based on a patch from zgoda.
Backport of r9117 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
.../contrib/comments/templates/comments/approve.html | 4 ++--
django/contrib/comments/templates/comments/delete.html | 4 ++--
django/contrib/comments/templates/comments/flag.html | 4 ++--
.../comments/templates/comments/moderation_queue.html | 10 +++++-----
.../contrib/comments/templates/comments/preview.html | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/django/contrib/comments/templates/comments/approve.html b/django/contrib/comments/templates/comments/approve.html
index af7858da63..e07f74eedf 100644
--- a/django/contrib/comments/templates/comments/approve.html
+++ b/django/contrib/comments/templates/comments/approve.html
@@ -6,9 +6,9 @@
<h1>Really make this comment public?</h1>
<blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="post">
- <input type="hidden" name="next" value="{{ next }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next" />
<p class="submit">
- <input type="submit" name="submit" value="Approve"> or <a href="{{ comment.permalink }}">cancel</a>
+ <input type="submit" name="submit" value="Approve" /> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
{% endblock %}
diff --git a/django/contrib/comments/templates/comments/delete.html b/django/contrib/comments/templates/comments/delete.html
index 148fcdec90..917a638bc3 100644
--- a/django/contrib/comments/templates/comments/delete.html
+++ b/django/contrib/comments/templates/comments/delete.html
@@ -6,9 +6,9 @@
<h1>Really remove this comment?</h1>
<blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="post">
- <input type="hidden" name="next" value="{{ next }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next" />
<p class="submit">
- <input type="submit" name="submit" value="Remove"> or <a href="{{ comment.permalink }}">cancel</a>
+ <input type="submit" name="submit" value="Remove" /> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
{% endblock %}
diff --git a/django/contrib/comments/templates/comments/flag.html b/django/contrib/comments/templates/comments/flag.html
index b6905f2915..9f694773a2 100644
--- a/django/contrib/comments/templates/comments/flag.html
+++ b/django/contrib/comments/templates/comments/flag.html
@@ -6,9 +6,9 @@
<h1>Really flag this comment?</h1>
<blockquote>{{ comment|linebreaks }}</blockquote>
<form action="." method="post">
- <input type="hidden" name="next" value="{{ next }}" id="next">
+ <input type="hidden" name="next" value="{{ next }}" id="next" />
<p class="submit">
- <input type="submit" name="submit" value="Flag"> or <a href="{{ comment.permalink }}">cancel</a>
+ <input type="submit" name="submit" value="Flag" /> or <a href="{{ comment.permalink }}">cancel</a>
</p>
</form>
{% endblock %}
diff --git a/django/contrib/comments/templates/comments/moderation_queue.html b/django/contrib/comments/templates/comments/moderation_queue.html
index 8f09b2f05d..7cb3c62583 100644
--- a/django/contrib/comments/templates/comments/moderation_queue.html
+++ b/django/contrib/comments/templates/comments/moderation_queue.html
@@ -23,7 +23,7 @@
{% block content %}
{% if empty %}
- <p id="nocomments">No comments to moderate.</div>
+ <p id="nocomments">No comments to moderate.</p>
{% else %}
<div id="content-main">
<div class="module" id="changelist">
@@ -45,12 +45,12 @@
<tr class="{% cycle 'row1' 'row2' %}">
<td class="actions">
<form action="{% url comments-approve comment.pk %}" method="post">
- <input type="hidden" name="next" value="{% url comments-moderation-queue %}">
- <input class="approve submit" type="submit" name="submit" value="Approve">
+ <input type="hidden" name="next" value="{% url comments-moderation-queue %}" />
+ <input class="approve submit" type="submit" name="submit" value="Approve" />
</form>
<form action="{% url comments-delete comment.pk %}" method="post">
- <input type="hidden" name="next" value="{% url comments-moderation-queue %}">
- <input class="remove submit" type="submit" name="submit" value="Remove">
+ <input type="hidden" name="next" value="{% url comments-moderation-queue %}" />
+ <input class="remove submit" type="submit" name="submit" value="Remove" />
</form>
</td>
<td>{{ comment.name }}</td>
diff --git a/django/contrib/comments/templates/comments/preview.html b/django/contrib/comments/templates/comments/preview.html
index 0947476865..273e373583 100644
--- a/django/contrib/comments/templates/comments/preview.html
+++ b/django/contrib/comments/templates/comments/preview.html
@@ -11,7 +11,7 @@
<h1>Preview your comment</h1>
<blockquote>{{ comment|linebreaks }}</blockquote>
<p>
- and <input type="submit" name="submit" value="Post your comment" id="submit"> or make changes:
+ and <input type="submit" name="submit" value="Post your comment" id="submit" /> or make changes:
</p>
{% endif %}
{% for field in form %}
@@ -27,8 +27,8 @@
{% endif %}
{% endfor %}
<p class="submit">
- <input type="submit" name="submit" class="submit-post" value="Post">
- <input type="submit" name="submit" class="submit-preview" value="Preview">
+ <input type="submit" name="submit" class="submit-post" value="Post" />
+ <input type="submit" name="submit" class="submit-preview" value="Preview" />
</p>
</form>
{% endblock %}