Fixed #2612 -- Fixed admin formatting when help_text is used with multiple fields on the same line.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8824 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 2 insertions, 0 deletions

diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index 27e54c75d3..26c918c051 100644
--- a/django/contrib/admin/templates/admin/includes/fieldset.html
+++ b/django/contrib/admin/templates/admin/includes/fieldset.html
@@ -5,12 +5,14 @@
       <div class="form-row{% if line.errors %} errors{% endif %} {% for field in line %}{{ field.field.name }} {% endfor %} ">
       {{ line.errors }}
       {% for field in line %}
+      <div class="float-left">
           {% if field.is_checkbox %}
               {{ field.field }}{{ field.label_tag }}
           {% else %}
               {{ field.label_tag }}{{ field.field }}
           {% endif %}
           {% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text|safe }}</p>{% endif %}
+      </div>
       {% endfor %}
       </div>
   {% endfor %}