From d9cb8b17823edab3842cc7084598d53eb40fa0ad Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Wed, 29 Apr 2009 21:42:17 +0000 Subject: [PATCH] Message styles moved to theme css. --- CHANGELOG.txt | 11 +++++++++-- includes/errors.inc | 35 ++++++++++++----------------------- themes/aqua/default.css | 20 ++++++++++++++++++++ themes/cool/default.css | 20 ++++++++++++++++++++ themes/default/default.css | 28 ++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 42bdaaee..b796f44e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,13 @@ Legend: ! -> Note $ -> Affected files +29-Apr-2009 Janusz Dobrowolski +! Messages styles moved default.css +$ /includes/errors.inc + /themes/aqua/default.css + /themes/cool/default.css + /themes/default/default.css + 28-Apr-2009 Joe Hunt ! Changed so the close of fiscal years also closes the balances and brings forward retained earnings. $ /admin/gl_setup.ph @@ -28,11 +35,11 @@ $ /admin/gl_setup.ph /sql/en_US-demo.sql /sql/alter2.2.sql -25_Apr-2009 Janusz Dobrowolski +25-Apr-2009 Janusz Dobrowolski # Fixed ambigous sql $ /inventory/manage/item_categories.php -25_Apr-2009 Joe Hunt +25-Apr-2009 Joe Hunt ! Removed obsolete field 'included_in_price' from table 'Tax_group_items' in en_US-demo.sql. $ /sql/en_US-demo.sql /sql/alter2.2.sql diff --git a/includes/errors.inc b/includes/errors.inc index 8972a9eb..d5f7b4a0 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -12,11 +12,6 @@ $messages = array(); // container for system messages $before_box = ''; // temporary container for output html data before error box -$msg_colors = array( - E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), - E_USER_WARNING => array('bg'=>'#ffff00', 'txt'=>'#ff5500', 'bd'=>'#ff9900'), - E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00')); - //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // display in message box. @@ -33,13 +28,17 @@ function error_handler($errno, $errstr, $file, $line) { //------------------------------------------------------------------------------ // Formats system messages before insert them into message
// FIX center is unused now -function fmt_errors($center=true) { - global $messages, $msg_colors; +function fmt_errors($center=false) { + global $messages; + $msg_class = array( + E_USER_ERROR => 'err_msg', + E_USER_WARNING =>'warn_msg', + E_USER_NOTICE => 'note_msg'); + $type = E_USER_NOTICE; - + $content = ''; if (count($messages)) { - $content = ''; foreach($messages as $msg) { if ($msg[0]>$type) continue; @@ -54,23 +53,13 @@ function fmt_errors($center=true) { } } $str = $msg[1]; - $c = $msg_colors[$type]; + $class = $msg_class[$type]; if ($msg[0] < E_USER_ERROR && $msg[2] != null) $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3]; - - $content .= "" - .$str.""; - } - - $str = "
" - . $content . "

\n"; - + $content .= "
$str

"; + } } - else - $str = ''; - - return $str; + return $content; } //----------------------------------------------------------------------------- // Error box
element. diff --git a/themes/aqua/default.css b/themes/aqua/default.css index 702a19b7..f26ff382 100644 --- a/themes/aqua/default.css +++ b/themes/aqua/default.css @@ -567,3 +567,23 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ background-color: #ddd; border: 1px solid #FFF; } + +div.warn_msg { + padding: 3px; + border: 1px solid #ff9900; + background-color: #ffff00; + color: #ff5500; + text-align: center; +} + +div.note_msg { + padding: 3px; + border: 1px solid #33cc00; + background-color: #ccffcc; + color: #007700; + text-align: center; +} + +#msgbox { + margin: 10px; +} diff --git a/themes/cool/default.css b/themes/cool/default.css index 84a99174..6a557702 100644 --- a/themes/cool/default.css +++ b/themes/cool/default.css @@ -573,3 +573,23 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ background-color: #ddd; border: 1px solid #FFF; } + +div.warn_msg { + padding: 3px; + border: 1px solid #ff9900; + background-color: #ffff00; + color: #ff5500; + text-align: center; +} + +div.note_msg { + padding: 3px; + border: 1px solid #33cc00; + background-color: #ccffcc; + color: #007700; + text-align: center; +} + +#msgbox { + margin: 10px; +} diff --git a/themes/default/default.css b/themes/default/default.css index 12f8cf9e..4b71231f 100644 --- a/themes/default/default.css +++ b/themes/default/default.css @@ -568,3 +568,31 @@ ul.ajaxtabs li input.current, ul.ajaxtabs li input.current:hover{ background-color: #ddd; border: 1px solid #FFF; } + +div.err_msg { + padding: 3px; + border: 1px solid #cc3300; + background-color: #ffcccc; + color: #dd2200; + text-align: center; +} + +div.warn_msg { + padding: 3px; + border: 1px solid #ff9900; + background-color: #ffff00; + color: #ff5500; + text-align: center; +} + +div.note_msg { + padding: 3px; + border: 1px solid #33cc00; + background-color: #ccffcc; + color: #007700; + text-align: center; +} + +#msgbox { + margin: 10px; +} -- 2.30.2