Author: ramiro
Date: 2010-12-16 06:11:20 -0600 (Thu, 16 Dec 2010)
New Revision: 14920
Modified:
django/trunk/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
django/trunk/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
django/trunk/django/contrib/admindocs/templates/admin_doc/view_detail.html
django/trunk/django/template/defaulttags.py
Log:
Fixed #2411 -- Fixed some XHTML validation errors in admindocs pages. Thanks to
James Wheare for the report and to Simon Greenhill for the patch.
Modified:
django/trunk/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
===================================================================
---
django/trunk/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
2010-12-15 14:48:19 UTC (rev 14919)
+++
django/trunk/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
2010-12-16 12:11:20 UTC (rev 14920)
@@ -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>
Modified:
django/trunk/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
===================================================================
---
django/trunk/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
2010-12-15 14:48:19 UTC (rev 14919)
+++
django/trunk/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
2010-12-16 12:11:20 UTC (rev 14920)
@@ -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>
Modified:
django/trunk/django/contrib/admindocs/templates/admin_doc/view_detail.html
===================================================================
--- django/trunk/django/contrib/admindocs/templates/admin_doc/view_detail.html
2010-12-15 14:48:19 UTC (rev 14919)
+++ django/trunk/django/contrib/admindocs/templates/admin_doc/view_detail.html
2010-12-16 12:11:20 UTC (rev 14920)
@@ -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>
Modified: django/trunk/django/template/defaulttags.py
===================================================================
--- django/trunk/django/template/defaulttags.py 2010-12-15 14:48:19 UTC (rev
14919)
+++ django/trunk/django/template/defaulttags.py 2010-12-16 12:11:20 UTC (rev
14920)
@@ -853,7 +853,7 @@
{% endif %}
Comparison operators are also available, and the use of filters is also
- allowed, for example:
+ allowed, for example::
{% if articles|length >= 5 %}...{% endif %}
--
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.
