Commit 0bda56b5 authored by webchick's avatar webchick

#874370 by Jeff Burnz, aspilicious, Cliff, mgifford, yoroy, et al: Fixed...

#874370 by Jeff Burnz, aspilicious, Cliff, mgifford, yoroy, et al: Fixed System messages need identifying icons (WCAG 2.0).
parent b1099651
......@@ -80,6 +80,7 @@ function _drupal_maintenance_theme() {
drupal_add_css(drupal_get_path('module', 'system') . '/system.css');
drupal_add_css(drupal_get_path('module', 'system') . '/system-behavior.css');
drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css');
drupal_add_css(drupal_get_path('module', 'system') . '/system-messages.css');
drupal_add_css(drupal_get_path('module', 'system') . '/maintenance.css');
drupal_add_css(drupal_get_path('module', 'system') . '/admin.css');
}
......
......@@ -15,16 +15,6 @@
function dblog_overview() {
$filter = dblog_build_filter_query();
$rows = array();
$icons = array(
WATCHDOG_DEBUG => '',
WATCHDOG_INFO => '',
WATCHDOG_NOTICE => '',
WATCHDOG_WARNING => theme('image', array('path' => 'misc/watchdog-warning.png', 'alt' => t('warning'), 'title' => t('warning'))),
WATCHDOG_ERROR => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('error'), 'title' => t('error'))),
WATCHDOG_CRITICAL => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('critical'), 'title' => t('critical'))),
WATCHDOG_ALERT => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('alert'), 'title' => t('alert'))),
WATCHDOG_EMERGENCY => theme('image', array('path' => 'misc/watchdog-error.png', 'alt' => t('emergency'), 'title' => t('emergency'))),
);
$classes = array(
WATCHDOG_DEBUG => 'dblog-debug',
WATCHDOG_INFO => 'dblog-info',
......@@ -65,7 +55,7 @@ function dblog_overview() {
$rows[] = array('data' =>
array(
// Cells
$icons[$dblog->severity],
array('class' => 'icon'),
t($dblog->type),
format_date($dblog->timestamp, 'short'),
theme('dblog_message', array('event' => $dblog, 'link' => TRUE)),
......
......@@ -46,3 +46,14 @@ tr.dblog-error {
tr.dblog-error .active {
background: #eeb9b9;
}
table#admin-dblog td.icon {
background: no-repeat center;
width: 16px;
}
table#admin-dblog tr.dblog-warning td.icon {
background-image: url(../../misc/message-16-warning.png);
}
table#admin-dblog tr.dblog-error td.icon {
background-image: url(../../misc/message-16-error.png);
}
/* $Id */
div.messages {
background-color: #dfd;
color: #000;
margin-bottom: 0.25em;
padding: 0.25em 0.5em;
background-position: 8px 8px; /* LTR */
background-repeat: no-repeat;
border: 1px solid;
margin: 6px 0;
padding: 10px 10px 10px 50px; /* LTR */
}
.error {
color: #e55;
div.status {
background-image: url(../../misc/message-24-ok.png);
border-color: #be7;
}
div.error,
table tr.error {
background-color: #fcc;
div.status,
.ok {
color: #234600;
}
div.status,
table tr.ok {
background-color: #f8fff0;
}
div.warning {
background-image: url(../../misc/message-24-warning.png);
border-color: #ed5;
}
div.warning,
.warning {
color: #e09010;
color: #840;
}
div.warning,
tr.warning {
background-color: #fcfca7;
table tr.warning {
background-color: #fffce5;
}
.ok {
color: #008000;
div.error {
background-image: url(../../misc/message-24-error.png);
border-color: #ed541d;
}
div.ok,
tr.ok {
background-color: #dfd;
color: #020;
div.error,
.error {
color: #8c2e0b;
}
div.error,
table tr.error {
background-color: #fef5f1;
}
div.error p.error {
color: #333;
}
div.messages ul {
margin: 0 0 0 1em; /* LTR */
padding: 0;
}
div.messages ul li {
list-style-image: none;
}
......@@ -896,21 +896,8 @@ ul.action-links li a {
margin: 0 auto;
}
div.messages {
padding: 1.2em 2em 1em;
margin: 8px 0;
}
div.status, tr.status {
background-color: #c7ffc0;
border: 1px solid #89d47f;
}
div.warning, tr.warning {
background-color: #fcfca7;
border: 1px solid #e1c46b;
}
div.error, tr.error {
background-color: #ffcccc;
border: 1px solid #fb6b6b;
}
/* -------------- Breadcrumbs -------------- */
......
......@@ -290,20 +290,6 @@ span.form-required {
padding: .5em 1em;
}
div.messages {
margin: .75em 0 .75em;
padding: .1em .5em .15em;
}
.messages ul {
margin: 0;
}
.messages li {
margin: 0;
padding: 0 0 0 1.3em; /* LTR */
}
.form-checkboxes,
.form-radios,
.form-checkboxes .form-item,
......@@ -1196,38 +1182,11 @@ tr.taxonomy-term-divider-bottom {
/**
* Generic elements.
*/
div.messages {
background-color: #fff;
border: 1px solid #b8d3e5;
}
.preview {
background-color: #fcfce8;
border: 1px solid #e5e58f;
}
div.status {
background-color: #fff;
border-color: #c7f2c8;
color: #33a333;
}
div.error {
border: 1px solid #d77;
}
div.error,
tr.error {
color: #a30000;
background-color: #FFCCCC;
}
div.warning {
background-color: #ffd;
border: 1px solid #f0c020;
color: #220;
}
.form-item input.error,
.form-item textarea.error {
border: 1px solid #c52020;
......
......@@ -233,35 +233,6 @@ kbd {
text-align: right;
}
/**
* Messages.
*/
div.messages {
padding: 9px;
margin: 0.5em 0 0;
color: #036;
background: #f8fff0;
border-left: 16px solid #be7;
}
div.warning {
color: #840;
background: #fffce5;
border-left: 16px solid #ed5;
}
div.error {
color: #8c2e0b;
background: #fef5f1;
border-left: 16px solid #ed541d;
}
div.error p.error {
color: #333;
}
div.status {
color: #234600;
background: #f8fff0;
border-left: 16px solid #be7;
}
/**
* Page title.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment