diff options
| author | Luke Plant <L.Plant.98@cantab.net> | 2010-06-23 13:20:38 +0000 |
|---|---|---|
| committer | Luke Plant <L.Plant.98@cantab.net> | 2010-06-23 13:20:38 +0000 |
| commit | 71cecc49525263494a19e37788124e3275323745 (patch) | |
| tree | a376bfb412fe137d30680f306dcf5d352bf5d5ad | |
| parent | 8f5236fa359d91acbd67993b76b83ce0cff158f2 (diff) | |
[1.2.X] Fixed #12803 - Added styling for 'error' and 'warning' messages in admin.
Thanks to bboli and sebastian_noack for the report, DrMeers for the patch.
Backport of [13393] from trunk. Considered a bug (and therefore backported)
due to error and warning messages being styled with green tick previously.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/media/css/base.css | 8 | ||||
| -rw-r--r-- | django/contrib/admin/templates/admin/base.html | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/django/contrib/admin/media/css/base.css b/django/contrib/admin/media/css/base.css index da502f357a..645f1725b5 100644 --- a/django/contrib/admin/media/css/base.css +++ b/django/contrib/admin/media/css/base.css @@ -445,6 +445,14 @@ ul.messagelist li { background: #ffc url(../img/admin/icon_success.gif) 5px .3em no-repeat; } +ul.messagelist li.warning{ + background-image: url(../img/admin/icon_alert.gif); +} + +ul.messagelist li.error{ + background-image: url(../img/admin/icon_error.gif); +} + .errornote { font-size: 12px !important; display: block; diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 3fd9eb3770..4221e2d1a7 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -56,7 +56,9 @@ {% endif %} {% if messages %} - <ul class="messagelist">{% for message in messages %}<li>{{ message }}</li>{% endfor %}</ul> + <ul class="messagelist">{% for message in messages %} + <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li> + {% endfor %}</ul> {% endif %} <!-- Content --> |