Ticket #2612: ticket2612-r8860.diff

File ticket2612-r8860.diff, 4.2 KB (added by Jannis Leidel, 16 years ago)

Fix that doesn't patch float-left class and is rtl compatible.

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

    diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
index 234a21b..21aadc9 100644
    a b form .form-row p { padding-left:0; font-size:11px; }  
    99/* FORM LABELS */
    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
    1514/* RADIO BUTTONS */
    … … form ul.inline { margin-left:0; padding:0; }  
    1918form ul.inline li { float:left; padding-right:7px; }
    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; }
    2624form .aligned table p { margin-left:0; padding-left:0; }
    … … form .aligned p.help { padding-left:38px; }  
    2826.aligned .vCheckboxLabel { float:none !important; display:inline; padding-left:4px; }
    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 */
    3332.wide label { width:15em !important; }
    … … fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Cou  
    6059.module table .vPositiveSmallIntegerField { width:2.2em; }
    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;}
    6969.inline-related h3 {margin: 0; color:#666; padding:3px 5px; font-size:11px; background:#e1e1e1 url(../img/admin/nav-bg.gif) top left repeat-x; border-bottom:1px solid #ddd;}

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

    diff --git a/django/contrib/admin/media/css/rtl.css b/django/contrib/admin/media/css/rtl.css
index 900ddbd..91053fa 100644
    a b div.breadcrumbs { text-align:right; }  
    3838.vDateField, .vTimeField { margin-left:2px; }
    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 */
    4344.calendarnav-previous { top:0; left:auto; right:0; }

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

    diff --git a/django/contrib/admin/media/css/widgets.css b/django/contrib/admin/media/css/widgets.css
index 67d9662..3686d1b 100644
    a b a.selector-clearall { background:url(../img/admin/selector-removeall.gif) left c  
    3333/* DATE AND TIME */
    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
    3938/* FILE UPLOADS */

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

    diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index 26c918c..8ee24b1 100644
    a b  
    55      <div class="form-row{% if line.errors %} errors{% endif %} {% for field in line %}{{ field.field.name }} {% endfor %} ">
    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 }}
    1111          {% else %}
Back to Top