Message styles moved to theme css.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 42bdaaee593eb5ca0630ecd0ac30ba629d2d4b4d..b796f44efb89a67a7b3fd69c86b6d0896299f591 100644 (file)
--- 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 8972a9eb4b2fbe0de4fe348528acfd8153ffb2b8..d5f7b4a097be3f038af28e29a87b8c8994d58bcd 100644 (file)
--- 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 <div>
 // 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 .= "<tr><td  " . ($center?"align='center' ":"").
-                 " width='100%' bgcolor='{$c['bg']}'><font color='{$c['txt']}'>"
-                 .$str."</font></td></tr>";
-       }
-
-       $str = "<center><table border='1' cellpadding='3' cellspacing='0' style='border-collapse: collapse' bordercolor='{$c['bd']}' width='98%'>"
-         . $content . "</table></center><br>\n";       
-               
+               $content .= "<div class='$class'>$str</div><br>";
+       }               
   }
-     else
-        $str = '';
-       
-    return $str;
+  return $content;
 }
 //-----------------------------------------------------------------------------
 // Error box <div> element.

diff --git a/themes/aqua/default.css b/themes/aqua/default.css
index 702a19b78e0d5a23a2ec174118451726375ad9ba..f26ff382606965deb4806c9185a3eff85b2a6ad1 100644 (file)
--- 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 84a99174659c55ecec98bb197d579ed4e9757f40..6a55770267d528a9af4ada232f712f83134ce37a 100644 (file)
--- 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 12f8cf9e8a51a2c7bd8a447e6fd8fb0c4b7d21b4..4b71231f363bd810b236942e742ff2b855cac426 100644 (file)
--- 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;
+}