Commit 3ede006f authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #911 -- Made template system scoped to the parser instead of the... 

Fixed #911 -- Made template system scoped to the parser instead of the template module. Also changed the way tags/filters are registered and added support for multiple arguments to {% load %} tag. Thanks, rjwittams. This is a backwards-incompatible change for people who've created custom template tags or filters. See http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges for upgrade instructions.

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

django/contrib/admin/templates/admin/change_form.html

+1 −3
Original line number Diff line number Diff line 
{% extends "admin/base_site" %}

{% load i18n %}

{% load admin_modify %}

{% load adminmedia %}

{% load i18n admin_modify adminmedia %}

{% block extrahead %}

{% for js in bound_manipulator.javascript_imports %}{% include_admin_script js %}{% endfor %}

{% endblock %}

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

+1 −2
Original line number Diff line number Diff line 
{% load admin_list %}

{% load i18n %}

{% load adminmedia admin_list i18n %}

{% extends "admin/base_site" %}

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

{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst }} </div>{% endblock %}{% endif %}

django/contrib/admin/templates/admin/edit_inline_stacked.html

+1 −0
Original line number Diff line number Diff line 
{% load admin_modify %}

<fieldset class="module aligned">

   {% for fcw in bound_related_object.form_field_collection_wrappers %}

      <h2>{{ bound_related_object.relation.opts.verbose_name|capfirst }}&nbsp;#{{ forloop.counter }}</h2>

django/contrib/admin/templates/admin/edit_inline_tabular.html

+1 −0
Original line number Diff line number Diff line 
{% load admin_modify %}

<fieldset class="module">

   <h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2><table>

   <thead><tr>

django/contrib/admin/templates/admin/field_line.html

+1 −0
Original line number Diff line number Diff line 
{% load admin_modify %}

<div class="{{ class_names }}" >

{% for bound_field in bound_fields %}{{ bound_field.html_error_list }}{% endfor %}

{% for bound_field in bound_fields %}