innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #13782 -- Added CSS for errors in textareas and multiple fields in one line. Thanks, julien. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-12-21 15:07:09 +00:00
parent b224b05304
commit 75f16982d8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/admin/helpers.py
View File

@ -127,6 +127,9 @@ class AdminField(object):
attrs = classes and {'class': u' '.join(classes)} or {} attrs = classes and {'class': u' '.join(classes)} or {}
return self.field.label_tag(contents=contents, attrs=attrs) return self.field.label_tag(contents=contents, attrs=attrs)
def errors(self):
return mark_safe(self.field.errors.as_ul())
class AdminReadonlyField(object): class AdminReadonlyField(object):
def __init__(self, form, field, is_first, model_admin=None): def __init__(self, form, field, is_first, model_admin=None):
label = label_for_field(field, form._meta.model, model_admin) label = label_for_field(field, form._meta.model, model_admin)

2
django/contrib/admin/media/css/base.css
View File

@ -509,7 +509,7 @@ td ul.errorlist li {
background: #ffc; background: #ffc;
} }
.errors input, .errors select { .errors input, .errors select, .errors textarea {
border: 1px solid red; border: 1px solid red;
} }

7
django/contrib/admin/templates/admin/includes/fieldset.html
View File

@ -4,10 +4,11 @@
<div class="description">{{ fieldset.description|safe }}</div> <div class="description">{{ fieldset.description|safe }}</div>
{% endif %} {% endif %}
{% for line in fieldset %} {% for line in fieldset %}
<div class="form-row{% if line.errors %} errors{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %}"> <div class="form-row{% if line.fields|length_is:'1' and line.errors %} errors{% endif %}{% for field in line %} {{ field.field.name }}{% endfor %}">
{{ line.errors }} {% if line.fields|length_is:'1' %}{{ line.errors }}{% endif %}
{% for field in line %} {% 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 %} {% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }} {{ field.field }}{{ field.label_tag }}
{% else %} {% else %}