Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.606 diff -u -r1.606 theme.inc --- includes/theme.inc 22 Aug 2010 12:46:21 -0000 1.606 +++ includes/theme.inc 2 Sep 2010 14:00:43 -0000 @@ -1321,10 +1321,12 @@ 'error' => t('Error message'), 'warning' => t('Warning message'), ); + foreach (drupal_get_messages($display) as $type => $messages) { - $output .= "
\n"; + $output .= "
\n"; if (!empty($status_heading[$type])) { $output .= '

' . $status_heading[$type] . "

\n"; + $output .= "
\n"; } if (count($messages) > 1) { $output .= "
\n"; } + + if ($output) { + $output = "
\n" . $output . "
\n"; + } + return $output; } Index: includes/theme.maintenance.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v retrieving revision 1.65 diff -u -r1.65 theme.maintenance.inc --- includes/theme.maintenance.inc 22 Aug 2010 12:46:21 -0000 1.65 +++ includes/theme.maintenance.inc 2 Sep 2010 14:00:43 -0000 @@ -80,6 +80,7 @@ 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'); } Index: misc/tabledrag.js =================================================================== RCS file: /cvs/drupal/drupal/misc/tabledrag.js,v retrieving revision 1.41 diff -u -r1.41 tabledrag.js --- misc/tabledrag.js 9 Aug 2010 16:58:15 -0000 1.41 +++ misc/tabledrag.js 2 Sep 2010 14:00:43 -0000 @@ -1167,7 +1167,7 @@ }; Drupal.theme.prototype.tableDragChangedWarning = function () { - return '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('Changes made in this table will not be saved until the form is submitted.') + '
'; + return '
' + Drupal.theme('tableDragChangedMarker') + ' ' + Drupal.t('Changes made in this table will not be saved until the form is submitted.') + '
'; }; })(jQuery); Index: modules/dblog/dblog.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v retrieving revision 1.39 diff -u -r1.39 dblog.admin.inc --- modules/dblog/dblog.admin.inc 24 Apr 2010 14:49:13 -0000 1.39 +++ modules/dblog/dblog.admin.inc 2 Sep 2010 14:00:43 -0000 @@ -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 @@ $rows[] = array('data' => array( // Cells - $icons[$dblog->severity], + array('data' => '
', 'class' => 'icon'), t($dblog->type), format_date($dblog->timestamp, 'short'), theme('dblog_message', array('event' => $dblog, 'link' => TRUE)), Index: modules/dblog/dblog.css =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.css,v retrieving revision 1.9 diff -u -r1.9 dblog.css --- modules/dblog/dblog.css 28 Apr 2010 20:08:38 -0000 1.9 +++ modules/dblog/dblog.css 2 Sep 2010 14:00:43 -0000 @@ -46,3 +46,20 @@ tr.dblog-error .active { background: #eeb9b9; } + +table#admin-dblog td.icon div { + height: 16px; + width: 16px; + margin-left: auto; + margin-right: auto; +} +table#admin-dblog tr.dblog-error td.icon div, +table#admin-dblog tr.dblog-warning td.icon div { + background: url(../../misc/status-16x16.png) no-repeat center; +} +table#admin-dblog tr.dblog-warning td.icon div { + background-position: -16px; +} +table#admin-dblog tr.dblog-error td.icon div { + background-position: -32px; +} Index: modules/file/file.js =================================================================== RCS file: /cvs/drupal/drupal/modules/file/file.js,v retrieving revision 1.4 diff -u -r1.4 file.js --- modules/file/file.js 10 Jul 2010 00:03:37 -0000 1.4 +++ modules/file/file.js 2 Sep 2010 14:00:43 -0000 @@ -69,7 +69,7 @@ '%filename': this.value, '%extensions': accept.replace(/\|/g, ', ') }); - $(this).parents('div.form-managed-file').prepend('
' + error + '
'); + $(this).parents('div.form-managed-file').prepend('
' + error + '
'); this.value = ''; return false; } Index: modules/system/system-messages.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system-messages.css,v retrieving revision 1.3 diff -u -r1.3 system-messages.css --- modules/system/system-messages.css 22 Aug 2010 12:55:04 -0000 1.3 +++ modules/system/system-messages.css 2 Sep 2010 14:00:43 -0000 @@ -1,35 +1,26 @@ /* $Id */ -div.messages { - background-color: #dfd; - color: #000; - margin-bottom: 0.25em; - padding: 0.25em 0.5em; +.messages .group { + position: relative; } - -.error { - color: #e55; +.messages .icon { + background: no-repeat center; + height: 100%; + position: absolute; + top: 0; } - -div.error, -table tr.error { - background-color: #fcc; +.messages p { + margin-top: 0; } -.warning { - color: #e09010; +tr.error { + background-color: #fcc; } -div.warning, tr.warning { background-color: #fcfca7; } -.ok { - color: #008000; -} - -div.ok, tr.ok { background-color: #dfd; color: #020; Index: themes/bartik/css/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v retrieving revision 1.6 diff -u -r1.6 style.css --- themes/bartik/css/style.css 31 Aug 2010 21:05:33 -0000 1.6 +++ themes/bartik/css/style.css 2 Sep 2010 14:00:43 -0000 @@ -886,11 +886,25 @@ #messages { padding: 20px 0 5px; - margin: 0 auto; + color: #000; +} +.messages .group { + padding: 1.2em 2em 1em 4.6em; + margin: 1.6em 0; +} +.messages .icon { + background-image: url(../../../misc/status-24x24.png); + left: 1.4em; + width: 24px; +} +.messages .status .icon { + background-position: 0; +} +.messages .warning .icon { + background-position: -24px; } -div.messages { - padding: 1.2em 2em 1em; - margin: 8px 0; +.messages .error .icon { + background-position: -48px; } div.status, tr.status { background-color: #c7ffc0; Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.84 diff -u -r1.84 style.css --- themes/garland/style.css 28 Jul 2010 01:40:39 -0000 1.84 +++ themes/garland/style.css 2 Sep 2010 14:00:43 -0000 @@ -290,20 +290,6 @@ 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,36 +1182,56 @@ /** * Generic elements. */ -div.messages { - background-color: #fff; - border: 1px solid #b8d3e5; -} - -.preview { - background-color: #fcfce8; - border: 1px solid #e5e58f; +.messages .group { + border: 1px solid; + margin: 6px 0; + padding: 4px 4px 4px 32px; +} +.messages .icon { + background-image: url(../../misc/status-16x16.png); + left: 8px; + width: 16px; } - -div.status { +.messages .status { background-color: #fff; border-color: #c7f2c8; color: #33a333; } +.messages .status .icon { + background-position: 0; +} +.messages .warning { + background-color: #ffd; + border-color: #f0c020; + color: #220; +} +.messages .warning .icon { + background-position: -16px; +} +.messages .error { + background-color: #ffcccc; + border-color: #d77; + color: #a30000; +} +.messages .error .icon { + background-position: -32px; +} +.messages ul { + margin: 0; +} -div.error { - border: 1px solid #d77; +.preview { + background-color: #fcfce8; + border: 1px solid #e5e58f; } -div.error, tr.error { color: #a30000; background-color: #FFCCCC; } -div.warning { - background-color: #ffd; - border: 1px solid #f0c020; - color: #220; +div.error { + background-position: 0.5em center; } .form-item input.error, Index: themes/seven/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/style.css,v retrieving revision 1.66 diff -u -r1.66 style.css --- themes/seven/style.css 1 Sep 2010 03:10:42 -0000 1.66 +++ themes/seven/style.css 2 Sep 2010 14:00:43 -0000 @@ -236,30 +236,40 @@ /** * Messages. */ -div.messages { - padding: 9px; - margin: 0.5em 0 0; - color: #036; - background: #f8fff0; - border-left: 16px solid #be7; +.messages .group { + color: #fff; + margin-bottom: 12px; + padding: 8px 8px 8px 36px; } -div.warning { - color: #840; - background: #fffce5; - border-left: 16px solid #ed5; +.messages .icon { + background-image: url(images/message-icons.png); + left: 10px; + width: 16px; } -div.error { - color: #8c2e0b; - background: #fef5f1; - border-left: 16px solid #ed541d; +.messages .status { + background-color: #348500; } -div.error p.error { - color: #333; +.messages .status .icon { + background-position: 0; +} +.messages .warning { + background-color: #006bff; +} +.messages .warning .icon { + background-position: -16px; +} +.messages .error { + background-color: #d43a00; } -div.status { - color: #234600; - background: #f8fff0; - border-left: 16px solid #be7; +.messages .error .icon { + background-position: -32px; +} +.messages ul { + margin: 0 0 0 16px; +} +.messages a { + color: #fff; + font-weight: bold; } /** @@ -539,7 +549,9 @@ color: #8c2e0b; background-color: #fef5f1; } - +table.tabledrag-processed span.tabledrag-changed { + color: #006bff; +} /** * Fieldsets. @@ -629,6 +641,14 @@ background-color: #eee; color: #777; } +.form-required { + color: #d43a00; +} +.form-item input.error, +.form-item textarea.error, +.form-item select.error { + border: 2px solid #d43a00; +} /* Filter */ .filter-wrapper {