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

---
 default-conf/var_www_includes/config_db.php |  8 +++++---
 includes/funktion_flag.php                  |  2 +-
 includes/menu.php                           | 10 ++--------
 www-ssl/admin/schichtplan.1.php             |  6 +++---
 www-ssl/nonpublic/einstellungen.php         |  1 +
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/default-conf/var_www_includes/config_db.php b/default-conf/var_www_includes/config_db.php
index b49e5e0c..428a9339 100644
--- a/default-conf/var_www_includes/config_db.php
+++ b/default-conf/var_www_includes/config_db.php
@@ -1,6 +1,8 @@
 <?php
-include("../include/funktion_db.php");
+include ("../include/funktion_db.php");
 
-$con = mysql_connect("localhost", "root", "changeme") or die ("connection failed");
-$sel = mysql_select_db("tabel") or die (mysql_error());
+$con = mysql_connect("localhost", "root", "changeme") or die("connection failed");
+$sel = mysql_select_db("tabel") or die(mysql_error());
+mysql_query("SET CHARACTER SET utf8;", $sql_connection);
+mysql_query("SET NAMES 'utf8'", $sql_connection);
 ?>
diff --git a/includes/funktion_flag.php b/includes/funktion_flag.php
index 7e88466d..6b4e2f06 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 '<p><a class="sprache" href="' . $URL . 'DE"><img src="' . $ENGEL_ROOT . 'pic/flag/de.png" alt="DE" title="Deutsch"></a>';
+echo '<p class="content"><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/menu.php b/includes/menu.php
index 3ca5e8ae..6a209a0f 100644
--- a/includes/menu.php
+++ b/includes/menu.php
@@ -20,15 +20,9 @@ if ($submenus >= 1) {
 
 	for ($index_nummer = 1; $index_nummer <= $submenus; $index_nummer++) {
 ?>
-<table align="center" class="border" cellpadding="3" cellspacing="1">
-  <tr>
-    <td width="160" class="menu"> 
+<nav class="container">
     <?php include ("./".$filepost.".".$index_nummer.$filepre); ?>
-    </td>
-  </tr>
-</table>
-
-<br />
+</nav>
 <?php
 
 
diff --git a/www-ssl/admin/schichtplan.1.php b/www-ssl/admin/schichtplan.1.php
index 30761390..fe8c0384 100644
--- a/www-ssl/admin/schichtplan.1.php
+++ b/www-ssl/admin/schichtplan.1.php
@@ -1,5 +1,5 @@
-<h4 class="menu"> Schichtplan </h4>
-
+<h4>Schichtplan</h4>
+<ul class="content">
 <li><a href="./schichtplan.php">Ein-/Austragen</a></li>
 <li><a href="./schichtplan_druck.php">Druckversion</a></li>
-
+</ul>
\ No newline at end of file
diff --git a/www-ssl/nonpublic/einstellungen.php b/www-ssl/nonpublic/einstellungen.php
index 81dda869..713425bb 100644
--- a/www-ssl/nonpublic/einstellungen.php
+++ b/www-ssl/nonpublic/einstellungen.php
@@ -128,6 +128,7 @@ if (!isset ($_POST["action"])) {
            <option <?php if($_SESSION['color'] == 8) { echo "selected"; } ?> value="8">Pastel Style</option>
            <option <?php if($_SESSION['color'] == 4) { echo "selected"; } ?> value="4">Test Style</option>
            <option <?php if($_SESSION['color'] == 9) { echo "selected"; } ?> value="9">Test Style 21c3 </option>
+           <option <?php if($_SESSION['color'] == 10) { echo "selected"; } ?> value="10">msquare (cccamp2011)</option>
          </select>
        </td>
      </tr>