Django

Code

Show
Ignore:
Timestamp:
09/08/08 00:19:28 (4 months ago)
Author:
adrian
Message:

Fixed #8172 -- Improved a whole bunch of contrib templates (admin, databrowse, admindocs, etc.) to remove unnecessary 'escape' filters, given autoescaping. Also removed unnecessary {% if %} tags and shortened some {% if %}/{% else %} tags to use {% firstof %}. Thanks for the patch, benspaulding

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/templates/admin/auth/user/change_password.html

    r7967 r8984  
    99<div class="breadcrumbs"> 
    1010     <a href="../../../../">{% trans "Home" %}</a> &rsaquo; 
    11      <a href="../../">{{ opts.verbose_name_plural|capfirst|escape }}</a> &rsaquo; 
    12      <a href="../">{{ original|truncatewords:"18"|escape }}</a> &rsaquo; 
     11     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo; 
     12     <a href="../">{{ original|truncatewords:"18" }}</a> &rsaquo; 
    1313     {% trans 'Change password' %} 
    1414</div> 
    …… 
    2424{% endif %} 
    2525 
    26 <p>{% blocktrans with original.username|escape as username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p> 
     26<p>{% blocktrans with original.username as username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p> 
    2727 
    2828<fieldset class="module aligned"> 

  • django/trunk/django/contrib/admin/templates/admin/base.html

    r8717 r8984  
    2323        </div> 
    2424        {% if user.is_authenticated and user.is_staff %} 
    25         <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}<a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
     25        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% firstof user.first_name user.username %}</strong>. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}<a href="{{ root_path }}password_change/">{% trans 'Change password' %}</a> / <a href="{{ root_path }}logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
    2626        {% endif %} 
    2727        {% block nav-global %}{% endblock %} 
    2828    </div> 
    2929    <!-- END Header --> 
    30     {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title|escape }}{% endif %}</div>{% endblock %} 
     30    {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %} 
    3131    {% endif %} 
    3232 
    3333        {% if messages %} 
    34         <ul class="messagelist">{% for message in messages %}<li>{{ message|escape }}</li>{% endfor %}</ul> 
     34        <ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul> 
    3535        {% endif %} 
    3636 
    …… 
    3838    <div id="content" class="{% block coltype %}colM{% endblock %}"> 
    3939        {% block pretitle %}{% endblock %} 
    40         {% block content_title %}{% if title %}<h1>{{ title|escape }}</h1>{% endif %}{% endblock %} 
     40        {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %} 
    4141        {% block content %} 
    4242        {% block object-tools %}{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/change_list.html

    r8474 r8984  
    66{% block bodyclass %}change-list{% endblock %} 
    77 
    8 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{{ app_label|capfirst|escape }}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %} 
     8{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{{ app_label|capfirst }}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst }}</div>{% endblock %}{% endif %} 
    99 
    1010{% block coltype %}flex{% endblock %} 
    …… 
    1414{% block object-tools %} 
    1515{% if has_add_permission %} 
    16 <ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul> 
     16<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}</a></li></ul> 
    1717{% endif %} 
    1818{% endblock %} 

  • django/trunk/django/contrib/admin/templates/admin/delete_confirmation.html

    r8474 r8984  
    55<div class="breadcrumbs"> 
    66     <a href="../../../../">{% trans "Home" %}</a> &rsaquo; 
    7      <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo;  
     7     <a href="../../../">{{ app_label|capfirst }}</a> &rsaquo;  
    88     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo; 
    9      <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo; 
     9     <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; 
    1010     {% trans 'Delete' %} 
    1111</div> 
    …… 
    1414{% block content %} 
    1515{% if perms_lacking %} 
    16     <p>{% blocktrans with object|escape as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> 
     16    <p>{% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p> 
    1717    <ul> 
    1818    {% for obj in perms_lacking %} 
    …… 
    2121    </ul> 
    2222{% else %} 
    23     <p>{% blocktrans with object|escape as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p> 
     23    <p>{% blocktrans with object as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p> 
    2424    <ul>{{ deleted_objects|unordered_list }}</ul> 
    2525    <form action="" method="post"> 

  • django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html

    r8587 r8984  
    44{{ inline_admin_formset.formset.management_form }} 
    55<fieldset class="module"> 
    6    <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst|escape }}</h2> 
     6   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2> 
    77   {{ inline_admin_formset.formset.non_form_errors }} 
    88   <table> 
    …… 
    1010     {% for field in inline_admin_formset.fields %} 
    1111       {% if not field.is_hidden %} 
    12          <th {% if forloop.first %}colspan="2"{% endif %}>{{ field.label|capfirst|escape }}</th> 
     12         <th {% if forloop.first %}colspan="2"{% endif %}>{{ field.label|capfirst }}</th> 
    1313        {% endif %} 
    1414     {% endfor %} 

  • django/trunk/django/contrib/admin/templates/admin/filter.html

    r7294 r8984  
    11{% load i18n %} 
    2 <h3>{% blocktrans with title|escape as filter_title %} By {{ filter_title }} {% endblocktrans %}</h3> 
     2<h3>{% blocktrans with title as filter_title %} By {{ filter_title }} {% endblocktrans %}</h3> 
    33<ul> 
    44{% for choice in choices %} 
    55    <li{% if choice.selected %} class="selected"{% endif %}> 
    6     <a href="{{ choice.query_string|iriencode }}">{{ choice.display|escape }}</a></li> 
     6    <a href="{{ choice.query_string|iriencode }}">{{ choice.display }}</a></li> 
    77{% endfor %} 
    88</ul> 

  • django/trunk/django/contrib/admin/templates/admin/index.html

    r8474 r8984  
    6060            <ul class="actionlist"> 
    6161            {% for entry in admin_log %} 
    62             <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr|escape }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li> 
     62            <li class="{% if entry.is_addition %}addlink{% endif %}{% if entry.is_change %}changelink{% endif %}{% if entry.is_deletion %}deletelink{% endif %}">{% if not entry.is_deletion %}<a href="{{ entry.get_admin_url }}">{% endif %}{{ entry.object_repr }}{% if not entry.is_deletion %}</a>{% endif %}<br /><span class="mini quiet">{% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %}</span></li> 
    6363            {% endfor %} 
    6464            </ul> 

  • django/trunk/django/contrib/admin/templates/admin/object_history.html

    r8555 r8984  
    55<div class="breadcrumbs"> 
    66    <a href="../../../../">{% trans 'Home' %}</a> &rsaquo;  
    7     <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo;  
     7    <a href="../../../">{{ app_label|capfirst }}</a> &rsaquo;  
    88    <a href="../../">{{ module_name }}</a> &rsaquo;  
    99    <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;  
    …… 
    2929        <tr> 
    3030            <th scope="row">{{ action.action_time|date:_("DATETIME_FORMAT") }}</th> 
    31             <td>{{ action.user.username }}{% if action.user.first_name %} ({{ action.user.first_name }} {{ action.user.last_name }}){% endif %}</td> 
     31            <td>{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td> 
    3232            <td>{{ action.change_message }}</td> 
    3333        </tr> 

  • django/trunk/django/contrib/admin/templates/admin/pagination.html

    r7294 r8984  
    77{% endfor %} 
    88{% endif %} 
    9 {{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name|escape }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} 
     9{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %} 
    1010{% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a>{% endif %} 
    1111</p> 

  • django/trunk/django/contrib/admin/templates/admin/search_form.html

    r7967 r8984  
    55<div><!-- DIV needed for valid HTML --> 
    66<label for="searchbar"><img src="{% admin_media_prefix %}img/admin/icon_searchbox.png" alt="Search" /></label> 
    7 <input type="text" size="40" name="{{ search_var }}" value="{{ cl.query|escape }}" id="searchbar" /> 
     7<input type="text" size="40" name="{{ search_var }}" value="{{ cl.query }}" id="searchbar" /> 
    88<input type="submit" value="{% trans 'Go' %}" /> 
    99{% if show_result_count %} 
    …… 
    1111{% endif %} 
    1212{% for pair in cl.params.items %} 
    13     {% ifnotequal pair.0 search_var %}<input type="hidden" name="{{ pair.0|escape }}" value="{{ pair.1|escape }}"/>{% endifnotequal %} 
     13    {% ifnotequal pair.0 search_var %}<input type="hidden" name="{{ pair.0 }}" value="{{ pair.1 }}"/>{% endifnotequal %} 
    1414{% endfor %} 
    1515</div> 

  • django/trunk/django/contrib/admin/templates/admin/template_validator.html

    r8294 r8984  
    1313<fieldset class="module aligned"> 
    1414<div class="form-row{% if form.errors.site %} error{% endif %} required"> 
    15     {% if form.errors.site %}{{ form.errors.site }}{% endif %} 
     15    {{ form.errors.site }} 
    1616    <h4><label for="id_site">{{ form.site.label }}:</label> {{ form.site }}</h4> 
    1717</div> 
    1818<div class="form-row{% if form.errors.template %} error{% endif %} required"> 
    19     {% if form.errors.template %}{{ form.errors.template }}{% endif %} 
     19    {{ form.errors.template }} 
    2020    <h4><label for="id_template">{{ form.template.label }}:</label> {{ form.template }}</h4> 
    2121</div> 

  • django/trunk/django/contrib/admin/templates/registration/password_change_form.html

    r8496 r8984  
    1414<form action="" method="post"> 
    1515 
    16 {% if form.old_password.errors %}{{ form.old_password.errors }}{% endif %} 
     16{{ form.old_password.errors }} 
    1717<p class="aligned wide"><label for="id_old_password">{% trans 'Old password:' %}</label>{{ form.old_password }}</p> 
    18 {% if form.new_password1.errors %}{{ form.new_password1.errors }}{% endif %} 
     18{{ form.new_password1.errors }} 
    1919<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p> 
    20 {% if form.new_password2.errors %}{{ form.new_password2.errors }}{% endif %} 
     20{{ form.new_password2.errors }} 
    2121<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p> 
    2222 

  • django/trunk/django/contrib/admin/templates/registration/password_reset_confirm.html

    r8162 r8984  
    1515 
    1616<form action="" method="post"> 
    17 {% if form.new_password1.errors %}{{ form.new_password1.errors }}{% endif %} 
     17{{ form.new_password1.errors }} 
    1818<p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p> 
    19 {% if form.new_password2.errors %}{{ form.new_password2.errors }}{% endif %} 
     19{{ form.new_password2.errors }} 
    2020<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p> 
    2121<p><input type="submit" value="{% trans 'Change my password' %}" /></p> 

  • django/trunk/django/contrib/admin/templates/registration/password_reset_form.html

    r8162 r8984  
    1313 
    1414<form action="" method="post"> 
    15 {% if form.email.errors %}{{ form.email.errors }}{% endif %} 
     15{{ form.email.errors }} 
    1616<p><label for="id_email">{% trans 'E-mail address:' %}</label> {{ form.email }} <input type="submit" value="{% trans 'Reset my password' %}" /></p> 
    1717</form>