diff --git a/lam/graphics/error.png b/lam/graphics/error.png
index 1de7a6fd..74bea69e 100644
Binary files a/lam/graphics/error.png and b/lam/graphics/error.png differ
diff --git a/lam/graphics/info.png b/lam/graphics/info.png
index 96642db7..68733266 100644
Binary files a/lam/graphics/info.png and b/lam/graphics/info.png differ
diff --git a/lam/graphics/warn.png b/lam/graphics/warn.png
index d83f3491..2f0c0fa9 100644
Binary files a/lam/graphics/warn.png and b/lam/graphics/warn.png differ
diff --git a/lam/lib/status.inc b/lam/lib/status.inc
index 9892c30f..31ea61da 100644
--- a/lam/lib/status.inc
+++ b/lam/lib/status.inc
@@ -4,7 +4,7 @@ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Michael Duergner
- 2011 Roland Gruber
+ 2011 - 2013 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -73,14 +73,16 @@ function StatusMessage($MessageTyp,$MessageHeadline,$MessageText='',$MessageVari
$MessageText = parseMessageString($MessageText);
if (is_file("../graphics/error.png")) {
- $MessageTyp = " ";
+ $MessageTyp = " ";
}
else {
- $MessageTyp = " ";
+ $MessageTyp = " ";
}
- $MessageHeadline = "
" . $MessageHeadline . "
"; // Format $MessageHeadline
- $MessageText = "" . $MessageText . "
"; // Format $MessageText
+ $MessageHeadline = "" . $MessageHeadline . "
"; // Format $MessageHeadline
+ if ($MessageText != '') {
+ $MessageText = "" . $MessageText . "
"; // Format $MessageText
+ }
$format = "\n
\n\n" . $MessageTyp . " | \n" . $MessageHeadline . $MessageText . " | \n
\n
\n
\n";
$output = '';
if (is_array($MessageVariables)) {
diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css
index 247f0ba2..b68ad03e 100644
--- a/lam/style/500_layout.css
+++ b/lam/style/500_layout.css
@@ -355,7 +355,7 @@ div.statusInfo {
div.statusWarn {
background-color:#fff2a3;
- border: 1px solid #ffd800;
+ border: 1px solid #f59d00;
}
div.statusError {
@@ -364,41 +364,16 @@ div.statusError {
}
/* H2 (MessageHeadline) font size, family, color, and some more settings for the different Status Messages */
-h2.statusInfo {
- font-size:13pt;
- font-family:Arial,sans-serif;
- margin:5px 5px 5px 15px;
-}
-
-h2.statusWarn {
- font-size:13pt;
- font-family:Arial,sans-serif;
- margin:5px 5px 5px 15px;
-}
-
-h2.statusError {
- font-size:13pt;
- font-family:Arial,sans-serif;
- margin:5px 5px 5px 15px;
+div.statusTitle {
+ font-size: 12pt;
+ font-weight: bold;
+ margin: 3px 3px 3px 15px;
}
/* P (MessageText) font size, family, color, and some more settings for the different Status Messages */
-p.statusInfo {
- font-size:11pt;
- font-family:Times,serif;
- margin:5px 5px 5px 25px;
-}
-
-p.statusWarn {
- font-size:11pt;
- font-family:Times,serif;
- margin:5px 5px 5px 25px;
-}
-
-p.statusError {
- font-size:11pt;
- font-family:Times,serif;
- margin:5px 5px 5px 25px;
+p.statusText {
+ font-size: 10pt;
+ margin: 3px 3px 3px 25px;
}
input.smallImageButton {