Ticket #8172: decruftify_admin_templates.diff

File decruftify_admin_templates.diff, 22.5 KB (added by benspaulding, 7 years ago)
  • django/contrib/admin/templates/admin/template_validator.html

     
    1212
    1313<fieldset class="module aligned">
    1414<div class="form-row{% if form.site.errors %} error{% endif %} required">
    15     {% if form.site.errors %}{{ form.site.html_error_list }}{% endif %}
     15    {{ form.site.html_error_list }}
    1616    <h4><label for="id_site">Site:</label> {{ form.site }}</h4>
    1717</div>
    1818<div class="form-row{% if form.template.errors %} error{% endif %} required">
    19     {% if form.template.errors %}{{ form.template.html_error_list }}{% endif %}
     19    {{ form.template.html_error_list }}
    2020    <h4><label for="id_template">Template:</label> {{ form.template }}</h4>
    2121</div>
    2222</fieldset>
  • django/contrib/admin/templates/admin/change_list.html

     
    55
    66{% block bodyclass %}change-list{% endblock %}
    77
    8 {% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</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; {{ cl.opts.verbose_name_plural|capfirst }}</div>{% endblock %}{% endif %}
    99
    1010{% block coltype %}flex{% endblock %}
    1111
     
    1313<div id="content-main">
    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 %}
    1919<div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">
  • django/contrib/admin/templates/admin/edit_inline/tabular.html

     
    33  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
    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>
    99     <thead><tr>
    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 %}
    1515     {% if inline_admin_formset.formset.can_delete %}<th>{% trans "Delete" %}?</th>{% endif %}
     
    2121
    2222        <td class="original">
    2323          {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
    24           {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
     24          {{ inline_admin_form.original }}
    2525          {% if inline_admin_form.show_url %}<a href="/r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">View on site</a>{% endif %}
    2626            </p>{% endif %}
    2727          {{ inline_admin_form.pk_field.field }}
  • django/contrib/admin/templates/admin/filter.html

     
    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/contrib/admin/templates/admin/object_history.html

     
    2222        {% for action in action_list %}
    2323        <tr>
    2424            <th scope="row">{{ action.action_time|date:_("DATE_WITH_TIME_FULL") }}</th>
    25             <td>{{ action.user.username }}{% if action.user.first_name %} ({{ action.user.first_name }} {{ action.user.last_name }}){% endif %}</td>
     25            <td>{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td>
    2626            <td>{{ action.change_message }}</td>
    2727        </tr>
    2828        {% endfor %}
  • django/contrib/admin/templates/admin/search_form.html

     
    44<div id="toolbar"><form id="changelist-search" action="" method="get">
    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 %}
    1010    <span class="small quiet">{% blocktrans count cl.result_count as counter %}1 result{% plural %}{{ counter }} results{% endblocktrans %} (<a href="?{% if cl.is_popup %}pop=1{% endif %}">{% blocktrans with cl.full_result_count as full_result_count %}{{ full_result_count }} total{% endblocktrans %}</a>)</span>
    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>
    1616</form></div>
  • django/contrib/admin/templates/admin/pagination.html

     
    66    {% paginator_number cl i %}
    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/contrib/admin/templates/admin/auth/user/change_password.html

     
    88{% block breadcrumbs %}{% if not is_popup %}
    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>
    1515{% endif %}{% endblock %}
     
    2323    </p>
    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">
    2929
  • django/contrib/admin/templates/admin/index.html

     
    5959            {% else %}
    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>
    6565            {% endif %}
  • django/contrib/admin/templates/admin/delete_confirmation.html

     
    55<div class="breadcrumbs">
    66     <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
    77     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
    8      <a href="../">{{ object|escape|truncatewords:"18" }}</a> &rsaquo;
     8     <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;
    99     {% trans 'Delete' %}
    1010</div>
    1111{% endblock %}
    1212
    1313{% block content %}
    1414{% if perms_lacking %}
    15     <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>
     15    <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>
    1616    <ul>
    1717    {% for obj in perms_lacking %}
    1818        <li>{{ obj }}</li>
    1919    {% endfor %}
    2020    </ul>
    2121{% else %}
    22     <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>
     22    <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>
    2323    <ul>{{ deleted_objects|unordered_list }}</ul>
    2424    <form action="" method="post">
    2525    <div>
  • django/contrib/admin/templates/admin/base.html

     
    2222        {% block branding %}{% endblock %}
    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 %}<a href="{{ root_path }}doc/">{% trans 'Documentation' %}</a> / <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 %}<a href="{{ root_path }}doc/">{% trans 'Documentation' %}</a> / <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
    3737    <!-- Content -->
    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 %}
    4343        {{ content }}
  • django/contrib/admin/templates/registration/password_reset_confirm.html

     
    1414<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
    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>
    2222</form>
  • django/contrib/admin/templates/registration/password_reset_form.html

     
    1212<p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>
    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>
    1818
  • django/contrib/admin/templates/registration/password_change_form.html

     
    1313
    1414<form action="" method="post">
    1515
    16 {% if form.old_password.errors %}{{ form.old_password.html_error_list }}{% endif %}
     16{{ form.old_password.html_error_list }}
    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.html_error_list }}{% endif %}
     18{{ form.new_password1.html_error_list }}
    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.html_error_list }}{% endif %}
     20{{ form.new_password2.html_error_list }}
    2121<p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
    2222
    2323<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
  • django/contrib/admin/templates/admin_doc/template_detail.html

     
    11{% extends "admin/base_site.html" %}
    22{% load i18n %}
    3 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name|escape }}</div>{% endblock %}
     3{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">Home</a> &rsaquo; <a href="../../">Documentation</a> &rsaquo; Templates &rsaquo; {{ name }}</div>{% endblock %}
    44
    5 {% block title %}Template: {{ name|escape }}{% endblock %}
     5{% block title %}Template: {{ name }}{% endblock %}
    66
    77{% block content %}
    8 <h1>Template: "{{ name|escape }}"</h1>
     8<h1>Template: "{{ name }}"</h1>
    99
    1010{% regroup templates|dictsort:"site_id" by site as templates_by_site %}
    1111{% for group in templates_by_site %}
    12     <h2>Search path for template "{{ name|escape }}" on {{ group.grouper }}:</h2>
     12    <h2>Search path for template "{{ name }}" on {{ group.grouper }}:</h2>
    1313    <ol>
    1414    {% for template in group.list|dictsort:"order" %}
    15         <li><code>{{ template.file|escape }}</code>{% if not template.exists %} <em>(does not exist)</em>{% endif %}</li>
     15        <li><code>{{ template.file }}</code>{% if not template.exists %} <em>(does not exist)</em>{% endif %}</li>
    1616    {% endfor %}
    1717    </ol>
    1818{% endfor %}
  • django/contrib/admin/templates/admin_doc/template_tag_index.html

     
    1212{% regroup tags|dictsort:"library" by library as tag_libraries %}
    1313{% for library in tag_libraries %}
    1414<div class="module">
    15     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2>
     15    <h2>{% firstof library.grouper "Built-in tags" %}</h2>
    1616    {% 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 %}
    1717    {% for tag in library.list|dictsort:"name" %}
    1818    <h3 id="{{ tag.name }}">{{ tag.name }}</h3>
     
    3333{% regroup tags|dictsort:"library" by library as tag_libraries %}
    3434{% for library in tag_libraries %}
    3535<div class="module">
    36     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in tags{% endif %}</h2>
     36    <h2>{% firstof library.grouper "Built-in tags" %}</h2>
    3737    <ul>
    3838    {% for tag in library.list|dictsort:"name" %}
    3939        <li><a href="#{{ tag.name }}">{{ tag.name }}</a></li>
  • django/contrib/admin/templates/admin_doc/view_index.html

     
    2929
    3030{% for view in site_views.list|dictsort:"url" %}
    3131{% ifchanged %}
    32 <h3><a href="{{ view.module }}.{{ view.name }}/">{{ view.url|escape }}</a></h3>
     32<h3><a href="{{ view.module }}.{{ view.name }}/">{{ view.url }}</a></h3>
    3333<p class="small quiet">View function: {{ view.module }}.{{ view.name }}</p>
    3434<p>{{ view.title }}</p>
    3535<hr />
  • django/contrib/admin/templates/admin_doc/model_detail.html

     
    3434<tr>
    3535    <td>{{ field.name }}</td>
    3636    <td>{{ field.data_type }}</td>
    37     <td>{% if field.verbose %}{{ field.verbose }}{% endif %}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}</td>
     37    <td>{{ field.verbose }}{% if field.help_text %} - {{ field.help_text|safe }}{% endif %}</td>
    3838</tr>
    3939{% endfor %}
    4040</tbody>
  • django/contrib/admin/templates/admin_doc/template_filter_index.html

     
    1212{% regroup filters|dictsort:"library" by library as filter_libraries %}
    1313{% for library in filter_libraries %}
    1414<div class="module">
    15     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
     15    <h2>{% firstof library.grouper "Built-in filters" %}</h2>
    1616    {% 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 %}
    1717    {% for filter in library.list|dictsort:"name" %}
    1818    <h3 id="{{ filter.name }}">{{ filter.name }}</h3>
     
    3333{% regroup filters|dictsort:"library" by library as filter_libraries %}
    3434{% for library in filter_libraries %}
    3535<div class="module">
    36     <h2>{% if library.grouper %}{{ library.grouper }}{% else %}Built-in filters{% endif %}</h2>
     36    <h2>{% firstof library.grouper "Built-in filters" %}</h2>
    3737    <ul>
    3838    {% for filter in library.list|dictsort:"name" %}
    3939        <li><a href="#{{ filter.name }}">{{ filter.name }}</a></li>
Back to Top