#874370 by Jeff Burnz, aspilicious, Cliff, mgifford, yoroy, et al: Fixed System messages need identifying icons (WCAG 2.0).

3 files changed, 55 insertions, 35 deletions

diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc
index bc09b5f8f..fad50ef34 100644
--- a/modules/dblog/dblog.admin.inc
+++ b/modules/dblog/dblog.admin.inc
@@ -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)),
diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
index ce3e3608c..1b7e8352c 100644
--- a/modules/dblog/dblog.css
+++ b/modules/dblog/dblog.css
@@ -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);
+}
+
diff --git a/modules/system/system-messages.css b/modules/system/system-messages.css
index 0fe890a6b..b1a1406ee 100644
--- a/modules/system/system-messages.css
+++ b/modules/system/system-messages.css
@@ -1,36 +1,55 @@
 /* $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;
 }