html5

author: Philip Häusler <msquare@notrademark.de> 2011-06-01 13:36:24 +0200
committer: Philip Häusler <msquare@notrademark.de> 2011-06-01 13:36:24 +0200
commit: 550467697f8b3ae0b5d15d1d3a2bc3f83b003ff8 (patch)
tree: 01a0c607cb079d61de8e96d8ee70c4b1a014ecfa
parent: 75448045cfe70054c8f4bae1bcfaf9bb0f70d330 (diff)
6 files changed, 132 insertions, 93 deletions
diff --git a/includes/footer.php b/includes/footer.php
index 8f736c4d..584e4b9b 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -1,9 +1,10 @@
 <!-- anfang des footers //-->
     <br />
       <p align="center">
-        <?php if(IsSet($_SESSION['oldurl']))
-          echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a>&nbsp;";
-        ?>
+        <?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>
@@ -13,27 +14,27 @@
 
 <!-- anfang des menue parts //-->
 <?php
-if($_SESSION['Menu'] == "R")
-  include("menu.php");
+
+
+if ($_SESSION['Menu'] == "R")
+	include ("menu.php");
 ?>
 
 <!-- ende des menue parts //-->
-
-  </tr>
-  <tr>
-    <td colspan="2">
-      <h5 align="center"> &#169; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a>
-      <?php
-        include("funktion_counter.php"); 
-        include("funktion_flag.php"); 
-      ?></h5>
-  </td>
-  </tr>
 </table>
+<footer>
+	<p>
+		&copy; copyleft - <a href="mailto:erzengel@lists.ccc.de">Kontakt</a><br />
+		This is hell. Really.
+	</p>
+</footer>
+
+<?php
 
-<!-- </div> -->
-<?php mysql_close($con); ?>
-<!-- </div> -->
+
+include ("funktion_counter.php");
+mysql_close($con);
+?>
 
 </body>
 </html>
diff --git a/includes/header.php b/includes/header.php
index 3b6a4c23..6b206049 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -1,40 +1,37 @@
 <?php
 include "header_start.php";
 
-echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
+echo "<!DOCTYPE html>\n";
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml"> 
+<html> 
 <head>
 
-<title><?php echo $title; ?></title>
-
+<title><?php echo $title; ?> - Engelsystem</title>
+<meta charset="UTF-8" />
+<meta http-equiv="content-type" content="text/html;charset=utf-8" />
+<meta name="content-style-type" content="text/css" />
 <meta name="keywords" content="Engel, Himmelsverwaltung" />
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta http-equiv="expires" content="0" />
 <meta name="robots" content="index" />
 <meta name="revisit-after" content="1 days" />
-<meta http-equiv="content-language" content="de" />
-<script type="text/javascript" src="<?php echo $url . $ENGEL_ROOT; ?>/css/grossbild.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $url . $ENGEL_ROOT; ?>css/style<?php
-
-  if(!isset($_SESSION['color'])) 
-    echo "6";
-  else
-    echo $_SESSION['color'];
-  ?>.css" />
+<script type="text/javascript" src="css/grossbild.js"></script>
+<link rel="stylesheet" type="text/css" href="css/base.css" />
+<link rel="stylesheet" type="text/css" href="css/style<?php echo isset($_SESSION['color']) ? $_SESSION['color'] : "6" ?>.css" />
 
 <?php
-if(isset($reload)) {
-  if ($reload == "")
-    $reload = 3330;
 
-  echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
+
+if (isset ($reload)) {
+	if ($reload == "")
+		$reload = 3330;
+
+	echo "\n<meta http-equiv=\"refresh\" content=\"" . $reload . "; URL=./?reload=" . $reload . "\">\n";
 }
 
-if(isset($Page["AutoReload"])) 
-  echo "\n<meta http-equiv=\"refresh\" content=\"". $Page["AutoReload"].
-    "; URL=". $url. $ENGEL_ROOT. $Page["Name"]."\">\n";
+if (isset ($Page["AutoReload"]))
+	echo "\n<meta http-equiv=\"refresh\" content=\"" . $Page["AutoReload"] .
+	"; URL=" . $url . $ENGEL_ROOT . $Page["Name"] . "\">\n";
 
 echo "</head>\n";
 
@@ -43,40 +40,31 @@ echo "</head>\n";
 /////////////////////////////////////////////////////////////////////////////////////////////
 echo "<body>\n";
 
-echo "<div align=\"center\">\n\n";
-
-if( isset($_SESSION['color']) && ($_SESSION['color']==6) )
-{
-  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel_w.png\" alt=\"Unser Himmel\" /></a>\n";
-}
-else
-{
-  echo   "<a name=\"top\"><img src=\"". $url. $ENGEL_ROOT. "pic/himmel.png\" alt=\"Unser Himmel\" /></a>\n";
-}
-echo "</div>\n\n";
-
+echo '<header><a href="' . $url . $ENGEL_ROOT . '" id="logo"></a></header>';
 
 //ausgabe new message
-if( isset($_SESSION['CVS']["nonpublic/messages.php"]))
-{
-    if( $_SESSION['CVS']["nonpublic/messages.php"] == "Y")
-    {
-  $SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=". $_SESSION["UID"]. " AND `isRead`='N'";
-  $erg = mysql_query($SQL, $con);
-  if( mysql_num_rows( $erg ) > 0 )
-    echo "<br /><a href=\"". $url. $ENGEL_ROOT.
-      "nonpublic/messages.php\">". Get_Text("pub_messages_new1").
-      " ".  mysql_num_rows( $erg ). " ".
-      Get_Text("pub_messages_new2"). "</a><br /><br />";
-    }
+if (isset ($_SESSION['CVS']["nonpublic/messages.php"])) {
+	if ($_SESSION['CVS']["nonpublic/messages.php"] == "Y") {
+		$SQL = "SELECT `Datum` FROM `Messages` WHERE `RUID`=" . $_SESSION["UID"] . " AND `isRead`='N'";
+		$erg = mysql_query($SQL, $con);
+		if (mysql_num_rows($erg) > 0)
+			echo "<br /><a href=\"" . $url . $ENGEL_ROOT .
+			"nonpublic/messages.php\">" . Get_Text("pub_messages_new1") .
+			" " . mysql_num_rows($erg) . " " .
+			Get_Text("pub_messages_new2") . "</a><br /><br />";
+	}
 }
 ?>
-<table width="95%" align="center" border="0" cellpadding="7" cellspacing="0">
+<table id="body" width="90%" align="center" border="0" cellpadding="7" cellspacing="0">
   <tr>
 <?php
+
+
 //ausgaeb Menu
-if( !isset($_SESSION['Menu']))    $_SESSION['Menu'] = "L";
-if( $_SESSION['Menu'] =="L")    include("menu.php");
+if (!isset ($_SESSION['Menu']))
+	$_SESSION['Menu'] = "L";
+if ($_SESSION['Menu'] == "L")
+	include ("menu.php");
 ?>
 
     <td valign="top" align="center">
@@ -84,41 +72,44 @@ if( $_SESSION['Menu'] =="L")    include("menu.php");
   <tr class="contenttopic">
     <td>
 <?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";
 
+
+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 
-if(isset($_SESSION['UID'])) {
-  if(isset($_SESSION['oldurl']))
-    $BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
-  if(isset($_SESSION['newurl']))
-    $_SESSION['oldurl'] = $_SESSION['newurl'];
-  $_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
+<?php
+
+
+if (isset ($_SESSION['UID'])) {
+	if (isset ($_SESSION['oldurl']))
+		$BACKUP_SESSION_OLDURL = $_SESSION['oldurl'];
+	if (isset ($_SESSION['newurl']))
+		$_SESSION['oldurl'] = $_SESSION['newurl'];
+	$_SESSION['newurl'] = $_SERVER["REQUEST_URI"];
 }
 
 function SetHeaderGo2Back() {
-  global $BACKUP_SESSION_OLDURL;
-  $_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
+	global $BACKUP_SESSION_OLDURL;
+	$_SESSION['oldurl'] = $BACKUP_SESSION_OLDURL;
 }
 
-if($Page["CVS"] != "Y") {
-  echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
+if ($Page["CVS"] != "Y") {
+	echo "Du besitzt kein Rechte f&uuml;r diesen Bereich.<br />\n";
 
-  if(isset($_SESSION['oldurl']))
-    echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
-  else
-    echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+	if (isset ($_SESSION['oldurl']))
+		echo "<a href=\"" . $_SESSION["oldurl"] . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
+	else
+		echo "<a href=\"" . $url . $ENGEL_ROOT . "\">" . Get_Text("back") . "</a> geht's zur&uuml;ck...\n";
 
-  exit ();
+	exit ();
 }
 ?>
 
diff --git a/includes/menu.php b/includes/menu.php
index 799e6c75..955de8b7 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -58,6 +58,10 @@ if( isset($_SESSION['UID']))
 <?php
 }
 ?>
+
+<?php
+include ("funktion_flag.php");
+?>
     </td> 
 
 <!-- ende des menue parts //-->
diff --git a/www-ssl/css/base.css b/www-ssl/css/base.css
new file mode 100644
index 00000000..e5b1644a
--- /dev/null
+++ b/www-ssl/css/base.css
@@ -0,0 +1,39 @@
+* {
+    margin: 0;
+    padding: 0;
+}
+
+header {
+	display: block;
+	width: 100%;
+}
+
+footer {
+	display: block;
+	text-align: center;
+	width: 100%;
+}
+
+footer p {
+	margin: 10px auto;
+}
+
+#logo {
+    background: url('../pic/himmel.png') top left no-repeat;
+    display: block;
+	height: 32px;
+	margin: 10px auto;
+    width: 380px;
+}
+
+#body {
+	margin: 0 5%;
+}
+
+td {
+	padding: 4px;
+}
+
+.menu ul {
+	margin: 0 0 0 20px;
+}
diff --git a/www-ssl/css/style6.css b/www-ssl/css/style6.css
index 72e1024d..eaca462f 100644
--- a/www-ssl/css/style6.css
+++ b/www-ssl/css/style6.css
@@ -6,6 +6,10 @@ body {
 	font-size: small
 }
 
+#logo {
+	background-image: url('../pic/himmel_w.png');
+}
+
 a {
 	text-decoration: none;
 	color: #ff9900
diff --git a/www-ssl/index.php b/www-ssl/index.php
index e61db41a..4a34643c 100644
--- a/www-ssl/index.php
+++ b/www-ssl/index.php
@@ -1,15 +1,15 @@
 <?php
-  $title = "Index";
-  $header = "Index";
-  include "../../camp2011/includes/header.php";
+  $title = "Start";
+  $header = "Start";
+  include "../includes/header.php";
 
   echo "<p>" . Get_Text("index_text1") . "</p>\n";
   echo "<p>" . Get_Text("index_text2") . "</p>\n";
   echo "<p>" . Get_Text("index_text3") . "</p>\n";
 
-  include "../../camp2011/includes/login_eingabefeld.php";
+  include "../includes/login_eingabefeld.php";
 
   echo "<h6>" . Get_Text("index_text4") . "</h6>";
 
-  include "../../camp2011/includes/footer.php";
+  include "../includes/footer.php";
 ?>
author	Philip Häusler <msquare@notrademark.de>	2011-06-01 13:36:24 +0200
committer	Philip Häusler <msquare@notrademark.de>	2011-06-01 13:36:24 +0200
commit	550467697f8b3ae0b5d15d1d3a2bc3f83b003ff8 (patch)
tree	01a0c607cb079d61de8e96d8ee70c4b1a014ecfa
parent	75448045cfe70054c8f4bae1bcfaf9bb0f70d330 (diff)