From c6f1621249a53faada39629a9ba958a6a5837262 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Thu, 30 Apr 2009 09:23:20 +0000 Subject: [PATCH] Small layout fixes. --- CHANGELOG.txt | 7 +++++++ includes/errors.inc | 15 ++++++++++----- themes/aqua/renderer.php | 3 --- themes/cool/renderer.php | 3 --- themes/default/renderer.php | 3 --- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b796f44e..513105be 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,13 @@ Legend: ! -> Note $ -> Affected files +30-Apr-2009 Janusz Dobrowolski +# Small layout fixes +$ /includes/errors.inc + /themes/aqua/renderer.php + /themes/cool/renderer.php + /themes/default/renderer.php + 29-Apr-2009 Janusz Dobrowolski ! Messages styles moved default.css $ /includes/errors.inc diff --git a/includes/errors.inc b/includes/errors.inc index d5f7b4a0..160d41e5 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -29,7 +29,7 @@ function error_handler($errno, $errstr, $file, $line) { // Formats system messages before insert them into message
// FIX center is unused now function fmt_errors($center=false) { - global $messages; + global $messages, $path_to_root; $msg_class = array( E_USER_ERROR => 'err_msg', @@ -38,8 +38,9 @@ function fmt_errors($center=false) { $type = E_USER_NOTICE; $content = ''; + $class = 'no_msg'; if (count($messages)) { - foreach($messages as $msg) { + foreach($messages as $cnt=>$msg) { if ($msg[0]>$type) continue; if ($msg[0]<$type) { @@ -53,12 +54,16 @@ function fmt_errors($center=false) { } } $str = $msg[1]; - $class = $msg_class[$type]; if ($msg[0] < E_USER_ERROR && $msg[2] != null) $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3]; - $content .= "
$str

"; + $content .= ($cnt ? '
' : '').$str; } - } + $class = $msg_class[$type]; + } else + if ($path_to_root=='.') + return ''; + + $content = "
$content
"; return $content; } //----------------------------------------------------------------------------- diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php index 87532dcb..87fd53d6 100644 --- a/themes/aqua/renderer.php +++ b/themes/aqua/renderer.php @@ -83,9 +83,6 @@ .""; } - if (!$is_index) - echo "
"; - } function menu_footer($no_menu, $is_index) diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php index f98e6d16..0d302700 100644 --- a/themes/cool/renderer.php +++ b/themes/cool/renderer.php @@ -83,9 +83,6 @@ .""; } - if (!$is_index) - echo "
"; - } function menu_footer($no_menu, $is_index) diff --git a/themes/default/renderer.php b/themes/default/renderer.php index 6c4db65c..5233839d 100644 --- a/themes/default/renderer.php +++ b/themes/default/renderer.php @@ -84,9 +84,6 @@ .""; } - if (!$is_index) - echo "
"; - } function menu_footer($no_menu, $is_index) -- 2.30.2