Index: django/contrib/admin/options.py
===================================================================
--- django/contrib/admin/options.py (revision 8272)
+++ django/contrib/admin/options.py (working copy)
@@ -87,6 +87,12 @@
else:
self.fields = field
+ def __len__(self):
+ try:
+ return len(self.fields)
+ except TypeError:
+ return 1
+
def __iter__(self):
for i, field in enumerate(self.fields):
yield AdminField(self.form, field, is_first=(i == 0))
Index: django/contrib/admin/templates/admin/includes/fieldset.html
===================================================================
--- django/contrib/admin/templates/admin/includes/fieldset.html (revision 8272)
+++ django/contrib/admin/templates/admin/includes/fieldset.html (working copy)
@@ -4,7 +4,9 @@
{% for line in fieldset %}
{% endfor %}
Index: django/contrib/admin/templates/admin/edit_inline/tabular.html
===================================================================
--- django/contrib/admin/templates/admin/edit_inline/tabular.html (revision 8272)
+++ django/contrib/admin/templates/admin/edit_inline/tabular.html (working copy)
@@ -42,6 +42,7 @@
{{ field.field.errors.as_ul }}
{{ field.field }}
+ {% if field.field.field.help_text %} {{ field.field.field.help_text|safe }} {% endif %}
|
{% endfor %}
{% endfor %}
Index: django/contrib/admin/media/css/forms.css
===================================================================
--- django/contrib/admin/media/css/forms.css (revision 8272)
+++ django/contrib/admin/media/css/forms.css (working copy)
@@ -21,6 +21,8 @@
/* ALIGNED FIELDSETS */
.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
.aligned label.inline { display:inline; float:none; }
+.inline-fieldset {float:left;}
+.inline-fieldset p.help { max-width:20em; }
.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; }
form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; }
form .aligned table p { margin-left:0; padding-left:0; }
@@ -72,6 +74,7 @@
.inline-related fieldset {margin: 0; background:#fff; border: none; }
.inline-related fieldset.module h3 { margin:0; padding:2px 5px 3px 5px; font-size:11px; text-align:left; font-weight:bold; background:#bcd; color:#fff; }
.inline-related.tabular fieldset.module table {width:100%;}
+.inline-related.tabular p.help {max-width:20em;}
.last-related fieldset {border: none;}
.inline-group .tabular tr.has_original td {padding-top:2em;}