Commit 6bdb7b95 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #8172 -- Improved a whole bunch of contrib templates (admin, databrowse,... 

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent a5e0c5b1

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

+3 −3
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
{% block breadcrumbs %}{% if not is_popup %}

<div class="breadcrumbs">

     <a href="../../../../">{% trans "Home" %}</a> &rsaquo;

     <a href="../../">{{ opts.verbose_name_plural|capfirst|escape }}</a> &rsaquo;

     <a href="../">{{ original|truncatewords:"18"|escape }}</a> &rsaquo;

     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;

     <a href="../">{{ original|truncatewords:"18" }}</a> &rsaquo;

     {% trans 'Change password' %}

</div>

{% endif %}{% endblock %}
@@ -23,7 +23,7 @@ 
    </p>

{% endif %}



<p>{% blocktrans with original.username|escape as username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p>

<p>{% blocktrans with original.username as username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p>



<fieldset class="module aligned">

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

+4 −4
Original line number Diff line number Diff line
@@ -22,22 +22,22 @@ 
        {% block branding %}{% endblock %}

        </div>

        {% if user.is_authenticated and user.is_staff %}

        <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>

        <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>

        {% endif %}

        {% block nav-global %}{% endblock %}

    </div>

    <!-- END Header -->

    {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title|escape }}{% endif %}</div>{% endblock %}

    {% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans 'Home' %}</a>{% if title %} &rsaquo; {{ title }}{% endif %}</div>{% endblock %}

    {% endif %}



        {% if messages %}

        <ul class="messagelist">{% for message in messages %}<li>{{ message|escape }}</li>{% endfor %}</ul>

        <ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul>

        {% endif %}



    <!-- Content -->

    <div id="content" class="{% block coltype %}colM{% endblock %}">

        {% block pretitle %}{% endblock %}

        {% block content_title %}{% if title %}<h1>{{ title|escape }}</h1>{% endif %}{% endblock %}

        {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}

        {% block content %}

        {% block object-tools %}{% endblock %}

        {{ content }}

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

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


{% block bodyclass %}change-list{% endblock %}



{% 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 %}

{% 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 %}



{% block coltype %}flex{% endblock %}
@@ -13,7 +13,7 @@ 
<div id="content-main">

{% block object-tools %}

{% if has_add_permission %}

<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>

<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>

{% endif %}

{% endblock %}

<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">

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

+4 −4
Original line number Diff line number Diff line
@@ -4,23 +4,23 @@ 
{% block breadcrumbs %}

<div class="breadcrumbs">

     <a href="../../../../">{% trans "Home" %}</a> &rsaquo;

     <a href="../../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 

     <a href="../../../">{{ app_label|capfirst }}</a> &rsaquo; 

     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;

     <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo;

     <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;

     {% trans 'Delete' %}

</div>

{% endblock %}



{% block content %}

{% if perms_lacking %}

    <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>

    <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>

    <ul>

    {% for obj in perms_lacking %}

        <li>{{ obj }}</li>

    {% endfor %}

    </ul>

{% else %}

    <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>

    <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>

    <ul>{{ deleted_objects|unordered_list }}</ul>

    <form action="" method="post">

    <div>

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

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">

{{ inline_admin_formset.formset.management_form }}

<fieldset class="module">

   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst|escape }}</h2>

   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>

   {{ inline_admin_formset.formset.non_form_errors }}

   <table>

     <thead><tr>

     {% for field in inline_admin_formset.fields %}

       {% if not field.is_hidden %}

         <th {% if forloop.first %}colspan="2"{% endif %}>{{ field.label|capfirst|escape }}</th>

         <th {% if forloop.first %}colspan="2"{% endif %}>{{ field.label|capfirst }}</th>

        {% endif %}

     {% endfor %}

     {% if inline_admin_formset.formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}