From ac8dbe835e368b9c7d97584c3722206b134db890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Wed, 1 Jun 2011 17:41:49 +0200
Subject: [PATCH] html5, css rewrite

---
 includes/footer.php        | 28 ++-------------
 includes/funktion_flag.php |  4 +--
 includes/header.php        | 26 ++++----------
 www-ssl/css/base.css       | 71 ++++++++++++++++++++++++++++----------
 4 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/includes/footer.php b/includes/footer.php
index 62260e55..8e5b35b9 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,27 +1,7 @@
-<!-- anfang des footers //-->
-    <br />
-      <p align="center">
-        <?php
-if (IsSet ($_SESSION['oldurl']))
-	echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
-?>
-        <a href="#top"><?php echo Get_Text("top"); ?></a>
-      </p>
-    </td>
-  </tr>
-</table>
-</td>
+</article>
+</div>
+</div>
 
-<!-- anfang des menue parts //-->
-<?php
-
-
-if ($_SESSION['Menu'] == "R")
-	include ("menu.php");
-?>
-
-<!-- ende des menue parts //-->
-</table>
 <footer>
 	<p>
 		&copy; copyleft | <a href="mailto:erzengel@lists.ccc.de">Kontakt</a> | <a href="<?php echo $ENGEL_ROOT; ?>credits.php">Credits</a><br />
@@ -30,8 +10,6 @@ if ($_SESSION['Menu'] == "R")
 </footer>
 
 <?php
-
-
 include ("funktion_counter.php");
 mysql_close($con);
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index b394d18a..7e88466d 100644
--- a/includes/funktion_flag.php
+++ b/includes/funktion_flag.php
@@ -4,6 +4,6 @@ if (strpos($_SERVER["REQUEST_URI"], "?") > 0)
 else
 	$URL = $_SERVER["REQUEST_URI"] . "?SetLanguage=";
 
-echo '<a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
-echo '<a class="sprache" href="' . $URL . 'EN"><img src="' . $ENGEL_ROOT . 'pic/flag/en.png" alt="EN" title="English"></a>';
+echo '<p><a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+echo '<a class="sprache" href="' . $URL . 'EN"><img src="' . $ENGEL_ROOT . 'pic/flag/en.png" alt="EN" title="English"></a></p>';
 ?>
diff --git a/includes/header.php b/includes/header.php
index 9fb882bf..750c82fb 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -57,8 +57,8 @@ if (isset ($_SESSION['CVS']["nonpublic/messages.php"])) {
 	}
 }
 ?>
-<table id="body" width="90%" align="center" border="0" cellpadding="7" cellspacing="0">
-  <tr>
+<div id="body">
+<div id="menu">
 <?php
 
 
@@ -68,27 +68,13 @@ if (!isset ($_SESSION['Menu']))
 if ($_SESSION['Menu'] == "L")
 	include ("menu.php");
 ?>
-
-    <td valign="top" align="center">
-<table border="0" width="100%" align="center" class="border" cellpadding="5" cellspacing="1">
-  <tr class="contenttopic">
-    <td>
+</div>
+<div id="content">
 <?php
 
 
-echo "<a name=\"" . $header . "\" class=\"contenttopic\">";
-if (strlen($header) == 0)
-	echo "\n<b>" . Get_Text($Page["Name"]) . "</b></a>\n";
-else
-	echo "\n<b>$header</b></a>\n";
-?>
-    </td>
-  </tr>
-  <tr class="content">
-     <td>
-<br />
-<?php
-
+echo '<h1>' . (strlen($header) == 0 ? Get_Text($Page["Name"]) : $header) . '</h1>';
+echo '<article>';
 
 if (isset ($_SESSION['UID'])) {
 	if (isset ($_SESSION['oldurl']))
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
index b285c40d..27e20788 100644
--- a/www-ssl/css/base.css
+++ b/www-ssl/css/base.css
@@ -4,57 +4,92 @@
 }
 
 body {
-	font-size: 14px;
+    background: #f0f0f0;
+    font-family: Arial;
+    sans-serif;
+    font-size:
+    14px;
 }
 
 header {
-	display: block;
-	width: 100%;
+    display: block;
+    width: 100%;
 }
 
 footer {
-	display: block;
-	font-size: 12px;
-	text-align: center;
-	width: 100%;
+    clear: both;
+    display: block;
+    font-size: 12px;
+    text-align: center;
+    width: 100%;
 }
 
 footer p {
-	margin: 10px auto;
+    margin: 10px auto;
 }
 
 #logo {
     background: url('../pic/himmel.png') top left no-repeat;
     display: block;
-	height: 32px;
-	margin: 10px auto;
+    height: 32px;
+    margin: 10px auto;
     width: 380px;
 }
 
 #body {
-	margin: 0 5%;
+    margin: 0 5%;
+}
+
+#menu {
+    float: left;
+    width: 200px;
+}
+
+#content {
+    margin-left: 200px;
+}
+
+a {
+    color: #000;
 }
 
 td, dt, dd {
-	padding: 4px;
+    padding: 4px;
 }
 
 dt {
-	font-weight: bold;
+    font-weight: bold;
 }
 
 dd {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 
-h4 {
-	padding: 0 4px;
+h1, h4 {
+    font-size: 16px;
+    padding: 0 4px;
 }
 
 ul {
-	margin: 0 0 0 20px;
+    padding: 5px 0 5px 20px;
+}
+
+nav {
+    margin: 0 10px 10px 0;
+}
+
+nav, #content {
+    border: 1px solid #888;
+}
+
+#content article {
+    padding: 10px;
+}
+
+nav ul, nav p, #content article {
+    background: #fff;
 }
 
 a.sprache img {
-	margin: 5px;
+    margin: 5px;
 }