Author: jezdez
Date: 2010-12-21 09:07:09 -0600 (Tue, 21 Dec 2010)
New Revision: 14999
Modified:
django/trunk/django/contrib/admin/helpers.py
django/trunk/django/contrib/admin/media/css/base.css
django/trunk/django/contrib/admin/templates/admin/includes/fieldset.html
Log:
Fixed #13782 -- Added CSS for errors in textareas and multiple fields in one
line. Thanks, julien.
Modified: django/trunk/django/contrib/admin/helpers.py
===================================================================
--- django/trunk/django/contrib/admin/helpers.py 2010-12-21 14:57:57 UTC
(rev 14998)
+++ django/trunk/django/contrib/admin/helpers.py 2010-12-21 15:07:09 UTC
(rev 14999)
@@ -127,6 +127,9 @@
attrs = classes and {'class': u' '.join(classes)} or {}
return self.field.label_tag(contents=contents, attrs=attrs)
+ def errors(self):
+ return mark_safe(self.field.errors.as_ul())
+
class AdminReadonlyField(object):
def __init__(self, form, field, is_first, model_admin=None):
label = label_for_field(field, form._meta.model, model_admin)
Modified: django/trunk/django/contrib/admin/media/css/base.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/base.css 2010-12-21
14:57:57 UTC (rev 14998)
+++ django/trunk/django/contrib/admin/media/css/base.css 2010-12-21
15:07:09 UTC (rev 14999)
@@ -509,7 +509,7 @@
background: #ffc;
}
-.errors input, .errors select {
+.errors input, .errors select, .errors textarea {
border: 1px solid red;
}
Modified:
django/trunk/django/contrib/admin/templates/admin/includes/fieldset.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/includes/fieldset.html
2010-12-21 14:57:57 UTC (rev 14998)
+++ django/trunk/django/contrib/admin/templates/admin/includes/fieldset.html
2010-12-21 15:07:09 UTC (rev 14999)
@@ -4,10 +4,11 @@
<div class="description">{{ fieldset.description|safe }}</div>
{% endif %}
{% for line in fieldset %}
- <div class="form-row{% if line.errors %} errors{% endif %}{% for field
in line %} {{ field.field.name }}{% endfor %}">
- {{ line.errors }}
+ <div class="form-row{% if line.fields|length_is:'1' and line.errors %}
errors{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %}">
+ {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
{% for field in line %}
- <div{% if not line.fields|length_is:"1" %} class="field-box"{%
endif %}>
+ <div{% if not line.fields|length_is:'1' %} class="field-box{%
if not field.is_readonly and field.errors %} errors{% endif %}"{% endif %}>
+ {% if not line.fields|length_is:'1' and not
field.is_readonly %}{{ field.errors }}{% endif %}
{% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }}
{% else %}
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
