Ticket #494: 494.2.patch

django/db/models/fields/related.py

@@ -17 +17 @@
     from sets import Set as set   # Python 2.3 fallback
 
 # Values for Relation.edit_inline.
-TABULAR, STACKED = 1, 2
+TABULAR, STACKED = 'inline_tabular ', 'inline_stacked '
 
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
 

django/contrib/admin/templatetags/admin_modify.py

@@ -166 +166 @@
     def render(self, context):
         relation = self.rel_var.resolve(context)
         context.push()
-        if relation.field.rel.edit_inline == models.TABULAR:
+        edit_inline = relation.field.rel.edit_inline
+        if edit_inline.startswith(models.TABULAR):
             bound_related_object_class = TabularBoundRelatedObject
-        elif relation.field.rel.edit_inline == models.STACKED:
+            edit_inline = edit_inline[len(models.TABULAR):]
+        elif edit_inline.startswith(models.STACKED):
             bound_related_object_class = StackedBoundRelatedObject
+            edit_inline = edit_inline[len(models.STACKED):]
         else:
             bound_related_object_class = relation.field.rel.edit_inline
         original = context.get('original', None)
         bound_related_object = relation.bind(context['form'], original, bound_related_object_class)
         context['bound_related_object'] = bound_related_object
+        context['extra_classes'] = edit_inline
         t = loader.get_template(bound_related_object.template_name())
         output = t.render(context)
         context.pop()

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

@@ -1 +1 @@
 {% load admin_modify %}
-<fieldset class="module aligned">
+<fieldset class="module aligned {{extra_classes}}">
    {% for fcw in bound_related_object.form_field_collection_wrappers %}
       <h2>{{ bound_related_object.relation.opts.verbose_name|capfirst }}&nbsp;#{{ forloop.counter }}</h2>
       {% if bound_related_object.show_url %}{% if fcw.obj.original %}

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

@@ -1 +1 @@
 {% load admin_modify %}
-<fieldset class="module">
+<fieldset class="module {{extra_classes}}">
    <h2>{{ bound_related_object.relation.opts.verbose_name_plural|capfirst }}</h2><table>
    <thead><tr>
    {% for fw in bound_related_object.field_wrapper_list %}

docs/model-api.txt

@@ -818 +818 @@
                              interface. Use either ``models.TABULAR`` or ``models.STACKED``,
                              which, respectively, designate whether the inline-editable
                              objects are displayed as a table or as a "stack" of
-                             fieldsets.
+                             fieldsets.  You can append a string specifying extra CSS
+                             classes to be used for the inline fieldsets; the
+                             ``collapse`` and ``wide`` classes, documented below, are
+                             useful. For example::
 
+                                edit_inline = models.TABULAR + 'collapse'
+
     ``limit_choices_to``     A dictionary of lookup arguments and values (see
                              the `Database API reference`_) that limit the
                              available admin choices for this object. Use this