Django

Code

Changeset 8871

Show
Ignore:
Timestamp:
09/02/08 14:25:27 (4 months ago)
Author:
jacob
Message:

Fixed #2612: fixed display of admin help_text with multiple fields on the same line. Thanks to Nathan Borror for the original patch, and jezdez for a little cleanup.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8240 r8871  
    1010form h4 { margin:0 !important; padding:0 !important; border:none !important; } 
    1111label { font-weight:normal !important; color:#666; font-size:12px; } 
    12 label.inline { margin-left:20px; } 
    1312.required label, label.required { font-weight:bold !important; color:#333 !important; } 
    1413 
    …… 
    2019 
    2120/* ALIGNED FIELDSETS */ 
    22 .aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; } 
    23 .aligned label.inline { display:inline; float:none; } 
     21.aligned label { display:block; padding:3px 10px 0 0; float:left; width:8em; } 
    2422.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { width:350px; } 
    2523form .aligned p, form .aligned ul { margin-left:7em; padding-left:30px; } 
    …… 
    2927.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { width:610px; } 
    3028.checkbox-row p.help { margin-left:0; padding-left:0 !important; } 
     29fieldset .field-box { float:left; margin-right: 20px; } 
    3130 
    3231/* WIDE FIELDSETS */ 
    …… 
    6160.vTextField { width:20em; } 
    6261.vIntegerField { width:5em; } 
     62.vForeignKeyRawIdAdminField { width: 5em; } 
    6363 
    64 /* x unsorted */ 
     64/* INLINES */ 
    6565.inline-group {padding:0; border:1px solid #ccc; margin:10px 0;} 
    66 .inline-group .aligned label { width: 7em; } 
     66.inline-group .aligned label { width: 8em; } 
    6767 
    6868.inline-related {position:relative;} 

  • django/trunk/django/contrib/admin/media/css/rtl.css

    r8501 r8871  
    3939form ul.inline li { float:right; padding-right:0; padding-left:7px; } 
    4040input[type=submit].default, .submit-row input.default { float:left; } 
     41fieldset .field-box { float:right; margin-left: 20px; } 
    4142 
    4243/* widget styles */ 

  • django/trunk/django/contrib/admin/media/css/widgets.css

    r6210 r8871  
    3434p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; } 
    3535.datetime span { font-size:11px; color:#ccc; font-weight:normal; white-space:nowrap; } 
    36 .vDateField { margin-left:4px; } 
    3736table p.datetime { font-size:10px; margin-left:0; padding-left:0; } 
    3837 

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

    r8824 r8871  
    66      {{ line.errors }} 
    77      {% for field in line %} 
    8       <div class="float-left"> 
     8      <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}> 
    99          {% if field.is_checkbox %} 
    1010              {{ field.field }}{{ field.label_tag }}