Ticket #7054: 7054.patch

django/contrib/admin/options.py

@@ -87 +87 @@
         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))

django/contrib/admin/templates/admin/includes/fieldset.html

@@ -4 +4 @@
   {% for line in fieldset %}
       <div class="form-row{% if line.errors %} errors{% endif %} {% for field in line %}{{ field.field.name }} {% endfor %} ">
       {{ line.errors }}
+      {% with line|length as length %}
       {% for field in line %}
+          {% ifnotequal length 1 %}<div class="inline-fieldset">{% endifnotequal %}
           {% if field.is_checkbox %}
               {{ field.field }}{{ field.label_tag }}
           {% else %}
@@ -11 +13 @@
               {{ field.label_tag }}{{ field.field }}
           {% endif %}
           {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text|safe }}</p>{% endif %}
+          {% ifnotequal length 1 %}</div>{% endifnotequal %}
       {% endfor %}
+      {% endwith %}
       </div>
   {% endfor %}
 </fieldset>

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -42 +42 @@
               <td class="{{ field.field.name }}">
               {{ field.field.errors.as_ul }}
               {{ field.field }}
+              {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text|safe }}</p>{% endif %}
               </td>
             {% endfor %}
           {% endfor %}

django/contrib/admin/media/css/forms.css

@@ -21 +21 @@
 /* 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 +74 @@
 .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;}