Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages.…

… Thanks to James Wheare for the report and to Simon Greenhill for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 87315cc22d3177251f0a015abf6c0092883e558c 1 parent 6892348
@ramiro ramiro authored
View
4 django/contrib/admindocs/templates/admin_doc/template_filter_index.html
@@ -16,8 +16,8 @@
{% if library.grouper %}<p class="small quiet">To use these filters, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the filter.</p><hr />{% endif %}
{% for filter in library.list|dictsort:"name" %}
<h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name }}">{{ filter.name }}</h3>
- <p>{{ filter.title }}</p>
- <p>{{ filter.body }}</p>
+ {{ filter.title }}
+ {{ filter.body }}
{% if not forloop.last %}<hr />{% endif %}
{% endfor %}
</div>
View
4 django/contrib/admindocs/templates/admin_doc/template_tag_index.html
@@ -16,8 +16,8 @@
{% if library.grouper %}<p class="small quiet">To use these tags, put <code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag closeblock %}</code> in your template before using the tag.</p><hr />{% endif %}
{% for tag in library.list|dictsort:"name" %}
<h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name }}">{{ tag.name }}</h3>
- <h4>{{ tag.title }}</h4>
- <p>{{ tag.body }}</p>
+ <h4>{{ tag.title|striptags }}</h4>
+ {{ tag.body }}
{% if not forloop.last %}<hr />{% endif %}
{% endfor %}
</div>
View
4 django/contrib/admindocs/templates/admin_doc/view_detail.html
@@ -7,9 +7,9 @@
<h1>{{ name }}</h1>
-<h2 class="subhead">{{ summary }}</h2>
+<h2 class="subhead">{{ summary|striptags }}</h2>
-<p>{{ body }}</p>
+{{ body }}
{% if meta.Context %}
<h3>Context:</h3>
View
2  django/template/defaulttags.py
@@ -853,7 +853,7 @@ def do_if(parser, token):
{% endif %}
Comparison operators are also available, and the use of filters is also
- allowed, for example:
+ allowed, for example::
{% if articles|length >= 5 %}...{% endif %}
Please sign in to comment.
Something went wrong with that request. Please try again.