Changeset 8240

Timestamp:

08/08/08 14:54:34 (4 months ago)

Author:

brosner

Message:

Fixed #8163 -- Restore oldforms admin styling on input fields. Also cleaned up some styles for both tabular and stacked inlines. Thanks Nathan Borror for the patch.

Files:

• django/trunk/django/contrib/admin/media/css/forms.css (modified) (1 diff)
• django/trunk/django/contrib/admin/media/css/global.css (modified) (1 diff)
• django/trunk/django/contrib/admin/options.py (modified) (2 diffs)
• django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html (modified) (1 diff)
• django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html (modified) (2 diffs)
• django/trunk/django/contrib/admin/widgets.py (modified) (1 diff)

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

@@ -59 +59 @@
-.flatpages-flatpage #id_content { height:40.2em; }
-.module table .vPositiveSmallIntegerField { width:2.2em; }
+.vTextField { width:20em; }
+.vIntegerField { width:5em; }
-
-/* x unsorted */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-.inline-related.tabular fieldset.module table {width:100%;}
+.last-related fieldset {border: none;}
-
-.inline-group .tabular tr.has_original td {padding-top:2em;}

django/trunk/django/contrib/admin/media/css/global.css

@@ -98 +98 @@
-.module ul, .module ol { margin-left:1.5em; }
-.module h3 { margin-top:.6em; }
-
+, .inline-group h2
-.module table { border-collapse: collapse; }
-

django/trunk/django/contrib/admin/options.py

@@ -146 +146 @@
-                    }
-                )
+                return db_field.formfield(**kwargs)
-            else:
-                # Otherwise, use the default select widget.
@@ -165 +166 @@
-            kwargs['widget'] = widgets.AdminTimeWidget
-            return db_field.formfield(**kwargs)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        # For FileFields and ImageFields add a link to the current file.
-        if isinstance(db_field, models.ImageField) or isinstance(db_field, models.FileField):

django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -1 +1 @@
-{% load i18n %}
-<div class="inline-group">
+  <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }}</h2>
-{{ inline_admin_formset.formset.management_form }}
-{# <h3 class="header">{{ inline_admin_formset.opts.verbose_name_plural|title }}</h3> #}
-{{ inline_admin_formset.formset.non_form_errors }}
-
-{% for inline_admin_form in inline_admin_formset %}
-<div class="inline-related {% if forloop.last %}last-related{% endif %}">
-2
+3
-    {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
-  </h2
+</h3
-  {% if inline_admin_form.show_url %}
-  <p><a href="/r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">View on site</a></p>

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

@@ -20 +20 @@
-        <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">
-
-
+
+
-          {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
-          {% if inline_admin_form.show_url %}<a href="/r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">View on site</a>{% endif %}
@@ -47 +48 @@
-        {% endfor %}
-                
-
+
+
+
-        
-        </tr>

django/trunk/django/contrib/admin/widgets.py

@@ -209 +209 @@
-    def id_for_label(self, id_):
-        return self.widget.id_for_label(id_)
+
+class AdminTextareaWidget(forms.Textarea):
+    def __init__(self, attrs={}):
+        super(AdminTextareaWidget, self).__init__(attrs={'class': 'vLargeTextField'})
+
+class AdminTextInputWidget(forms.TextInput):
+    def __init__(self, attrs={}):
+        super(AdminTextInputWidget, self).__init__(attrs={'class': 'vTextField'})
+
+class AdminURLFieldWidget(forms.TextInput):
+    def __init__(self, attrs={}):
+        super(AdminURLFieldWidget, self).__init__(attrs={'class': 'vURLField'})
+
+class AdminIntegerFieldWidget(forms.TextInput):
+    def __init__(self, attrs={}):
+        super(AdminIntegerFieldWidget, self).__init__(attrs={'class': 'vIntegerField'})