From d8d8dd5c9f2b263a6fbcef687d6aa5f0faef5b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 9 May 2007 15:27:44 +0000
Subject: [PATCH] - Neue Strukter des CIS Menues - News sind nun mit CSS
 Formatiert - Erstversion BewerberZuStudent

---
 cis/menu.html                                 | 401 ++++++++----------
 cis/private/lehre/pinboard.php                |  64 ++-
 cis/private/menu.php                          |   6 +-
 cis/public/news.php                           |  25 +-
 content/student/interessentenoverlay.xul.php  |   2 +-
 content/student/interessentoverlay.js.php     |  47 ++
 content/student/studentDBDML.php              | 153 ++++++-
 include/prestudent.class.php                  |   2 +-
 skin/cis.css                                  |  22 +-
 .../personen/import/interessentenimport.php   |   4 +
 10 files changed, 485 insertions(+), 241 deletions(-)

diff --git a/cis/menu.html b/cis/menu.html
index 09e1998a0..a6c4c9e2c 100644
--- a/cis/menu.html
+++ b/cis/menu.html
@@ -49,16 +49,18 @@
 		</tr>
 		<!-- Hauptmenue News -->
 		<tr>
-		    <td nowrap>
-				<a href="public/news.php"  target="content" class="MenuItem" onClick="js_toggle_container('NEWS');"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;News</a>
+          	<td nowrap><a href="public/news.php"  target="content" class="MenuItem" onClick="js_toggle_container('NEWS');"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;News</a></td>
+        </tr>
+		<tr>
+          	<td nowrap>
 				<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="NEWS" style="display: visible;">
 				<tr>
 		  			<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" target="content" href="private/lehre/pinboard.php?fachbereich_kurzbz=Senat"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Senatsbeschl&uuml;sse</a></td>
+					<td nowrap><a class="Item" target="_blank" href="http://www.technikum-wien.at/service/intern"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Newsletter</a></td>
 		  		</tr>
-				<tr>
+		  		<tr>
 		  			<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" target="_blank" href="http://www.technikum-wien.at/service/intern"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;INTERN</a></td>
+					<td nowrap><a class="Item" target="content" href="private/lehre/pinboard.php?fachbereich_kurzbz=Senat"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Senatsbeschl&uuml;sse</a></td>
 		  		</tr>
 		  		<tr>
 		  			<td width="10" nowrap>&nbsp;</td>
@@ -70,34 +72,7 @@
 		  		</tr>
 			  	</table>
 			</td>
-
-        	<!--<td nowrap>
-        		<a class="MenuItem" href="public/news.php" target="content">
-        			<img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;News
-        		</a>
-        	</td>-->
   		</tr>
-  		<tr>
-
-			<td nowrap>
-				<a href="?FAQ" class="MenuItem" onClick="return(js_toggle_container('FAQ'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;FAQ</a>
-				<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="FAQ" style="display: none">
-		  		<tr>
-		  			<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" href="public/faq_lan.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;LAN FAQ</a></td>
-		  		</tr>
-				<tr>
-		  			<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" href="public/faq_bug.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bug Tracking FAQ</a></td>
-		  		</tr>
-		  		<tr>
-		  			<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a class="Item" href="public/faq_upload.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Upload Lehre FAQ</a></td>
-		  		</tr>
-			  	</table>
-			</td>
-		</tr>
-
 
 		<!-- Hauptmenue Lehre -->
 		<tr>
@@ -127,116 +102,62 @@
 					<td width="10" nowrap>&nbsp;</td>
 	          		<td nowrap><a class="Item" href="public/tw_international.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;TW International</a></td>
 	  			</tr>
-	  			<tr>
-			  	<td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a href="private/info/weiterbildung/info.html" target="content" class="MenuItem" onClick="js_toggle_container('Weiterbildung');"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Weiterbildung</a>
-			  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Weiterbildung" style="display: none">
-					<!--<tr>
-						<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="campus/weiterbildung/info.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Info und Kontakt</a></td>
-					</tr>-->
-					<tr>
-						<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="private/info/weiterbildung/aktuelles/aktuelles.html" target="content" style="font-weight: bold;"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Aktuelles</a></td>
-					</tr>
-					<tr>
-						<td width="10" nowrap>&nbsp;</td>
-	          			<td nowrap><a target="content" href="private/info/weiterbildung/archiv/archiv.html" class="MenuItem" onClick="js_toggle_container('WeiterbildungArchiv');" style="font-weight: normal;"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Archiv</a>
-
-			  			<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="WeiterbildungArchiv" style="display: none;">
-							<tr>
-							  	<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_06-07.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2006/07</a></td>
-							</tr>
-							<tr>
-							  	<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_05-06.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2005/06</a></td>
-							</tr>
-							<tr>
-							  	<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_04-05.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2004/05</a></td>
-							</tr>
-							<tr>
-							  	<td width="10" nowrap>&nbsp;</td>
-								<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_03-04.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2003/04</a></td>
-							</tr>
-						</table>
-						</td>
-					</tr>
-					<tr>
-						<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="private/info/weiterbildung/links.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Links</a></td>
-					</tr>
-					<tr>
-						<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="http://www.lllacademy.at/" target="_blank"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;LLL-Academy</a></td>
-					</tr>
-				</table>
-				</td>
-  			</tr>
+	  			
 				<tr>
 	          		<td width="10" nowrap>&nbsp;</td>
-	          		<td nowrap><a class="Item" href="public/library.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bibliothek</a></td>
+	          		<td nowrap><a class="MenuItem" href="public/library.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bibliothek</a></td>
   				</tr>
-  				<tr>
-  					<td width="10" nowrap>&nbsp;</td>
-				    <td nowrap><a href="?Medienaustattung" class="MenuItem" onClick="return(js_toggle_container('Medienaustattung'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Medienaustattung</a></td>
+				</table>
+				&nbsp;
+		  	</td>
+  		</tr>
+  		
+		<tr>
+			<td nowrap><a href="private/info/weiterbildung/info.html" target="content" class="MenuItem" onClick="js_toggle_container('Weiterbildung');"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Weiterbildung</a>
+		  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Weiterbildung" style="display: none">
+				<!--<tr>
+					<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="campus/weiterbildung/info.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Info und Kontakt</a></td>
+				</tr>-->
+				<tr>
+					<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="private/info/weiterbildung/aktuelles/aktuelles.html" target="content" style="font-weight: bold;"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Aktuelles</a></td>
 				</tr>
 				<tr>
 					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap>
-						<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Medienaustattung" style="display: none">
+          			<td nowrap><a target="content" href="private/info/weiterbildung/archiv/archiv.html" class="MenuItem" onClick="js_toggle_container('WeiterbildungArchiv');" style="font-weight: normal;"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Archiv</a>
+
+		  			<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="WeiterbildungArchiv" style="display: none;">
 						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-					    	<td nowrap><a class="Item" href="private/tools/inventar.php" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Inventar</a></td>
-						</tr>
-						<tr>
-							<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_fixer_pc.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Fixer PC</a></td>
-						</tr>
-						<tr>
-						 	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_laptop.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laptop</a></td>
+						  	<td width="10" nowrap>&nbsp;</td>
+							<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_06-07.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2006/07</a></td>
 						</tr>
 						<tr>
 						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_visualizer.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Visualizer</a></td>
+							<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_05-06.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2005/06</a></td>
 						</tr>
 						<tr>
 						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_video.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Video</a></td>
+							<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_04-05.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2004/05</a></td>
 						</tr>
 						<tr>
 						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_dvd.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;DVD</a></td>
+							<td nowrap><a class="Item" href="private/info/weiterbildung/archiv/archiv_03-04.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;2003/04</a></td>
 						</tr>
-						<tr>
-						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_minidisc.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Minidisc</a></td>
-						</tr>
-						<tr>
-						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_cd.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;CD</a></td>
-						</tr>
-						<tr>
-						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_externes_video.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Externes Video</a></td>
-						</tr>
-						<tr>
-						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_mikrofon.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Mikrofon</a></td>
-						</tr>
-						<tr>
-						  	<td width="10" nowrap>&nbsp;</td>
-							<td nowrap><a class="Item" href="public/info/medien/medienausstattung_faq.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;FAQ</a></td>
-						</tr>
-						</table>
+					</table>
 					</td>
 				</tr>
-				</table>
-		  	</td>
+				<tr>
+					<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="private/info/weiterbildung/links.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Links</a></td>
+				</tr>
+				<tr>
+					<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="http://www.lllacademy.at/" target="_blank"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;LLL-Academy</a></td>
+				</tr>
+			</table>
+			</td>
   		</tr>
-
 		<!-- Hauptmenue Kommunikation -->
 		<tr>
           <td nowrap><a href="?Kommunikation" class="MenuItem" onClick="return(js_toggle_container('Kommunikation'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Kommunikation</a></td>
@@ -270,25 +191,8 @@
 			</tr>
 			<tr>
 				<td width="10" nowrap>&nbsp;</td>
-			    <td nowrap><a href="?Unternehmenskommunikation" class="MenuItem" onClick="return(js_toggle_container('Unternehmenskommunikation'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Unternehmens-<br>&nbsp;&nbsp;&nbsp;kommunikation</a></td>
+			    <td nowrap><a href="../documents/management/" class="MenuItem" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Unternehmens-<br>&nbsp;&nbsp;&nbsp;kommunikation</a></td>
 			</tr>
-			<tr>
-				<td width="10" nowrap>&nbsp;</td>
-				<td nowrap>
-					<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Unternehmenskommunikation" style="display: none">
-
-					<tr>
-					<td width="10" nowrap>&nbsp;</td>
-					<td nowrap><a href="../documents/management/" class="Item" target="_blank"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Marketing</a></td>
-					</tr>
-
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a href="../documents/management/umgang_vielfalt" class="Item" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Umgang mit Vielfalt</a></td>
-					</tr>
-					</table>
-				</td>
-  			</tr>
 			</table>
 		  	</td>
   		</tr>
@@ -319,7 +223,7 @@
 			</tr>
 			<tr>
 			  	<td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a class="Item" href="private/tools/wlan_registration.php" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;WLan-Registration</a></td>
+				<td nowrap><a class="Item" href="private/tools/wlan_registration.php" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;WLAN-Registration</a></td>
 			</tr>
 			<tr>
 			  	<td width="10" nowrap>&nbsp;</td>
@@ -330,8 +234,55 @@
 				<td nowrap><a class="Item" href="private/info/softgrid2.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;SoftGrid</a></td>
 			</tr>
 			<tr>
-			  	<td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a class="Item" href="public/info/mail.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Mail</a></td>
+  					<td width="10" nowrap>&nbsp;</td>
+				    <td nowrap><a href="?Medienaustattung" class="MenuItem" onClick="return(js_toggle_container('Medienaustattung'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Medienaustattung</a>
+					<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Medienaustattung" style="display: none">
+					<tr>
+						<td width="10" nowrap>&nbsp;</td>
+				    	<td nowrap><a class="Item" href="private/tools/inventar.php" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Inventar</a></td>
+					</tr>
+					<tr>
+						<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_fixer_pc.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Fixer PC</a></td>
+					</tr>
+					<tr>
+					 	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_laptop.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laptop</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_visualizer.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Visualizer</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_video.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Video</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_dvd.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;DVD</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_minidisc.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Minidisc</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_cd.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;CD</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_externes_video.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Externes Video</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_mikrofon.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Mikrofon</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/medien/medienausstattung_faq.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;FAQ</a></td>
+					</tr>
+					</table>
+				</td>
 			</tr>
 			<!--<tr>
 			  	<td width="10" nowrap>&nbsp;</td>
@@ -340,11 +291,7 @@
 
 			<tr>
 				<td width="10" nowrap>&nbsp;</td>
-			  	<td nowrap><a href="?Verwaltungstools" class="MenuItem" onClick="return(js_toggle_container('Verwaltungstools'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verwaltungstools</a></td>
-			</tr>
-			<tr>
-				<td width="10" nowrap>&nbsp;</td>
-			  	<td nowrap>
+			  	<td nowrap><a href="?Verwaltungstools" class="MenuItem" onClick="return(js_toggle_container('Verwaltungstools'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verwaltungstools</a>
 			   	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Verwaltungstools" style="display: none">
 			  	<tr>
 			  		<td width="10" nowrap>&nbsp;</td>
@@ -361,6 +308,52 @@
 			  	</table>
 			  	</td>
   			</tr>
+  			<tr>
+			    <td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a href="?Verordnungen" class="MenuItem" onClick="return(js_toggle_container('Verordnungen'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verordnungen</a>
+				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Verordnungen" style="display: none">
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/verordnungen/hausordnung.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Hausordnung</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/verordnungen/brandschutzordnung.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Brandschutzordnung</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/verordnungen/benutzungsordnung_bibliothek.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bibliotheksordnung</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/verordnungen/EDV_Richtlinien.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;EDV Richtlinien</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/info/verordnungen/laborordnung.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung</a></td>
+					</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+		        <td nowrap><a href="?Location" class="MenuItem" onClick="return(js_toggle_container('Location'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Location</a></td>
+			</tr>
+			<tr>
+				<td width="10" nowrap>&nbsp;</td>
+		        <td nowrap>
+				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Location" style="display: none">
+					<tr>
+						<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/location.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Standort</a></td>
+					</tr>
+					<tr>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="public/tw_building.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Geb&auml;udeplan</a></td>
+					</tr>
+					</table>
+				</td>
+  			</tr>
 			</table>
 		  	</td>
   		</tr>
@@ -392,57 +385,13 @@
 		  			<td width="10" nowrap>&nbsp;</td>
 					<td nowrap><a class="Item" href="private/info/qm/vorlagen/Ground_Rules.pdf" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Ground Rules</a></td>
 		  		</tr>
-
-		  		<tr>
-			    <td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a href="?Jahresplan" class="MenuItem" onClick="return(js_toggle_container('Jahresplan'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Jahresplan</a>
-				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Jahresplan" style="display: none">
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="private/info/jahresplan_WS2006.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Wintersemester 2006</a></td>
-					</tr>
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="private/info/jahresplan_SS2007.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Sommersemester 2007</a></td>
-					</tr>
-
-					</table>
-				</td>
-				</tr>
-				<tr>
-			    <td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a href="?Verordnungen" class="MenuItem" onClick="return(js_toggle_container('Verordnungen'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Verordnungen</a>
-				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Verordnungen" style="display: none">
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/info/verordnungen/hausordnung.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Hausordnung</a></td>
-					</tr>
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/info/verordnungen/brandschutzordnung.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Brandschutzordnung</a></td>
-					</tr>
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/info/verordnungen/benutzungsordnung_bibliothek.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bibliotheksordnung</a></td>
-					</tr>
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/info/verordnungen/EDV_Richtlinien.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;EDV Richtlinien</a></td>
-					</tr>
-					<tr>
-					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/info/verordnungen/laborordnung.doc" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Laborordnung</a></td>
-					</tr>
-					</table>
-				</td>
-				</tr>
 				</table>
 			</td>
 		</tr>
 
 		<!-- Hauptmenue Infos -->
 		<tr>
-          <td nowrap><a href="?Infos" class="MenuItem" onClick="return(js_toggle_container('Infos'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Infos</a></td>
+          <td nowrap><a href="?Infos" class="MenuItem" onClick="return(js_toggle_container('Infos'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Rektorat</a></td>
   		</tr>
 		<tr>
         	<td nowrap>
@@ -467,38 +416,64 @@
 				</td>
 			</tr>
 			<tr>
-        		<td width="10" nowrap>&nbsp;</td>
-				<td nowrap><a class="Item" href="public/linkliste.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Links</a></td>
-  			</tr>
-
-			<tr>
-				<td width="10" nowrap>&nbsp;</td>
-		        <td nowrap><a href="?Location" class="MenuItem" onClick="return(js_toggle_container('Location'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Location</a></td>
-			</tr>
-			<tr>
-				<td width="10" nowrap>&nbsp;</td>
-		        <td nowrap>
-				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Location" style="display: none">
+			    <td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a href="?Jahresplan" class="MenuItem" onClick="return(js_toggle_container('Jahresplan'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Jahresplan</a>
+				  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="Jahresplan" style="display: none">
 					<tr>
-						<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/location.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Standort</a></td>
+					  	<td width="10" nowrap>&nbsp;</td>
+						<td nowrap><a class="Item" href="private/info/jahresplan_WS2006.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;WS 2006</a></td>
 					</tr>
 					<tr>
 					  	<td width="10" nowrap>&nbsp;</td>
-						<td nowrap><a class="Item" href="public/tw_building.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Geb&auml;udeplan</a></td>
+						<td nowrap><a class="Item" href="private/info/jahresplan_SS2007.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;SS 2007</a></td>
 					</tr>
+
 					</table>
 				</td>
+			</tr>
+<!--			<tr>
+        		<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="public/linkliste.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Links</a></td>
   			</tr>
+-->
+			<tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a href="../documents/management/umgang_vielfalt" class="Item" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Umgang mit Vielfalt</a></td>
+			</tr>
+
 			</table>
 		</td>
   		</tr>
-		<!-- ************* Meine CIS ******************* -->
-  		<tr>
-			<td nowrap><a class="MenuItem" href="private/menu.php" onClick="js_toggle_container('MeineCIS');" ><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Meine CIS</a></td>
+ 		<tr>
+			<td nowrap>
+				<a href="?FAQ" class="MenuItem" onClick="return(js_toggle_container('FAQ'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;FAQ</a>
+				<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="FAQ" style="display: none">
+		  		<tr>
+		  			<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="public/faq_lan.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;LAN FAQ</a></td>
+		  		</tr>
+				<tr>
+		  			<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="public/faq_bug.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Bug Tracking FAQ</a></td>
+		  		</tr>
+		  		<tr>
+		  			<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="public/faq_upload.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Upload Lehre FAQ</a></td>
+		  		</tr>
+		  		<tr>
+			  		<td width="10" nowrap>&nbsp;</td>
+					<td nowrap><a class="Item" href="public/info/mail.html" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Einrichten des Mails</a></td>
+				</tr>
+			  	</table>
+			</td>
 		</tr>
 
-		<tr>
+		<!-- ************* Meine CIS ******************* -->
+  		<tr>
+			<td nowrap><a class="MenuItem" href="private/menu.php" ><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Mein CIS</a></td>
+		</tr>
+
+<!--		<tr>
 	       	<td nowrap>
 		  	<table width="100%"  border="0" cellspacing="0" cellpadding="0" id="MeineCIS" style="display: visible;">
 		  	<tr>
@@ -509,7 +484,7 @@
 				<td width="10" nowrap>&nbsp;</td>
 				<td nowrap><a class="Item" href="private/lvplan/stpl_week.php" target="content"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;LV-Plan</a></td>
 			</tr>
-
+-->
 <!--			<tr>
 				<td width="10" nowrap>&nbsp;</td>
 		        <td nowrap><a href="?Location" class="MenuItem" onClick="return(js_toggle_container('MeineLVs'));"><img src="../skin/images/menu_item.gif" width="7" height="9">&nbsp;Location</a></td>
diff --git a/cis/private/lehre/pinboard.php b/cis/private/lehre/pinboard.php
index f94a767da..29920bc7f 100644
--- a/cis/private/lehre/pinboard.php
+++ b/cis/private/lehre/pinboard.php
@@ -108,7 +108,11 @@
 		
 		if($news_obj->getFBNews($fachbereich_kurzbz, $datum))
 		{
-			$zaehler = print_news($news_obj);
+			if($fachbereich_kurzbz=='Senat')
+				$open=false;
+			else 
+				$open=true;
+			$zaehler = print_news($news_obj, $open);
 		}
 		else 
 			echo $news_obj->errormsg;
@@ -116,9 +120,10 @@
 		   echo '<p>Zur Zeit gibt es keine aktuellen News!</p>';
 	}
 	
-	function print_news($news_obj)
+	function print_news($news_obj, $open=true)
 	{
 		$zaehler=0;
+		echo '<br /><div id="news">';
 		foreach ($news_obj->result as $row)
 		{
 			$zaehler++;
@@ -127,17 +132,34 @@
 			else 	
 				$datum='';
 			
-			if($row->semester == '')
-			{
-				echo '<p><small>'.$datum.' - '.$row->verfasser.' - [Allgemein]</small><br><b>'.$row->betreff.'</b><br>';
-			}
-			else
-			{
-				echo '<p><small>'.$datum.' - '.$row->verfasser.' - [Semester '.$row->semester.']</small><br><b>'.$row->betreff.'</b><br>';
-			}
-			
-			echo "$row->text</p>";
+			echo '<div class="news">';
+			//if($row->semester == '')
+			//{
+			echo '
+			<div class="titel">
+			<table width="100%">
+				<tr>
+					<td width="30%" align="left">'.$row->betreff.'</td>
+					<td width="30%" align="center">'.$datum.'</td>
+					<td width="30%" align="right" style="display: '.($open?'none':'block').'" id="'.$zaehler.'Mehr" ><a href="#" class="Item" onclick="return show(\''.$zaehler.'\')">mehr &gt;&gt;</a></td>
+					<td width="30%" align="right" style="display: '.($open?'block':'none').'" id="'.$zaehler.'Verfasser">'.$row->verfasser.'</td>				
+				</tr>
+			</table>
+			</div>
+			<div class="text" style="display: '.($open?'block':'none').';" id="'.$zaehler.'Text">
+			'.$row->text.'
+			</div>
+			';
+				//echo '<div class="titel"><table style="width: 100%"><tr><td  width="30%" align="left">'.$row->betreff.' </td><td width="30%" align=center>'.$datum.'</td><td width="30%" align=right>'.$row->verfasser.'</td></tr></table></div>';
+			//}
+			//else
+			//{
+			//	echo '<div class="titel">'.$row->betreff.' [Semester '.$row->semester.'] '.$datum.' '.$row->verfasser.'</div>';
+			//}			
+			//echo '<div class="text">'.$row->text.'</div>';
+			echo "</div><br />";
 		}
+		echo '</div>';
 		return $zaehler;
 	}
 ?>
@@ -147,6 +169,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="../../../skin/cis.css" rel="stylesheet" type="text/css">
+<script language="Javascript">
+function show(id)
+{
+	document.getElementById(id+'Text').style.display = 'block';
+	document.getElementById(id+'Verfasser').style.display = 'block';
+	document.getElementById(id+'Verfasser').style.width = '100%';
+	document.getElementById(id+'Mehr').style.display = 'none';
+	return false;
+}
+</script>
 </head>
 
 <body>
@@ -155,13 +187,13 @@
     <td width="10">&nbsp;</td>
     <td><table width="100%"  border="0" cellspacing="0" cellpadding="0">
       <tr>
-        <td class="ContentHeader" width="70%"><font class="ContentHeader">&nbsp;
+        
 <?php 
 
 	//Anzeigen der Senatsbeschluesse
 	if($senat)
 	{		
-		echo 'Senatsbeschl&uuml;sse '; 
+		echo '<td class="ContentHeader" width="100%"><font class="ContentHeader">&nbsp;Senatsbeschl&uuml;sse '; 
 		echo '</font></td>';
 		echo ' </tr>';
 		
@@ -212,7 +244,7 @@
 			}
 			echo "$stsem_content<br><br>$datum_content";
 		}
-		echo '</td></tr>';
+		echo '</td><td>&nbsp;</td></tr>';
 		echo '<tr><td valign="top">';
 		//News ausgeben
 		print_FBnews($sql_conn, $fachbereich_kurzbz, $datum);
@@ -221,7 +253,7 @@
 	}
 	else 
 	{
-		echo 'Pinboard ';
+		echo '<td class="ContentHeader" width="70%"><font class="ContentHeader">&nbsp;Pinboard ';
 		
 		if(isset($short))
 			echo $short; 
diff --git a/cis/private/menu.php b/cis/private/menu.php
index 061569fc5..7e29f60e6 100644
--- a/cis/private/menu.php
+++ b/cis/private/menu.php
@@ -105,7 +105,7 @@ else
 		</tr>
 		<!-- ************* Meine CIS ******************* -->
   		<tr>
-			<td nowrap><a class="MenuItem" href="?MeineCIS" onClick="return(js_toggle_container('MeineCIS'));" target="content"><img src="../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Meine CIS</a></td>
+			<td nowrap><a class="MenuItem" href="?MeineCIS" onClick="return(js_toggle_container('MeineCIS'));" target="content"><img src="../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Mein CIS</a></td>
 		</tr>
 
 		<tr>
@@ -115,6 +115,10 @@ else
 			  	<td width="10" nowrap>&nbsp;</td>
 				<td nowrap><a class="Item" href="profile/index.php" target="content"><img src="../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Profil</a></td>
 			</tr>
+			<tr>
+			  	<td width="10" nowrap>&nbsp;</td>
+				<td nowrap><a class="Item" href="https://webmail.technikum-wien.at" target="_blank"><img src="../../skin/images/menu_item.gif" width="7" height="9">&nbsp;Webmail</a></td>
+			</tr>
 		  	<tr>
 				<td width="10" nowrap>&nbsp;</td>
 				<td nowrap><a class="Item" href="lvplan/stpl_week.php" target="content"><img src="../../skin/images/menu_item.gif" width="7" height="9">&nbsp;LV-Plan</a></td>
diff --git a/cis/public/news.php b/cis/public/news.php
index 30333bf42..4a83d086a 100644
--- a/cis/public/news.php
+++ b/cis/public/news.php
@@ -46,28 +46,47 @@
         <td>&nbsp;</td>
       </tr>
 	  	<td>
+	  	<div id="news">
 		  <?php
 		  
 		  	$news = new news($conn);
 
 		  	$news->getnews(MAXNEWSALTER,0,null);
 		  	$zaehler=0;
-		  	
+		  	$open=true;
 		  	foreach ($news->result as $row)
 		  	{		  		
 		  		$zaehler++;
 		  		//no comment
 		  		$datum = date('d.m.Y',strtotime(strftime($row->datum)));
 		  		
-				echo $datum.'&nbsp;'.$row->verfasser.'<br><br><strong>'.$row->betreff.'</strong><br>'.$row->text.'<br><br><br>
-				';
+				//echo $datum.'&nbsp;'.$row->verfasser.'<br><br><strong>'.$row->betreff.'</strong><br>'.$row->text.'<br><br><br>
+				echo '<div class="news">';
+				echo '
+					<div class="titel">
+					<table width="100%">
+						<tr>
+							<td width="30%" align="left">'.$row->betreff.'</td>
+							<td width="30%" align="center">'.$datum.'</td>
+							<td width="30%" align="right" style="display: '.($open?'none':'block').'" id="'.$zaehler.'Mehr" ><a href="#" class="Item" onclick="return show(\''.$zaehler.'\')">mehr &gt;&gt;</a></td>
+							<td width="30%" align="right" style="display: '.($open?'block':'none').'" id="'.$zaehler.'Verfasser">'.$row->verfasser.'</td>				
+						</tr>
+					</table>
+					</div>
+					<div class="text" style="display: '.($open?'block':'none').';" id="'.$zaehler.'Text">
+					'.$row->text.'
+					</div>
+					';
+				echo "</div><br />";
 			}
 				
 			
 			if($zaehler==0)
 				echo 'Zur Zeit gibt es keine aktuellen News!';
 		  ?>
+		  </div>
 		</td>
+		<td>&nbsp;</td>
 	  </tr>
     </table></td>
 	<td width="30">&nbsp;</td>
diff --git a/content/student/interessentenoverlay.xul.php b/content/student/interessentenoverlay.xul.php
index 50a135537..e4261a9a7 100644
--- a/content/student/interessentenoverlay.xul.php
+++ b/content/student/interessentenoverlay.xul.php
@@ -49,7 +49,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdetailoverlay.x
 						<toolbar id="nav-toolbar">
 						<toolbarbutton id="interessent-toolbar-neu" label="Neu" oncommand="InteressentNeu()" disabled="false" image="../skin/images/NeuDokument.png" tooltiptext="Interessent neu anlegen" />
 						<toolbarbutton id="interessent-toolbar-zubewerber" label="-> Bewerber" oncommand="InteressentzuBewerber()" disabled="false" tooltiptext="Interessent zum Bewerber machen" />
-						<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="" disabled="true" tooltiptext="Bewerber zu Studenten machen" />
+						<toolbarbutton id="interessent-toolbar-zustudent" label="-> Student" oncommand="InteressentzuStudent()" disabled="false" tooltiptext="Bewerber zu Studenten machen" />
 						<toolbarbutton id="interessent-toolbar-refresh" label="Aktualisieren" oncommand="InteressentTreeRefresh()" disabled="false" image="../skin/images/refresh.png" tooltiptext="Liste neu laden"/>
 						<spacer flex="1"/>
 						<label id="interessent-toolbar-label-anzahl"/>
diff --git a/content/student/interessentoverlay.js.php b/content/student/interessentoverlay.js.php
index 0717417a1..8cf1c754e 100644
--- a/content/student/interessentoverlay.js.php
+++ b/content/student/interessentoverlay.js.php
@@ -638,6 +638,53 @@ function InteressentzuBewerber()
 
 	var val =  new ParseReturnValue(response)
 	
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response)
+		else
+			alert(val.dbdml_errormsg)
+	}
+	else
+	{
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		
+		InteressentSelectId=prestudent_id;
+		InteressentTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+	}
+}
+
+// ****
+// * macht aus einem Bewerber einen Studenten
+// * Voraussetzungen:
+// *	- ZGV muss ausgefuellt sein (bei Master beide)
+// *	- Kaution muss bezahlt sein
+// *	- Rolle Bewerber muss existieren
+// * Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
+// * und UID generiert und der Studentendatensatz angelegt.
+// ****
+function InteressentzuStudent()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('interessent-tree');
+
+	//Wenn kein Interessent ausgewaehlt ist, dann abbrechen
+	if (tree.currentIndex==-1) return;
+		
+	prestudent_id = document.getElementById('interessent-prestudent-textbox-prestudent_id').value;
+
+	var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
+	var req = new phpRequest(url,'','');
+		
+	req.add('type', 'BewerberZuStudent');
+	
+	req.add('prestudent_id', prestudent_id);
+	
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+	
 	if (!val.dbdml_return)
 	{
 		if(val.dbdml_errormsg=='')
diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 7a5923437..a6975308e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -37,6 +37,7 @@ require_once('../../include/person.class.php');
 require_once('../../include/benutzer.class.php');
 require_once('../../include/student.class.php');
 require_once('../../include/prestudent.class.php');
+require_once('../../include/studiengang.class.php');
 
 $user = get_uid();
 
@@ -60,6 +61,76 @@ if(!$rechte->isBerechtigt('admin'))
 	$error = true;
 }
 	
+// *** FUNKTIONEN ***
+
+// ****
+// * Generiert die Matrikelnummer
+// * FORMAT: 0710254001
+// * 07 = Jahr
+// * 1/2/0  = WS/SS/Incomming
+// * 0254 = Studiengangskennzahl vierstellig
+// * 001 = Laufende Nummer
+// ****
+function generateMatrikelnummer($conn, $studiengang_kz, $studiensemester_kurzbz)
+{
+	$jahr = substr($studiensemester_kurzbz, 4);	
+	$art = substr($studiensemester_kurzbz, 0, 2);
+	switch($art)
+	{
+		case 'WS': $art = '1'; break;
+		case 'SS': $art = '2'; break;
+		default: $art = '0'; break;
+	}
+	if($art=='2')
+		$jahr = $jahr-1;
+	$matrikelnummer = sprintf("%02d",$jahr).$art.sprintf("%04d",$studiengang_kz);
+	
+	$qry = "SELECT matrikelnr FROM public.tbl_student WHERE matrikelnr LIKE '$matrikelnummer%' ORDER BY matrikelnr DESC LIMIT 1";
+	
+	if($result = pg_query($conn, $qry))
+	{
+		if($row = pg_fetch_object($result))
+		{
+			$max = substr($row->matrikelnr,7);
+		}
+		else 
+			$max = 0;
+		
+		$max += 1;
+		return $matrikelnummer.sprintf("%03d",$max);
+	}
+	else 
+	{
+		return false;
+	}
+}
+
+// ****
+// * Generiert die UID
+// * FORMAT: el07b001
+// * el = studiengangskuerzel
+// * 07 = Jahr
+// * b/m/d/x = Bachelor/Master/Diplom/Incomming
+// * 001 = Laufende Nummer ( Wenn StSem==SS dann wird zur nummer 500 dazugezaehlt)
+// ****
+function generateUID($conn, $matrikelnummer)
+{
+	$jahr = substr($matrikelnummer,0, 2);
+	$art = substr($matrikelnummer, 2, 1);
+	$stg = substr($matrikelnummer, 3, 4);
+	$nr = substr($matrikelnummer, 7);
+	
+	if($art=='2')
+		$nr = $nr+500;
+	
+	$stg_obj = new studiengang($conn);
+	$stg_obj->load(ltrim($stg,'0'));
+	
+	return $stg_obj->kurzbz.$jahr.($art!='0'?$stg_obj->typ:'x').$nr;	
+}
+// ***
+
+
 if(!$error)
 {
 	
@@ -259,7 +330,8 @@ if(!$error)
 				if($prestd->getLastStatus($_POST['prestudent_id']))
 				{
 					$hlp = new prestudent($conn);
-					if($hlp->getPrestudentRolle($_POST['prestudent_id'], $_POST['rolle_kurzbz'], $prestd->studiensemester_kurzbz))
+					$hlp->getPrestudentRolle($_POST['prestudent_id'], $_POST['rolle_kurzbz'], $prestd->studiensemester_kurzbz);
+					if(count($hlp->result)>0)
 					{
 						$errormsg = 'Diese Rolle ist bereits vorhanden';
 						$return = false;
@@ -284,7 +356,6 @@ if(!$error)
 						{
 							$return = false;
 							$errormsg = $prestd_neu->errormsg;
-							$error = true;
 						}
 					}
 				}
@@ -292,14 +363,88 @@ if(!$error)
 				{
 					$return = false;
 					$errormsg = 'Es ist keine Rolle fuer diesen Prestudent vorhanden';
-					$error = true;
 				}
 			}
 			else 
 			{
 				$return = false;
 				$errormsg = 'Prestudent_id muss angegeben werden';
-				$error = true;
+			}
+		}
+	}
+	elseif(isset($_POST['type']) && $_POST['type']=='BewerberZuStudent')
+	{
+		// macht aus einem Bewerber einen Studenten
+		// Voraussetzungen:
+		// - ZGV muss ausgefuellt sein (bei Master beide)
+		// - Kaution muss bezahlt sein
+		// - Rolle Bewerber muss existieren
+		// Wenn die Voraussetzungen erfuellt sind, dann wird die Matrikelnr
+		// und UID generiert und der Studentendatensatz angelegt.
+
+		if(!$error)
+		{
+			if(isset($_POST['prestudent_id']))
+			{
+				$prestd = new prestudent($conn);
+				if($prestd->load($_POST['prestudent_id']))
+				{
+					if($prestd->zgv_code!='')
+					{
+						$stg = new studiengang($conn);
+						$stg->load($prestd->studiengang_kz);
+						
+						if($stg->typ=='m' && $prestd->zgvmas_code=='')
+						{
+							$return = false;
+							$errormsg = 'ZGV Master muss eingegeben werden';
+						}
+						else 
+						{
+							//Pruefen ob die Rolle Bewerber existiert
+							$hlp = new prestudent($conn);
+							$hlp->getPrestudentRolle($_POST['prestudent_id'], 'Bewerber');
+						
+							if(count($hlp->result)>0)
+							{
+								//pruefen ob die Kaution bezahlt wurde
+								//??
+																
+								//Matrikelnummer und UID generieren
+								$matrikelnr = generateMatrikelnummer($conn, $prestd->studiengang_kz, $hlp->result[0]->studiensemester_kurzbz);
+								$uid = generateUID($conn, $matrikelnr);
+								
+								$return = false;
+								$errormsg = "Matrikelnummer: $matrikelnr, UID: $uid";
+								
+								//Benutzerdatensatz anlegen
+								//Studentendatensatz anlegen
+								//Prestudentrolle hinzugfuegen
+								//Eintrag tbl_studentlehrverband??
+							}
+							else 
+							{
+								$return = false;
+								$errormsg = 'Die Person muss zuerst Bewerber sein bevor Sie zum Studenten gemacht werden kann';
+							}
+						}
+					}
+					else 
+					{
+						$return = false;
+						$errormsg = 'ZGV muss eingegeben werden';
+					}
+				}
+				else 
+				{
+					$return = false;
+					$errormsg = 'Prestudent wurde nicht gefunden';
+				}
+			}
+			else 
+			{
+				$return = false;
+				$errormsg = 'Prestudent_id muss angegeben werden';
 			}
 		}
 	}
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index d7828f101..4e0a510bc 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -352,7 +352,7 @@ class prestudent extends person
 		if($studiensemester_kurzbz!=null)
 			$qry.= " AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'";
 		$qry.= " ORDER BY datum, insertamum";
-
+		
 		if($result = pg_query($this->conn, $qry))
 		{
 			while($row = pg_fetch_object($result))
diff --git a/skin/cis.css b/skin/cis.css
index 94e043a22..8a8378493 100644
--- a/skin/cis.css
+++ b/skin/cis.css
@@ -313,15 +313,33 @@ h4
 	text-decoration: none; 
 }
 
-#News
+#news
 {
 }
 
-#News div
+#news .news
 {
+	//-moz-border-radius-topright: 20px;
+	-moz-border-radius-topleft: 10px;
+	width: 100%;
+	border: 1px solid #E0E0E0;
+	background-color: #F0F0F0;
 	
 }
 
+#news .news .titel
+{
+	font-weight: bold;
+	font-size: normal;
+	padding: 0px 10px 0px 10px;
+}
+
+#news .news .text
+{
+	background-color: #FCFCFC;
+	padding: 0px 10px 0px 10px;
+}
+
 #GlobalMenu
 {
 	margin-top: 3px;
diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index 38823a9bc..348997a63 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -105,6 +105,10 @@ $person_id = (isset($_POST['person_id'])?$_POST['person_id']:'');
 $ueberschreiben = (isset($_POST['ueberschreiben'])?$_POST['ueberschreiben']:'');
 //end Parameter
 
+//Testphase fix
+if($studiengang_kz!='' && $studiengang_kz!='257')
+	die('Keine Berechtigung zum Importieren');
+//end Testphase
 
 // *** Speichern der Daten ***
 if(isset($_POST['save']))