rebase, new flags

8 files changed, 20 insertions, 3 deletions

diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index d87fc2f9..b285c40d 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,6 +4,7 @@
 }
 
 body {
+	font-size: 14px;
 }
 
 header {
@@ -13,6 +14,7 @@ header {
 
 footer {
 	display: block;
+	font-size: 12px;
 	text-align: center;
 	width: 100%;
 }
@@ -41,6 +43,10 @@ dt {
 	font-weight: bold;
 }
 
+dd {
+	margin-left: 20px;
+}
+
 h4 {
 	padding: 0 4px;
 }
@@ -48,3 +54,7 @@ h4 {
 ul {
 	margin: 0 0 0 20px;
 }
+
+a.sprache img {
+	margin: 5px;
+}
diff --git a/www-ssl/css/style10.css b/www-ssl/css/style10.css
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/www-ssl/css/style10.css
diff --git a/www-ssl/faq.php b/www-ssl/faq.php
index 472915e5..8a7b3ede 100644
--- a/www-ssl/faq.php
+++ b/www-ssl/faq.php
@@ -13,9 +13,16 @@ $Zeilen = mysql_num_rows($Erg);
 
 for ($n = 0; $n < $Zeilen; $n++) {
 	if (mysql_result($Erg, $n, "Antwort") != "") {
+		list ($frage_de, $frage_en) = split('<br />', mysql_result($Erg, $n, "Frage"));
+		list ($antwort_de, $antwort_en) = split('<br />', mysql_result($Erg, $n, "Antwort"));
 		echo "<dl>";
-		echo "<dt>" . mysql_result($Erg, $n, "Frage") . "</dt>";
-		echo "<dd>" . mysql_result($Erg, $n, "Antwort") . "</dd>";
+		if ($_SESSION['Sprache'] == "DE") {
+			echo "<dt>" . $frage_de . "</dt>";
+			echo "<dd>" . $antwort_de . "</dd>";
+		} else {
+			echo "<dt>" . $frage_en . "</dt>";
+			echo "<dd>" . $antwort_en . "</dd>";
+		}
 		echo "</dl>";
 	}
 }
diff --git a/www-ssl/nonpublic/index.php b/www-ssl/nonpublic/index.php
index add0fdd3..b53f8088 100644
--- a/www-ssl/nonpublic/index.php
+++ b/www-ssl/nonpublic/index.php
@@ -10,7 +10,7 @@ include ("includes/crypt.php");
 session_start(); // alte Session - falls vorhanden - wiederherstellen...
 
 function LoginOK() {
-	include ("../../config/config.php");
+	include ("config/config.php");
 	header("HTTP/1.1 302 Moved Temporarily");
 	header("Location: " . $url . $ENGEL_ROOT . "nonpublic/news.php");
 }
diff --git a/www-ssl/pic/flag/de.gif b/www-ssl/pic/flag/de.gif
deleted file mode 100644
index 15739e2e..00000000
--- a/www-ssl/pic/flag/de.gif
+++ /dev/null
diff --git a/www-ssl/pic/flag/de.png b/www-ssl/pic/flag/de.png
new file mode 100644
index 00000000..ac4a9773
--- /dev/null
+++ b/www-ssl/pic/flag/de.png
diff --git a/www-ssl/pic/flag/en.gif b/www-ssl/pic/flag/en.gif
deleted file mode 100644
index 34936ee3..00000000
--- a/www-ssl/pic/flag/en.gif
+++ /dev/null
diff --git a/www-ssl/pic/flag/en.png b/www-ssl/pic/flag/en.png
new file mode 100644
index 00000000..ff701e19
--- /dev/null
+++ b/www-ssl/pic/flag/en.png