Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 Morales authored December 16, 2010
4  django/contrib/admindocs/templates/admin_doc/template_filter_index.html
@@ -16,8 +16,8 @@
16 16
     {% 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 %}
17 17
     {% for filter in library.list|dictsort:"name" %}
18 18
     <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name }}">{{ filter.name }}</h3>
19  
-    <p>{{ filter.title }}</p>
20  
-    <p>{{ filter.body }}</p>
  19
+    {{ filter.title }}
  20
+    {{ filter.body }}
21 21
     {% if not forloop.last %}<hr />{% endif %}
22 22
     {% endfor %}
23 23
 </div>
4  django/contrib/admindocs/templates/admin_doc/template_tag_index.html
@@ -16,8 +16,8 @@
16 16
     {% 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 %}
17 17
     {% for tag in library.list|dictsort:"name" %}
18 18
     <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name }}">{{ tag.name }}</h3>
19  
-    <h4>{{ tag.title }}</h4>
20  
-    <p>{{ tag.body }}</p>
  19
+    <h4>{{ tag.title|striptags }}</h4>
  20
+    {{ tag.body }}
21 21
     {% if not forloop.last %}<hr />{% endif %}
22 22
     {% endfor %}
23 23
 </div>
4  django/contrib/admindocs/templates/admin_doc/view_detail.html
@@ -7,9 +7,9 @@
7 7
 
8 8
 <h1>{{ name }}</h1>
9 9
 
10  
-<h2 class="subhead">{{ summary }}</h2>
  10
+<h2 class="subhead">{{ summary|striptags }}</h2>
11 11
 
12  
-<p>{{ body }}</p>
  12
+{{ body }}
13 13
 
14 14
 {% if meta.Context %}
15 15
 <h3>Context:</h3>
2  django/template/defaulttags.py
@@ -853,7 +853,7 @@ def do_if(parser, token):
853 853
         {% endif %}
854 854
 
855 855
     Comparison operators are also available, and the use of filters is also
856  
-    allowed, for example:
  856
+    allowed, for example::
857 857
 
858 858
         {% if articles|length >= 5 %}...{% endif %}
859 859
 

0 notes on commit 87315cc

Please sign in to comment.
Something went wrong with that request. Please try again.