Django

Code

Show
Ignore:
Timestamp:
07/18/08 18:54:34 (4 months ago)
Author:
brosner
Message:

Merged the newforms-admin branch into trunk.

This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets?
and Media definitions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/contrib/admin/templates/admin/change_form.html

    r7294 r7967  
    11{% extends "admin/base_site.html" %} 
    22{% load i18n admin_modify adminmedia %} 
     3 
    34{% block extrahead %}{{ block.super }} 
    45<script type="text/javascript" src="../../../jsi18n/"></script> 
    5 {% for js in javascript_imports %}{% include_admin_script js %}{% endfor %
     6{{ media }
    67{% endblock %} 
     8 
    79{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %} 
     10 
    811{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %} 
     12 
    913{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} 
     14 
    1015{% block breadcrumbs %}{% if not is_popup %} 
    1116<div class="breadcrumbs"> 
     
    1520</div> 
    1621{% endif %}{% endblock %} 
     22 
    1723{% block content %}<div id="content-main"> 
    1824{% block object-tools %} 
     
    2632<div> 
    2733{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %} 
    28 {% if opts.admin.save_on_top %}{% submit_row %}{% endif %} 
    29 {% if form.error_dict %} 
     34{% if save_on_top %}{% submit_row %}{% endif %} 
     35{% if errors %} 
    3036    <p class="errornote"> 
    31     {% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} 
     37    {% blocktrans count errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} 
    3238    </p> 
     39    <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul> 
    3340{% endif %} 
    34 {% for bound_field_set in bound_field_sets %} 
    35    <fieldset class="module aligned {{ bound_field_set.classes }}"> 
    36     {% if bound_field_set.name %}<h2>{{ bound_field_set.name }}</h2>{% endif %} 
    37     {% if bound_field_set.description %}<div class="description">{{ bound_field_set.description|safe }}</div>{% endif %} 
    38     {% for bound_field_line in bound_field_set %} 
    39         {% admin_field_line bound_field_line %} 
    40         {% for bound_field in bound_field_line %} 
    41             {% filter_interface_script_maybe bound_field %} 
    42         {% endfor %} 
     41 
     42{% for fieldset in adminform %} 
     43  {% include "admin/includes/fieldset.html" %} 
     44{% endfor %} 
     45 
     46{% block after_field_sets %}{% endblock %} 
     47 
     48{% for inline_admin_formset in inline_admin_formsets %} 
     49    {% include inline_admin_formset.opts.template %} 
     50{% endfor %} 
     51 
     52{% block after_related_objects %}{% endblock %} 
     53 
     54{% submit_row %} 
     55 
     56{% if add %} 
     57   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script> 
     58{% endif %} 
     59 
     60{# JavaScript for prepopulated fields #} 
     61 
     62{% if add %} 
     63<script type="text/javascript"> 
     64{% for field in adminform.prepopulated_fields %} 
     65    document.getElementById("{{ field.field.auto_id }}").onchange = function() { this._changed = true; }; 
     66    {% for dependency in field.dependencies %} 
     67    document.getElementById("{{ dependency.auto_id }}").onkeyup = function() { 
     68        var e = document.getElementById("{{ field.field.auto_id }}"); 
     69        if (!e._changed) { e.value = URLify({% for innerdep in field.dependencies %}document.getElementById("{{ innerdep.auto_id }}").value{% if not forloop.last %} + ' ' + {% endif %}{% endfor %}, {{ field.field.field.max_length }}); } 
     70    } 
    4371    {% endfor %} 
    44    </fieldset> 
    4572{% endfor %} 
    46 {% block after_field_sets %}{% endblock %} 
    47 {% if change %} 
    48    {% if ordered_objects %} 
    49    <fieldset class="module"><h2>{% trans "Ordering" %}</h2> 
    50    <div class="form-row{% if form.order_.errors %} error{% endif %} "> 
    51    {% if form.order_.errors %}{{ form.order_.html_error_list }}{% endif %} 
    52    <p><label for="id_order_">{% trans "Order:" %}</label> {{ form.order_ }}</p> 
    53    </div></fieldset> 
    54    {% endif %} 
     73</script> 
    5574{% endif %} 
    56 {% for related_object in inline_related_objects %}{% edit_inline related_object %}{% endfor %} 
    57 {% block after_related_objects %}{% endblock %} 
    58 {% submit_row %} 
    59 {% if add %} 
    60    <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script> 
    61 {% endif %} 
    62 {% if auto_populated_fields %} 
    63    <script type="text/javascript"> 
    64    {% auto_populated_field_script auto_populated_fields change %} 
    65    </script> 
    66 {% endif %} 
     75 
    6776</div> 
    6877</form></div>