Ticket #2612: admin_inlines.diff

media/css/global.css

@@ -46 +46 @@
 .quiet, a.quiet:link, a.quiet:visited { color:#999 !important;font-weight:normal !important; }
 .quiet strong { font-weight:bold !important; }
 .float-right { float:right; }
-.float-left { float:left; }
+.float-left { float:left; margin-right: 20px; }
 .clear { clear:both; }
 .align-left { text-align:left; }
 .align-right { text-align:right; }
@@ -139 +139 @@
 
 /* OBJECT HISTORY */
 table#change-history { width:100%; }
-table#change-history tbody th { width:16em; }
+table#change-history tbody th { width:16em; }
+ No newline at end of file

media/css/forms.css

@@ -9 +9 @@
 /* FORM LABELS */
 form h4 { margin:0 !important; padding:0 !important; border:none !important; }
 label { font-weight:normal !important; color:#666; font-size:12px; }
-label.inline { margin-left:20px; }
 .required label, label.required { font-weight:bold !important; color:#333 !important; }
 
 /* RADIO BUTTONS */
@@ -19 +18 @@
 form ul.inline li { float:left; padding-right:7px; }
 
 /* ALIGNED FIELDSETS */
-.aligned label { display:block; padding:0 1em 3px 0; float:left; width:8em; }
-.aligned label.inline { display:inline; float:none; }
+.aligned label { display:block; padding:3px 10px 0 0; float:left; width:8em; }
 .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; }
@@ -60 +58 @@
 .module table .vPositiveSmallIntegerField { width:2.2em; }
 .vTextField { width:20em; }
 .vIntegerField { width:5em; }
+.vForeignKeyRawIdAdminField { width: 5em; }
 
-/* x unsorted */
+/* INLINES */
 .inline-group {padding:0; border:1px solid #ccc; margin:10px 0;}
-.inline-group .aligned label { width: 7em; }
+.inline-group .aligned label { width: 8em; }
 
 .inline-related {position:relative;}
 .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;}

media/css/widgets.css

@@ -33 +33 @@
 /* DATE AND TIME */
 p.datetime { line-height:20px; margin:0; padding:0; color:#666; font-size:11px; font-weight:bold; }
 .datetime span { font-size:11px; color:#ccc; font-weight:normal; white-space:nowrap; }
-.vDateField { margin-left:4px; }
 table p.datetime { font-size:10px; margin-left:0; padding-left:0; }
 
 /* FILE UPLOADS */

templates/admin/includes/fieldset.html

@@ -5 +5 @@
       <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">
+      <div{% if not line.fields|length_is:"1" %} class="float-left"{% endif %}>
           {% if field.is_checkbox %}
               {{ field.field }}{{ field.label_tag }}
           {% else %}