diff --git a/cis/ampel.php b/cis/ampel.php
index 4d1cdcceb..5b760e844 100755
--- a/cis/ampel.php
+++ b/cis/ampel.php
@@ -3,6 +3,10 @@ require_once('../config/cis.config.inc.php');
 require_once('../include/functions.inc.php');
 require_once('../include/ampel.class.php');
 require_once('../include/datum.class.php');
+require_once('../include/phrasen.class.php');
+
+$sprache = getSprache();
+$p = new phrasen($sprache);
 
 if(is_user_logged_in())
 {
@@ -32,16 +36,25 @@ if(is_user_logged_in())
 			}
 		}
 	}
+	if($rot==0 && $gelb==0)
+		echo '<a href="private/tools/ampelverwaltung.php" target="content" title="'.$p->t("tools/ampelsystem").' '.$rot.' rote"><img src="../skin/images/doppelampel_grau.gif" alt=""></a>';
+//	if($rot>0 || $gelb>0)
+//	{
+//		echo '<td width="26px" height="26px" align="center"><a href="private/tools/ampelverwaltung.php" target="content" title="Red Alert"><img src="../skin/images/glocke_aktiv.gif" alt="glocke"></a></td>';
+//	}
 	if($rot>0 || $gelb>0)
 	{
-		echo '[';
-		if($rot>0)
-			echo '<a href="private/tools/ampelverwaltung.php" target="content" title="Red Alert"><img src="../skin/images/ampel_rot.gif" style="vertical-align: bottom;"> '.$rot.'</a>';
+		echo '';
+		if($rot>0 && $gelb==0)
+			//echo '<td width="26px" height="26px" align="center" style="background-image:url(../skin/images/glocke_aktiv.gif); background-repeat:no-repeat"><a href="private/tools/ampelverwaltung.php" target="content" title="Red Alert"><strong>'.$rot.'</strong></a></td>';
+			echo '<a href="private/tools/ampelverwaltung.php" target="content" title="'.$p->t("tools/ampelsystem").'"><img src="../skin/images/doppelampel_rot.gif" alt=""></a>';
 		if($rot>0 && $gelb>0)
-			echo ' | ';
-		if($gelb>0)
-			echo '<a href="private/tools/ampelverwaltung.php" target="content" title="Yellow Alert"><img src="../skin/images/ampel_gelb.png"  style="vertical-align: bottom;"> '.$gelb.'</a>';
-		echo ' ]';
+			//echo ' <td></td>';
+			echo '<a href="private/tools/ampelverwaltung.php" target="content" title="'.$p->t("tools/ampelsystem").'"><img src="../skin/images/doppelampel_rot_gelb.gif" alt=""></a>';
+		if($gelb>0 && $rot==0)
+			//echo '<td width="26px" height="26px" align="center" style="background-image:url(../skin/images/glocke_aktiv.gif); background-repeat:no-repeat"><a href="private/tools/ampelverwaltung.php" target="content" title="Yellow Alert"><strong>'.$gelb.'</strong></a></td>';
+			echo '<a href="private/tools/ampelverwaltung.php" target="content" title="'.$p->t("tools/ampelsystem").'"><img src="../skin/images/doppelampel_gelb.gif" alt=""></a>';
+		echo ' ';
 	}
 }
 else
diff --git a/cis/index.html b/cis/index.html
index df1b12c5e..2661fb108 100644
--- a/cis/index.html
+++ b/cis/index.html
@@ -1,12 +1,48 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title>CIS</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script language="Javascript">
-	window.location.href='index.php';
-</script>
+	<title>CIS</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" href="../skin/jquery.css" type="text/css">
+	<link href="../skin/style.css.php" rel="stylesheet" type="text/css">
+	<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+	<script src="../include/js/jquery.js" type="text/javascript"></script>
 </head>
-<body>
-Sollten Sie nicht automatisch weitergeleitet werden, druecken sie bitte <a href="index.php">hier</a>
+<body class="main">
+<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr>
+		<td class="rand"></td>
+		<td height="100%" width="100%" valign="bottom" class="boxshadow" style="position: fixed;">
+		<table height="100%" cellspacing="0" cellpadding="0" class="header">
+			<tr style="position:relative;" height="10%">
+				<td valign="top" align="left">
+				<img style="position:absolute; left:16px; top:3%; *top:18\%; z-index:5000; height:7%;" src="../skin/images/fhtw_logo.png" alt="fhtw_logo"/>
+				<img src="../skin/images/header_left.png" alt="header_links" style="position:absolute; left:0px; z-index:1; max-width:100%; height:15.8%;" />
+				<img src="../skin/images/header_right.png" alt="header_rechts" style="position:absolute; right:0px; z-index:2; max-width:100%; height:15.8%" />
+				</td>
+			</tr>
+			<tr>
+				<td align="center" valign="middle">					
+					<img src="../skin/images/cis_logo_400px.png" height="70px" />
+					<br><br><br>
+					<!--Herzlich Willkommen im Campus Informationssystem (CIS)-->
+					<br>
+					<br>
+					<form action="index_login.php?login=1" method="POST">
+					<input class="cis_login" type="submit" value="Login">
+					</form>
+				</td>
+			</tr>
+			<tr height="10%" >
+				<td align="center" valign="bottom">				
+					<div style="color:grey">Powered by <a href="http://fhcomplete.technikum-wien.at" target="blank">FH Complete 2.0</a></div>
+					<br><br>
+				</td>
+			</tr>
+		</table>
+		</td>
+		<td class="rand"></td>
+	</tr>
+</table>
 </body>
 </html>
\ No newline at end of file
diff --git a/cis/index.php b/cis/index.php
index 7c430953e..f8308743f 100644
--- a/cis/index.php
+++ b/cis/index.php
@@ -26,6 +26,7 @@ require_once('../include/functions.inc.php');
 require_once('../include/sprache.class.php');
 require_once('../include/phrasen.class.php');
 require_once('../include/mail.class.php');
+require_once('../include/student.class.php');
 
 /**
  * Prueft die URL damit keine boesen URLS uebergeben werden koennen
@@ -73,7 +74,7 @@ if(isset($_GET['content_id']))
 }
 else
 	$id = '';
-
+	
 if(isset($_GET['menu']))
 {
 	$menu = $_GET['menu'];
@@ -82,20 +83,41 @@ if(isset($_GET['menu']))
 else
 	$menu = 'menu.php?content_id='.$id;
 	
+$user = get_uid();
+$student = new student();
+if($student->load($user))
+{
+	$studiengang_kz=$student->studiengang_kz;
+	$semester=$student->semester;
+	$verband=$student->verband;
+}
+else
+{
+	$studiengang_kz='';
+	$semester='';
+	$verband='';
+}
+
 if(isset($_GET['content']))
 {
 	$content = $_GET['content'];
 	validURLCheck($content);
 }
 else
-	$content = '../cms/news.php';
+{
+	if($studiengang_kz=='' && $semester=='' && $verband=='' )
+		$content = '../cms/news.php';
+	else
+		if ($semester=='0' && $verband=='I')
+			$content = '../cms/news.php?studiengang_kz=10006&semester=0';
+		else
+			$content = '../cms/news.php?studiengang_kz='.$studiengang_kz.'&semester='.$semester.'';
+}
 	
 $sprache = getSprache();
 $p = new phrasen($sprache);
 $db = new basis_db();
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 	<title>CIS - <?php echo CAMPUS_NAME; ?></title>
@@ -131,57 +153,101 @@ function loadampel()
 	$('#ampel').load('ampel.php?'+gettimestamp());
 }
 </script>
-<body style="margin-top:0; padding-top:0" onload="loadampel()">
-<table class="tabcontent">
-	 <tr>
-	 	<td></td>
-	 	<td width="100%" ></td>
-	 	<td width="100%" ></td>
-	 	<td></td>
-	 </tr>
-	<tr>
-	    <td width="170" class="tdwrap" onclick="self.location.href='index.php'">
-			<div class="home_logo">&nbsp;</div>
-	    </td>
-        <td id="header" colspan="2" valign="top">
-    	    <div class="header_line" ></div>	
-        </td>
-        <td nowrap>
-        	<div style="font-size: 10px; text-align: right">
-        		<i>Powered by <a href="http://fhcomplete.technikum-wien.at/" target="blank">FH Complete 2.0</a></i>        		
-        	</div>
-        </td>
-        
-	</tr>
-	<tr>
-		<td></td>
-   	 	<td align="right" nowrap  colspan="2">
-   	 		<span id="ampel"></span>
-   	 		<?php require_once('../include/'.EXT_FKT_PATH.'/cis_menu_global.inc.php'); 	?>
-   	 		    <?php
-  
-				$sprache = new sprache();
-				$sprache->getAll(true);
-				foreach($sprache->result as $row)
-				{
-					echo ' <a href="#'.$row->sprache.'" title="'.$row->sprache.'" onclick="changeSprache(\''.$row->sprache.'\'); return false;"><img src="../cms/image.php?src=flag&sprache='.$row->sprache.'" alt="'.$row->sprache.'"></a>';
-				}
-			?>
-   	 	</td>
-   	    <td align="right" nowrap>
-			<form name="searchform" action="private/tools/suche.php" method="GET" target="content" style="display:inline">
-        	<input type="search" size="10" name="search" placeholder="<?php echo $p->t('tools/suchbegriff');?> ..."/>
-        	<img src="../skin/images/search.png" height="14px" onclick="document.searchform.submit()" class="suchicon"/>
-        </form>
-   	    </td>
-	</tr>
+<body class="main" onload="loadampel()">
+<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
+<tr>
+<td class="rand"></td>
+<td class="boxshadow" height="100%">
+	<table cellspacing="0" cellpadding="0" class="header">
+		<tr class="header">
+		<td valign="top" align="left">
+		<a href="index.php"><img class="header_logo" src="../skin/images/fhtw_logo.png" alt="fhtw_logo"></a>
+		<img class="header_left" src="../skin/images/header_left.png" alt="header_links">
+		<img class="header_right" src="../skin/images/header_right.png" alt="header_rechts">	   	 	
+	   	 	<table width="100%" height="100%" style="position:relative; top:10px; z-index:4" cellpadding="0">
+	   	 	<!--<tr valign="top" height="33%">
+		   	 	<td colspan="2" align="right" style="padding-right: 10px;">
+		   	 		<?php	  
+						$sprache = new sprache();
+						$sprache->getAll(true);
+						foreach($sprache->result as $row)
+						{
+							echo ' &nbsp;&nbsp;<a href="#'.$row->sprache.'" title="'.$row->sprache.'" onclick="changeSprache(\''.$row->sprache.'\'); return false;">'.$row->sprache.'</a>';
+					}?>
+				</td>
+		   	 		<!--<?php //require_once('../include/'.EXT_FKT_PATH.'/cis_menu_global.inc.php'); ?>
+		   	  </tr>-->
+		   	  <tr height="50%">
+		   	    <td width="20%" align="center">&nbsp;
+		        </td>
+		         <td align="center">
+					<form name="searchform" action="private/tools/suche.php" method="GET" target="content" style="display:inline">				
+		        	<input class="search" type="search" size="45" name="search" placeholder=" <?php echo $p->t('menu/suchePersonOrtDokumentInhalt');?> ..."/>
+		        	<img src="../skin/images/search.png" height="14px" onclick="document.searchform.submit()" class="suchicon"/>
+		        	</form>
+		        </td>
+		         <td width="20%" align="right" style="padding-right: 10px;">
+					<?php	  
+						$sprache = new sprache();
+						$sprache->getAll(true);
+						foreach($sprache->result as $row)
+						{
+							echo ' &nbsp;&nbsp;<a href="#'.$row->sprache.'" title="'.$row->sprache.'" onclick="changeSprache(\''.$row->sprache.'\'); return false;">'.$row->sprache.'</a>';
+					}?>
+		        </td>
+		   	  </tr>
+		   	  <tr height="50%" valign="top">
+		   	    <td colspan="3" width="100%" align="center" id="ampel"></td>
+	   	      </tr>
+	   	    </table>
+	   	</td>
+	   	</tr>
+	   	<tr>
+			<td valign="top" align="left">
+			<iframe id="menue" src="<?php echo $db->convert_html_chars($menu); ?>" name="menu" frameborder="0">
+				No iFrames
+			</iframe>
+			<iframe id="content" src="<?php echo $db->convert_html_chars($content); ?>" name="content" frameborder="0";>
+				No iFrames
+			</iframe>
+			</td>
+		</tr>
+	</table>
+</td>
+<td class="rand">
+	<!--  Menubox-Effekt am Seitenrand. Nettes Feature aber dzt. nicht sinnvoll einsetzbar
+	<div class="hoverbox">
+		<div class="preview">
+			<img src="../skin/images/aufklappen.png" />
+			<div class="hoverbox_inhalt">
+				<table class="hoverbox">
+					<tr>
+					<td><table style="text-align:right;" width="150px">
+						<tr>
+						<td><a href="http://www.hofer.at" target="blank">Impressum</a></td>
+						</tr>
+						<tr>
+						<td><a href="mailto:kindlm@technikum-wien.at">Kontakt</a></td>
+						</tr>
+						<tr>
+						<td>&nbsp;</td>
+						</tr>
+						<tr>
+						<td>Powered by <a href="http://fhcomplete.technikum-wien.at" target="blank">FH Complete 2.0</i></a></td>
+						</tr>
+						</table>
+					</td>
+					<td><img src="../skin/images/aufklappen.png" /></td>
+					</td>
+					</tr>
+				
+				</table>				
+			</div>
+		</div>
+	</div>-->
+</td>
+</tr>
 </table>
-<iframe id="menue" src="<?php echo $db->convert_html_chars($menu); ?>" name="menu" frameborder="0">
-	No iFrames
-</iframe>
-<iframe id="content" src="<?php echo $db->convert_html_chars($content); ?>" name="content" frameborder="0">
-	No iFrames
-</iframe>
 </body>
 </html>
 <?php
diff --git a/cis/index_login.php b/cis/index_login.php
new file mode 100644
index 000000000..85efb8264
--- /dev/null
+++ b/cis/index_login.php
@@ -0,0 +1,63 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ *          Manfred Kindl <manfred.kindl@technikum-wien.at>
+ *
+ */
+require_once('../config/cis.config.inc.php');
+require_once('../include/functions.inc.php');
+
+if(isset($_GET['login']))
+{
+	$uid = get_uid();
+
+	if($uid!='')
+	{
+		header('Location: '.APP_ROOT.'cis/index.php');
+	}
+}
+
+?>
+<html>
+<head>
+<title>CIS</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<table width="100%" height="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr>
+		<td class="rand"></td>
+		<td class="boxshadow">
+		<br><br><br><br><br>
+		<center>
+		<img src="../skin/images/logo.jpg" width="400px" />
+		<br><br><br>
+		Herzlich Willkommen am Campus Informationssystem der Fachhochschule Technikum Wien
+		<br>
+		<br>
+		<form action="index_login.php?login=1" method="POST">
+		<input type="submit" value="Login">
+		</form>
+		</center>
+		</td>
+		<td class="rand"></td>
+	</tr>
+</table>
+</body>
+</html>
diff --git a/cis/menu.php b/cis/menu.php
index e933956a2..5177b0431 100644
--- a/cis/menu.php
+++ b/cis/menu.php
@@ -39,69 +39,60 @@ ob_start();
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="../skin/style.css.php" rel="stylesheet" type="text/css">
 <title>Menu</title>
-<script language="JavaScript" type="text/javascript">
-<!--
-	var __js_page_array = new Array();
-    function js_toggle_container(conid)
-    {
-		if (document.getElementById)
+<script type="text/javascript" src="../include/js/flexcroll.js"></script>
+<link href="../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
+<script src="../include/js/jquery.js"></script>
+<script>
+function treemenu(obj) 
+{
+	if (!obj.length) return;
+	obj.find("ul.menu").each(function() 
+	{
+		if(!$(this).parent().find("a:first").hasClass("selected"))
 		{
-        	var block = "table-row";
-			if (navigator.appName.indexOf('Microsoft') > -1)
-				block = 'block';
-				
-			// Aktueller Anzeigemode ermitteln	
-            var status = __js_page_array[conid];
-            if (status == null)
+//			$(this).children(".menublock").each(function(){alert("a"+$(this).html())});
+
+	//		if(!$(this).children(".menublock"))
+				$(this).css("display", "none");
+		}
+	});
+
+	$("li:not(:has(ul))").find("a").addClass("leaf");
+	
+	obj.find("a").click(function(e) 
+	{
+		//e.preventDefault();
+		if($(this).hasClass("selected"))
+		{
+			$(this).removeClass("selected");
+			$(this).parent().find("ul.menu:first").slideUp(400);
+		}
+		else
+		{
+			$(this).parent().siblings().each(function()
 			{
-		 		if (document.getElementById && document.getElementById(conid)) 
-				{  
-					status=document.getElementById(conid).style.display;
-				} else if (document.all && document.all[conid]) {      
-					status=document.all[conid].style.display;
-		      	} else if (document.layers && document.layers[conid]) {                          
-				 	status=document.layers[conid].style.display;
-		        }							
-			}	
-			
-			// Anzeigen oder Ausblenden
-            if (status == 'none')
-            {
-		 		if (document.getElementById && document.getElementById(conid)) 
-				{  
-					document.getElementById(conid).style.display = 'block';
-				} else if (document.all && document.all[conid]) {      
-					document.all[conid].style.display='block';
-		      	} else if (document.layers && document.layers[conid]) {                          
-				 	document.layers[conid].style.display='block';
-		        }				
-            	__js_page_array[conid] = 'block';
-            }
-            else
-            {
-		 		if (document.getElementById && document.getElementById(conid)) 
-				{  
-					document.getElementById(conid).style.display = 'none';
-				} else if (document.all && document.all[conid]) {      
-					document.all[conid].style.display='none';
-		      	} else if (document.layers && document.layers[conid]) {                          
-				 	document.layers[conid].style.display='none';
-		        }				
-            	__js_page_array[conid] = 'none';
-            }
-            return false;
-     	}
-     	else
-     		return true;
-  	}
-//-->
+				$(this).find("a:first").removeClass("selected");
+				$(this).find("ul.menu:first").slideUp(400);
+			});
+			$(this).parent().find("ul.menu:first").slideDown(400);
+			if (!$(this).hasClass("leaf")) 
+			{
+				$(this).addClass("selected");
+			}
+		}
+		window.setTimeout(function(){fleXenv.updateScrollBars();},500);
+	});
+}
+$(document).ready(function() 
+{
+	treemenu($("#menu"));
+});
+	
 </script>
+
 </head>
 <body style="margin:0; padding:0">
-<table class="menue">
-	<tr>
-		<td>&nbsp;</td>
-	</tr>
+<div class="flexcroll">
 <?php
 		
 	if(isset($_GET['content_id']) && $_GET['content_id']!='')
@@ -109,21 +100,18 @@ ob_start();
 	else
 		$content_id=CIS_MENU_ENTRY_CONTENT;
 	
+	echo '<ul id="menu">';
 	if($content_id!=CIS_MENU_ENTRY_CONTENT)
 	{
-		echo '<tr>
-				<td class="tdwidth10" nowrap>&nbsp;</td>
-				<td><a class="HyperItem" href="?content_id='.CIS_MENU_ENTRY_CONTENT.'">&lt;&lt; '.$p->t('lvplan/home').'</a></td>
-				</tr>
-				<tr><td></td></tr>';
+		echo '<li><a href="?content_id='.CIS_MENU_ENTRY_CONTENT.'">&lt;&lt; '.$p->t('global/zurueck').'</a><br></li>';
 	}
 	require_once('../cms/menu.inc.php');
 	drawSubmenu($content_id);
 	
 	//Gepufferten Output ausgeben
 	ob_end_flush();
+	echo '</ul>';
 ?>
-</table>
-
+</div>
 </body>
-</html>
\ No newline at end of file
+</html>


- -	- -	- - Powered by FH Complete 2.0 - -
	- - - getAll(true); - foreach($sprache->result as $row) - { - echo ' '; - } - ?> -	- - - - -