Django

Code

Ticket #2411: admin_doc.diff

File admin_doc.diff, 4.9 kB (added by Simon G. <dev@simon.net.nz>, 1 year ago)

  • django/contrib/admin/templates/admin_doc/view_detail.html

    old new  
    66 
    77{% block content %} 
    88 
    9 <h1>{{ name }}</h1> 
     9<h1>{{ name|escape }}</h1> 
    1010 
    11 <h2 class="subhead">{{ summary }}</h2> 
     11<h2 class="subhead">{{ summary|removetags:"p" }}</h2> 
    1212 
    13 <p>{{ body }}</p> 
     13{{ body }} 
    1414 
    1515{% if meta.Context %} 
    1616<h3>Context:</h3> 

  • django/contrib/admin/templates/admin_doc/template_tag_index.html

    old new  
    1414{% for library in tag_libraries %} 
    1515<div class="module"> 
    1616    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2> 
    17     {% 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    {% 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 %} 
    1818    {% for tag in library.list|dictsort:"name" %} 
    19     <h3 id="{{ tag.name }}">{{ tag.name }}</h3> 
    20     <h4>{{ tag.title }}</h4> 
    21     <p>{{ tag.body }}</p> 
     19    <h3 id="{{ tag.name|escape }}">{{ tag.name|escape }}</h3> 
     20    <h4>{{ tag.title|removetags:"p" }}</h4> 
     21    {{ tag.body }} 
    2222    {% if not forloop.last %}<hr />{% endif %} 
    2323    {% endfor %} 
    2424</div> 

  • django/contrib/admin/templates/admin_doc/view_index.html

    old new  
    1616<h2>Jump to site</h2> 
    1717<ul> 
    1818    {% for site_views in views_by_site %} 
    19     <li><a href="#site{{ site_views.grouper.id }}">{{ site_views.grouper.name }}</a></li> 
     19    <li><a href="#site{{ site_views.grouper.id }}">{{ site_views.grouper.name|escape }}</a></li> 
    2020    {% endfor %} 
    2121</ul> 
    2222</div> 
    …… 
    2626 
    2727{% for site_views in views_by_site %} 
    2828<div class="module"> 
    29 <h2 id="site{{ site_views.grouper.id }}">Views by URL on {{ site_views.grouper.name }}</h2> 
     29<h2 id="site{{ site_views.grouper.id }}">Views by URL on {{ site_views.grouper.name|escape }}</h2> 
    3030 
    3131{% for view in site_views.list|dictsort:"url" %} 
    3232{% ifchanged %} 
    33 <h3><a href="{{ view.module }}.{{ view.name }}/"/>{{ view.url|escape }}</a></h3> 
    34 <p class="small quiet">View function: {{ view.module }}.{{ view.name }}</p> 
    35 <p>{{ view.title }}</p> 
    36 <hr> 
     33<h3><a href="{{ view.module|escape }}.{{ view.name|escape }}/">{{ view.url|escape }}</a></h3> 
     34<p class="small quiet">View function: {{ view.module|escape }}.{{ view.name|escape }}</p> 
     35<p>{{ view.title|escape }}</p> 
     36<hr /> 
    3737{% endifchanged %} 
    3838{% endfor %} 
    3939</div> 

  • django/contrib/admin/templates/admin_doc/template_filter_index.html

    old new  
    1414{% for library in filter_libraries %} 
    1515<div class="module"> 
    1616    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2> 
    17     {% 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    {% 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 %} 
    1818    {% for filter in library.list|dictsort:"name" %} 
    19     <h3 id="{{ filter.name }}">{{ filter.name }}</h3> 
    20     <p>{{ filter.title }}</p> 
    21     <p>{{ filter.body }}</p> 
     19    <h3 id="{{ filter.name }}">{{ filter.name|escape }}</h3> 
     20    {{ filter.title }} 
     21    {{ filter.body }} 
    2222    {% if not forloop.last %}<hr />{% endif %} 
    2323    {% endfor %} 
    2424</div> 
    …… 
    3737    <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2> 
    3838    <ul> 
    3939    {% for filter in library.list|dictsort:"name" %} 
    40         <li><a href="#{{ filter.name }}">{{ filter.name }}</a></li> 
     40        <li><a href="#{{ filter.name }}">{{ filter.name|escape }}</a></li> 
    4141    {% endfor %} 
    4242    </ul> 
    4343</div>