From 41fd53634a143c33074566ced18a77442c11a832 Mon Sep 17 00:00:00 2001
From: duergner <duergner>
Date: Sat, 16 Aug 2003 17:30:20 +0000
Subject: [PATCH] Some errors concerning translation and css cleared

---
 lam/help/extFileExample.php |  6 +++---
 lam/help/help.inc           |  4 ----
 lam/lib/status.inc          | 12 ++++++------
 lam/templates/help.php      |  3 ++-
 lam/templates/login.php     | 17 ++++++++---------
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/lam/help/extFileExample.php b/lam/help/extFileExample.php
index b6b82ff0..fece4d7d 100644
--- a/lam/help/extFileExample.php
+++ b/lam/help/extFileExample.php
@@ -23,6 +23,6 @@ $Id$
   LDAP Account Manager example file for external help pages.
 */
 ?>
-<h1 class="help"><?php echo _("Hilfetest 3") ?></h1>
-<p class="help"><?php echo _("blablabla 3") ?></p>
-<p class="help"><?php echo _("See also: <a href=\"./help.php?HelpNumber=101\" target=\"_self\">101</a>") ?></p>
\ No newline at end of file
+<h1 class="help"><?php echo "Help test"; ?></h1>
+<p class="help"><?php echo "Some text descibing the error"; ?></p>
+<p class="help"><?php echo "Optionalle some links to referring help topics"; ?></p>
diff --git a/lam/help/help.inc b/lam/help/help.inc
index d29500be..a9905bb1 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -27,10 +27,6 @@ $Id$
 $helpArray = array (
 				// 0 - 99
 				// any developer
-				// for testing purposes
-				"0" => array ("ext" => "FALSE", "Headline" => _("Hilfetest 1"), "Text" => _("blablabla 1"), "SeeAlso" => "<a href=\"./help.php?HelpNumber=02\" target=\"_self\">02</a>"),
-				"02" => array ("ext" => "FALSE", "Headline" => _("Hilfetest 2"), "Text" => _("blablabla 2"), "SeeAlso" => ""),
-				"03" => array ("ext" => "TRUE", "Link" => "extFileExample.php"),
 				// 200 - 299
 				// Roland Gruber
 				// configuration wizard
diff --git a/lam/lib/status.inc b/lam/lib/status.inc
index c0ba2544..c122c946 100644
--- a/lam/lib/status.inc
+++ b/lam/lib/status.inc
@@ -28,26 +28,26 @@ function StatusMessage($MessageTyp, $MessageHeadline, $MessageText)
 	/* Setting CSS-StyleSheet class depending on the $MessageTyp and rewriting $MessageTyp with a readable string. */
 	if($MessageTyp == "INFO")
 	{
-		$class = "class=\"status_info\"";
+		$class = "class=\"statusInfo\"";
 		$MessageTyp = _("Information");
 	}
 	elseif($MessageTyp == "WARN")
 	{
-		$class = "class=\"status_warn\"";
+		$class = "class=\"statusWarn\"";
 		$MessageTyp = _("Warning");
 	}
 	elseif($MessageTyp == "ERROR")
 	{
-		$class = "class=\"status_error\"";
+		$class = "class=\"statusError\"";
 		$MessageTyp = _("Error");
 	}
 	/* Set output-message, when none or false $MessageTyp is submitted. */
 	else
 	{
-		$class = "class=\"status_error\"";
+		$class = "class=\"statusError\"";
 		$MessageTyp = _("LAM Internal Error");
-		$MessageHeadline = _("Invalid/Missing Message Typ");
-		$MessageText = _("Please report this error to the Bug-Tracker at {link=http://lam.sf.net}LDAP Account Manager Development Team{endlink}. The error number is {bold}0001:Invalid/Missing Message Typ.{endbold} Thank you.");
+		$MessageHeadline = _("Invalid/Missing Message type");
+		$MessageText = _("Please report this error to the Bug-Tracker at {link=http://lam.sf.net}LDAP Account Manager Development Team{endlink}. The error number is {bold}0001:Invalid/Missing Message type.{endbold} Thank you.");
 	}
 
 	$MessageHeadline = parseMessageString($MessageHeadline);
diff --git a/lam/templates/help.php b/lam/templates/help.php
index f1acd253..33403d48 100644
--- a/lam/templates/help.php
+++ b/lam/templates/help.php
@@ -70,7 +70,8 @@ function displayHelp($helpNumber)
 	/* If submitted help number is not in help/help.inc print error message */
 	elseif(!array_key_exists($helpNumber,$helpArray))
 	{
-		$errorMessage = _("Sorry this help number ({bold}" . $helpNumber . "{endbold}) is not available.");
+		$reference = "({bold}" . $helpNumber . "{endbold})";
+		$errorMessage = _("Sorry this help number $reference is not available.");
 		echoHTMLHead();
 		statusMessage("ERROR","",$errorMessage);
 		echoHTMLFoot();
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 1859af53..f81b4382 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -98,7 +98,7 @@ function display_LoginPage($config_object,$profile)
 		</table>
 		<hr><br><br>
 		<p align="center">
-			<b><?php echo _("Enter Username and Password for Account:"); ?></b>
+			<b><?php echo _("Enter Username and Password for Account") . ":"; ?></b>
 		</p>
 		<?php
 		if($error_message != "") {
@@ -117,7 +117,7 @@ function display_LoginPage($config_object,$profile)
 				<tr>
 					<td width="45%" align="right">
 						<?php
-						echo _("Username:");
+						echo _("Username") . ":";
 						?>
 					</td>
 					<td width="10%">
@@ -139,7 +139,7 @@ function display_LoginPage($config_object,$profile)
 				<tr>
 					<td width="45%" align="right">
 						<?php
-						echo _("Password:");
+						echo _("Password") . ":";
 						?>
 					</td>
 					<td width="10%">
@@ -156,7 +156,7 @@ function display_LoginPage($config_object,$profile)
 					<?php
 						echo $message;
 					?>
-						<input type=\"hidden\" name=\"language\" value=\"english\">
+						<input type="hidden" name="language" value="english">
 					</td>
 					<?php
 				}
@@ -165,7 +165,7 @@ function display_LoginPage($config_object,$profile)
 					?>
 					<td width="45%" align="right">
 						<?php
-						echo _("Your Language:");
+						echo _("Your Language") . ":";
 						?>
 					</td>
 					<td width="10%">
@@ -204,7 +204,7 @@ function display_LoginPage($config_object,$profile)
 				<tr>
 					<td width="100%" align="center">
 						<?php
-						echo _("You are connecting to ServerURL: ");
+						echo _("You are connecting to ServerURL") . ": ";
 						?>
 						<b><?php echo $config_object->get_ServerURL(); ?></b>
 					</td>
@@ -216,7 +216,7 @@ function display_LoginPage($config_object,$profile)
 			<input type="hidden" name="action" value="profileChange">
 			<p align="center">
 				<?php
-				echo _("You are currently using Profile: ");
+				echo _("You are currently using Profile") . ": ";
 				if(!$_POST['profile']) {
 					$_POST['profile'] = $profile;
 				}
@@ -290,9 +290,8 @@ else
 
 	$default_Config = new CfgMain();
 	$default_Profile = $default_Config->default;
-	//echo "default_Profile=" . $default_Profile . "<br>";
 	$_SESSION["config"] = new Config($default_Profile); // Create new Config object
 
 	display_LoginPage($_SESSION["config"],$default_Profile); // Load Login page
 }
-?>
\ No newline at end of file
+?>