Anpassungen an CIS-Redesign

index.php: Feature Semesterpläne Archiv, Autocomplete Lektor/Student
2026-06-01 12:19:28 +00:00 · 2013-07-19 14:04:49 +00:00
parent b563a0773d
commit 84c5c3972c
5 changed files with 323 additions and 101 deletions
@@ -19,16 +19,42 @@
 *          Andreas Oesterreicher 	< andreas.oesterreicher@technikum-wien.at >
 *          Rudolf Hangl 		< rudolf.hangl@technikum-wien.at >
 *          Gerald Simane-Sequens 	< gerald.simane-sequens@technikum-wien.at >
+ *          Manfred Kindl <manfred.kindl@technikum-wien.at>
 */
 
 require_once('../../../config/cis.config.inc.php');
 require_once('../../../include/basis_db.class.php');
 require_once('../../../include/functions.inc.php');
-require_once('../../../include/phrasen.class.php'); 
+require_once('../../../include/phrasen.class.php');
+require_once('../../../include/studiensemester.class.php'); 
+require_once('../../../include/benutzer.class.php');
+require_once('../../../include/benutzerberechtigung.class.php');
  	  	
 $sprache = getSprache(); 
 $p=new phrasen($sprache); 

+$uid=get_uid();
+$berechtigung=new benutzerberechtigung();
+$berechtigung->getBerechtigungen($uid);
+if ($berechtigung->isBerechtigt('lehre/reservierung:begrenzt', null, 'sui'))
+	$raumres=true;
+else
+	$raumres=false;
+
+/*$benutzer = new benutzer(); 
+
+foreach($benutzer->result as $row)
+{
+	$item['vorname']=html_entity_decode($row->vorname);
+	$item['nachname']=html_entity_decode($row->nachname);
+	$item['uid']=html_entity_decode($row->uid);
+	$item['mitarbeiter_uid']=html_entity_decode($row->mitarbeiter_uid);
+	$result_obj[]=$item;
+}
+echo $benutzer;*/
+
+//echo json_encode($result_obj);
+
 if (!$db = new basis_db())
 	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
  
@@ -36,7 +62,6 @@ if (!$uid=get_uid())
 	die('Sie sind nicht angemeldet. Es wurde keine Benutzer UID gefunden ! <a href="javascript:history.back()">Zur&uuml;ck</a>');
 	

-	
 $sql_query="SELECT titelpre, titelpost, uid, nachname, vorname FROM campus.vw_benutzer WHERE uid LIKE '$uid'";
 	//echo $sql_query;
 $result=$db->db_query($sql_query);
@@ -62,112 +87,166 @@ else
 $sql_query="SELECT studiengang_kz, kurzbz, kurzbzlang, bezeichnung, typ FROM public.tbl_studiengang WHERE aktiv ORDER BY typ, kurzbz";
 $result_stg=$db->db_query($sql_query);
 if(!$result_stg)
-	die ("Studiengang not found!");
-	
+	die ("Studiengang not found!");	
 $num_rows_stg=$db->db_num_rows($result_stg);
+
 $sql_query="SELECT ort_kurzbz, bezeichnung FROM public.tbl_ort WHERE aktiv AND lehre ORDER BY ort_kurzbz";
 $result_ort=$db->db_query($sql_query);
 if(!$result_ort)
-  	die("ort not found!");
-  	
+  	die("ort not found!");  	
 $num_rows_ort=$db->db_num_rows($result_ort);
-$sql_query="SELECT uid, kurzbz FROM campus.vw_mitarbeiter ORDER BY kurzbz";
+
+/*$sql_query="SELECT student_uid FROM public.tbl_student ORDER BY student_uid";
 $result_lektor=$db->db_query($sql_query);
 if(!$result_lektor)
 	die("lektor not found!");
 	
-$num_rows_lektor=$db->db_num_rows($result_lektor);
+$num_rows_lektor=$db->db_num_rows($result_lektor);*/
+
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Lehrveranstaltungsplan</title>
-<script language="JavaScript">
-<!--
+<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
+<link href="../../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">
+<link href="../../../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
+<script src="../../../include/js/flexcroll.js" type="text/javascript" ></script>
+<script src="../../../include/js/jquery1.9.min.js" type="text/javascript"></script>
+<script type="text/javascript" language="JavaScript">
+
 function MM_jumpMenu(targ,selObj,restore){ //v3.0
  eval(targ+".location='"+selObj.options[selObj.selectedIndex].value+"'");
  if (restore) selObj.selectedIndex=0;
 }
-//-->
+function jumpKalender(){
+	if (document.getElementById('stg_kz_semplan').value == '') {
+	    alert("<?php echo $p->t('lvplan/bitteEinenStudiengangAuswaehlen');?>");
+	  }
+	else if (document.getElementById('studiensemester').value == '') {
+	    alert("<?php echo $p->t('lvplan/bitteEinStudiensemesterAuswaehlen');?>");
+	  } 
+	  else {window.open ('stpl_kalender.php?type=verband&stg_kz='+document.getElementById('stg_kz_semplan').value+'&sem='+document.getElementById('sem').value
+			+'&ver='+document.getElementById('ver').value+'&grp='+document.getElementById('grp').value+'&begin='+document.getElementById('studiensemester').value+'&format=html', '_blank');
+	  }
+}
+function checkSetStudiengang(){
+	if (document.getElementById('stg_kz').value == '') {
+		alert("<?php echo $p->t('lvplan/bitteEinenStudiengangAuswaehlen');?>");
+		return false;
+	}
+	else
+		return true;
+}
+function checkSetBenutzer(){
+	if (document.getElementById('benutzer').value == '') {
+		alert("<?php echo $p->t('lvplan/bitteEinenLektorAuswaehlen');?>");
+		return false;
+	}
+	else
+		return true;
+}
+
+$(document).ready(function() 
+	{ 
+	    $("#benutzer").autocomplete({
+			source: "lvplan_autocomplete.php?autocomplete=benutzer",
+			minLength:2,
+			response: function(event, ui)
+			{
+				//Value und Label fuer die Anzeige setzen
+				for(i in ui.content)
+				{
+					ui.content[i].value=ui.content[i].vorname+" "+ui.content[i].nachname+" ("+ui.content[i].uid+")";
+					ui.content[i].label=ui.content[i].vorname+" "+ui.content[i].nachname+" ("+ui.content[i].uid+")";
+				}
+			},
+			select: function(event, ui)
+			{
+				//Ausgeaehlte Ressource zuweisen und Textfeld wieder leeren
+				if (ui.item.mitarbeiter_uid=='')
+				{
+					$("#mitarbeiter_uid").val(ui.item.uid);
+					document.getElementById("uid").disabled=false;
+				}
+				else
+				{
+					$("#mitarbeiter_uid").val(ui.item.uid);
+					document.getElementById("uid").disabled=true;
+				}
+			}
+			});
+	});
 </script>
-<link href="../../../skin/style.css.php" rel="stylesheet" type="text/css">
 </head>

-<BODY id="inhalt">
-<font size="2">
-	<table class="tabcontent">
-		<tr>
-			<td class="ContentHeader"><font class="ContentHeader">&nbsp;<?php echo $p->t("lvplan/lehrveranstaltungsplan");?></font></td>
-			<td align="right" class="ContentHeader"><A href="../../../cms/content.php?content_id=<?php echo $p->t('dms_link/lvPlanFAQ');?>" class="hilfe" target="_blank"><font class="ContentHeader">HELP&nbsp;</font></A></td>
-		</tr>
-	</table>
-	Username:
+<body id="inhalt">
+<div class="flexcroll" style="outline: none;">
+<h1><?php echo $p->t("lvplan/lehrveranstaltungsplan");?></h1>
+<table class="cmstable" cellspacing="0" cellpadding="0">
+<tbody>
+<tr>
+<td class="cmscontent" rowspan="3" valign="top">
+
 	<?php
 		if (isset($uid))
-			echo $uid;
+			echo '<h2>'.$titelpre.' '.$vornamen." ".$nachname.' '.$titelpost.'</h2>';
 		else
 			echo $p->t('lvplan/nichtVorhanden').' '.$p->t('lvplan/bitteWendenSieSichAn').'<A href="mailto:'.MAIL_ADMIN.'">Admin</A>!';
-	?><BR>
-  	<DIV align="left">
-  		<a class="Item" href="stpl_week.php?pers_uid=<?php echo $uid; ?>"><?php echo $titelpre.' '.$vornamen." ".$nachname.' '.$titelpost;?></a>
-		&nbsp; -> <?php echo $p->t("lvplan/persoenlicherLvPlan");?><BR>
-		<a class="Item" href="../profile/index.php"><?php echo $p->t("lvplan/profil");?></a>	
-		&nbsp; -> <?php echo $p->t("lvplan/stammdatenKontrollieren")?><BR>
-	</DIV>
-	<BR>
+	?>
+  	<a class="Item" href="stpl_week.php?pers_uid=<?php echo $uid; ?>"><?php echo $p->t("lvplan/persoenlicherLvPlan");?></a>
+	<BR><BR>
 	<FORM name="Auswahl" action="stpl_week.php">
 		<table class="tabcontent">
 		<tr>
-			<td width="50%" class="ContentHeader2">
-				&nbsp;<?php echo $p->t("lvplan/saalplan"); ?>
+			<td width="30%">
+				<h2><?php echo $p->t("lvplan/saalplan")." (".$p->t("lvplan/saalreservierung"); ?>)</h2>
 			</td>
-			<td width="50%" class="ContentHeader2">
-				&nbsp;<?php echo $p->t("lvplan/lektorenplan"); ?>
+			<td>
+				<h2><?php echo $p->t("lvplan/lektorInStudentIn"); ?></h2>
 			</td>
 		</tr>
 		<tr>
-			<td>
-			<BR>
-			<?php echo $p->t('lvplan/saal');?>
-			<select name="select" onChange="MM_jumpMenu('self',this,0)">
-        		<option value="stpl_week.php" selected>... ??? ...</option>
+			<td valign="top">
+			<select name="select" style="width:200px;" onChange="MM_jumpMenu('self',this,0)">
+        		<option value="stpl_week.php" selected><?php echo $p->t('lvplan/raumAuswaehlen'); ?></option>
        	  	<?php
 				for ($i=0;$i<$num_rows_ort;$i++)
 				{
 					$row=$db->db_fetch_object ($result_ort, $i);
-					echo "<option value=\"stpl_week.php?type=ort&ort_kurzbz=$row->ort_kurzbz\">$row->ort_kurzbz ($row->bezeichnung)</option>";
+					echo "<option value=\"stpl_week.php?type=ort&amp;ort_kurzbz=$row->ort_kurzbz\">$row->ort_kurzbz ($row->bezeichnung)</option>";
 				}
 				?>
 			</select>
-			(<?php echo $p->t("lvplan/saalreservierung"); ?>)<BR><BR>
-			<A class="Item" href="stpl_reserve_list.php"><?php echo $p->t('lvplan/reservierungsliste'); ?></A> (<?php echo $p->t('lvplan/reservierungenLoeschen'); ?>)<BR>
-			<A class="Item" href="raumsuche.php"><?php echo $p->t('lvplan/raumsuche'); ?></A><BR>
+			<?php 
+			if ($raumres)
+			{
+				echo '<BR><BR><A class="Item" href="stpl_reserve_list.php">'.$p->t("lvplan/reservierungenLoeschen").'</A><BR>';
+				//echo '<A class="Item" href="raumsuche.php">'.$p->t('lvplan/raumsuche').'</A><BR>'; Findet sich nun rechts in der menubox
+			}			
+			?>
 			</td>
-
 			<td valign="top">
-			<br>
-			<?php echo $p->t('lvplan/lektor'); ?>
-	  		<select name="lektor" onChange="MM_jumpMenu('self',this,0)">
-			    	<option value="stpl_week.php" selected>... ??? ...</option>
-			    	<?php
-				for ($i=0;$i<$num_rows_lektor;$i++)
-				{
-					$row=$db->db_fetch_object ($result_lektor, $i);
-					echo "<option value=\"stpl_week.php?type=lektor&pers_uid=$row->uid\">$row->kurzbz</option>";
-				}
-				?>
-			</select>
+			<?php
+			echo "<input class='search' placeholder='Name eingeben' type='text' id='benutzer' size='32' value=''>";
+			echo "<input type='hidden' id='mitarbeiter_uid' name='pers_uid'>";
+			echo "<input type='hidden' id='uid' name='type' value='student'>";			
+			echo "<input type='submit' value='Go' onclick='return checkSetBenutzer();'>";
+			?>
 			</td>
 		</tr>
 		</table>
-		<br><br>
-		<table class="tabcontent"><tr><td class="ContentHeader2">&nbsp;<?php echo $p->t('lvplan/lehrverband');?></td></tr></table>
-		<table width="40%" border="0" cellpadding="0" cellspacing="3">
-		<tr nowrap>
+		</FORM>
+		<br>
+		<FORM name="Auswahl" action="stpl_week.php">
+		<table class="tabcontent"><tr><td><h2><?php echo $p->t('lvplan/lehrverband');?></h2></td></tr></table>
+		<table width="10%" border="0" cellpadding="0" cellspacing="3">
+		<tr>
 		<td width="20%" valign="middle">
-			<?php echo $p->t('global/studiengang'); ?><BR>
-			<select name="stg_kz" >
+			<select style="width:200px;" id="stg_kz" name="stg_kz">
+				<option value="" selected><?php echo $p->t('lvplan/studiengangAuswaehlen');?></option>
 				<?php
 				$num_rows=$db->db_num_rows($result_stg);
 				for ($i=0;$i<$num_rows;$i++)
@@ -179,8 +258,8 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 			</select>
 		</td>
 		<td valign="middle">
-			<?php echo $p->t('lvplan/sem');?><BR>
 			<select name="sem">
+			<option value="01"><?php echo $p->t('lvplan/sem');?></option>
 			<option value="1">1</option>
 			<option value="2">2</option>
 			<option value="3">3</option>
@@ -192,9 +271,8 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 			</select>
 		</td>
 		<td valign="middle">
-			<?php echo $p->t('lvplan/ver');?><BR>
-			<select name="ver" >
-			<option value="0" selected>*</option>
+			<select name="ver">
+			<option value="0" selected><?php echo $p->t('lvplan/ver');?></option>
 			<option value="A">A</option>
 			<option value="B">B</option>
 			<option value="C">C</option>
@@ -205,31 +283,113 @@ function MM_jumpMenu(targ,selObj,restore){ //v3.0
 			</select>
 		</td>
 		<td valign="middle" >
-			<?php echo $p->t('lvplan/grp');?><BR>
 			<select name="grp">
-			<option value="0" selected>*</option>
+			<option value="0" selected><?php echo $p->t('lvplan/grp');?></option>
 			<option value="1">1</option>
 			<option value="2">2</option>
 			<option value="3">3</option>
 			<option value="4">4</option>
+			<option value="4">5</option>
+			<option value="4">6</option>
 			</select>
 		</td>
-		<TD valign="bottom">
-			<INPUT type="hidden" name="type" value="verband">
-			<INPUT type="submit" name="Abschicken" value="Go">
-		</TD>
+		<td valign="bottom">
+			<input type="hidden" name="type" value="verband">
+			<input type="submit" name="Abschicken" value="Go" onclick="return checkSetStudiengang();">
+		</td>
 		</tr>
 		</table>
 	</form>
-	<a class="Item" href="verband_uebersicht.php"><?php echo $p->t('lvplan/lehrverbaende')?></a> -> <?php echo $p->t('lvplan/uebersichtDerLehrverbaende');?><BR>
-<BR><BR><HR>
-<P><?php echo $p->t('lvplan/fehlerUndFeedback');?> <A class="Item" href="mailto:<?php echo MAIL_LVPLAN?>"><?php echo $p->t('lvplan/lvKoordinationsstelle');?></A>.</P>
-<!--
-<P class=little>
-    Erstellt am 24.8.2001 von <A href="mailto:pam@technikum-wien.at">Christian Paminger</A>.<BR>
-    Letzte &Auml;nderung am 11.1.2005 von <A href="mailto:pam@technikum-wien.at">Christian Paminger</A>.
-</P>
-->
-</font>
+	<br>
+	<!--<a class="Item" href="verband_uebersicht.php"><?php echo $p->t('lvplan/uebersichtDerLehrverbaende');?></a><BR>  Auskommentiert, da vemutlich nicht mehr benötigt-->
+	
+<form name="Auswahl" action="stpl_kalender.php">
+		<table class="tabcontent"><tr><td><h2><?php echo $p->t('lvplan/semesterplaenearchiv');?></h2></td></tr></table>
+		<table border="0" cellpadding="0" cellspacing="3">
+		<tr>
+		<td valign="bottom">
+			<select style="width:200px;" name="stg_kz_semplan" id="stg_kz_semplan">
+				<option value="" selected><?php echo $p->t('lvplan/studiengangAuswaehlen');?></option>
+				<?php
+				$num_rows=$db->db_num_rows($result_stg);
+				for ($i=0;$i<$num_rows;$i++)
+				{
+					$row=$db->db_fetch_object ($result_stg, $i);
+					echo '<option value="'.$row->studiengang_kz.'">'.strtoupper($row->typ.$row->kurzbz)." ( $row->kurzbzlang - $row->bezeichnung )</option>";
+				}
+				?>
+			</select>
+		</td>
+		<td valign="middle">
+			<select name="sem" id="sem">
+			<option value="01"><?php echo $p->t('lvplan/sem');?></option>
+			<option value="1">1</option>
+			<option value="2">2</option>
+			<option value="3">3</option>
+			<option value="4">4</option>
+			<option value="5">5</option>
+			<option value="6">6</option>
+			<option value="7">7</option>
+			<option value="8">8</option>
+			</select>
+		</td>
+		<td valign="middle">
+			<select name="ver" id="ver">
+			<option value="0" selected><?php echo $p->t('lvplan/ver');?></option>
+			<option value="A">A</option>
+			<option value="B">B</option>
+			<option value="C">C</option>
+			<option value="D">D</option>
+			<option value="E">E</option>
+			<option value="F">F</option>
+			<option value="V">V</option>
+			</select>
+		</td>
+		<td valign="middle" >
+			<select name="grp" id="grp">
+			<option value="0" selected><?php echo $p->t('lvplan/grp');?></option>
+			<option value="1">1</option>
+			<option value="2">2</option>
+			<option value="3">3</option>
+			<option value="4">4</option>
+			<option value="4">5</option>
+			<option value="4">6</option>
+			</select>
+		</td></tr><tr>
+		<td valign="middle" >
+		<?php
+		$studiensemester = new studiensemester();
+		$studiensemester->getFinished();	
+				
+		echo '<SELECT style="width:200px;" name="begin" id="studiensemester">';
+		echo '<OPTION value="" selected>'.$p->t('lvplan/studiensemesterAuswaehlen').'</OPTION>';
+		foreach($studiensemester->studiensemester as $row)
+				{
+					$studiensemester->getTimestamp($row->studiensemester_kurzbz);
+					echo '<OPTION value="'.$studiensemester->begin->start.'&amp;ende='.$studiensemester->ende->ende.'">'.$row->studiensemester_kurzbz.'</OPTION>';
+				}
+				
+		echo '</SELECT>';
+		?>
+		</td>
+		<td colspan="3" valign="bottom">
+			<input type="button" name="Abschicken" value="<?php echo $p->t('lvplan/semesterplanLaden');?>" onClick="jumpKalender()">
+		</td>
+		</tr>
+		</table>
+	</form>
+</td>
+<td class="menubox">
+<p><a href="raumsuche.php"><?php echo $p->t('lvplan/raumsuche');?></a></p>
+<p><a class="Item" href="mailto:<?php echo MAIL_LVPLAN?>"><?php echo $p->t('lvplan/fehlerUndFeedback');?></a></p>
+<p><a href="../../../cms/content.php?content_id=<?php echo $p->t('dms_link/lvPlanFAQ');?>" class="hilfe" target="_blank"><?php echo $p->t('global/hilfe');?></a></p>
+</td>
+</tr>
+<tr>
+<td class="teambox" style="width: 20%;"></td>
+</tr>
+</tbody>
+</table>
+</div>
 </body>
 </html>
@@ -0,0 +1,51 @@
+<?php
+/* Copyright (C) 2010 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: Manfred Kindl <kindlm@technikum-wien.at>
+ */
+
+require_once('../../../config/vilesci.config.inc.php');
+require_once('../../../include/basis_db.class.php');
+require_once('../../../include/benutzer.class.php'); 
+	
+if (!$db = new basis_db())
+    die('Es konnte keine Verbindung zum Server aufgebaut werden.');
+
+if(isset($_REQUEST['autocomplete']) && $_REQUEST['autocomplete']=='benutzer')
+{
+	$search=trim((isset($_REQUEST['term']) ? $_REQUEST['term']:''));
+	if (is_null($search) ||$search=='')
+		exit();	
+    
+    $benutzer = new benutzer(); 
+	$searchItems = explode(' ',$search);
+	if($benutzer->search($searchItems))
+	{
+		$result_obj = array();
+		foreach($benutzer->result as $row)
+		{
+			$item['vorname']=html_entity_decode($row->vorname);
+			$item['nachname']=html_entity_decode($row->nachname);
+			$item['uid']=html_entity_decode($row->uid);
+			$item['mitarbeiter_uid']=html_entity_decode($row->mitarbeiter_uid);
+			$result_obj[]=$item;
+		}
+		echo json_encode($result_obj);
+	}
+	exit;
+}
+?>
@@ -46,6 +46,8 @@ echo '
 	<link rel="stylesheet" href="../../../skin/jquery.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css"/>
 	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
+	<link rel="stylesheet" href="../../../skin/flexcrollstyles.css" type="text/css" />
+	<script type="text/javascript" src="../../../include/js/flexcroll.js"></script> 
 	<script type="text/javascript" src="../../../include/js/jquery.js"></script>
 	<script language="Javascript">
 	
@@ -56,6 +58,8 @@ echo '
 			sortList: [[0,0]],
 			widgets: ["zebra"]
 		});
+		
+		$( "#datum" ).datepicker($.datepicker.regional["de"]);
 	}); 
 	
 	function checkdata()
@@ -87,18 +91,16 @@ echo '
 	}
 	</script>
 </head>
-<body id="inhalt">
-	<H1>
-		<a class="Item" href="index.php">'.$p->t('lvplan/lehrveranstaltungsplan').'</a>
-		&gt;&gt; '.$p->t('lvplan/raumsuche').'
-	</H1>
+<body>
+	<h1>'.$p->t('lvplan/raumsuche').'</h1>
+	<p><a href="index.php">'.$p->t('lvplan/lehrveranstaltungsplan').'</a></p>
 ';

 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="POST" onsubmit="return checkdata()">
 		'.$p->t('global/datum').'* <input type="text" name="datum" id="datum" size="10" value="'.$datum.'">
 		'.$p->t('global/von').'* <input type="text" name="vonzeit" id="vonzeit" size="5" value="'.$vonzeit.'">
 		'.$p->t('global/bis').'* <input type="text" name="biszeit" id="biszeit" size="5" value="'.$biszeit.'">
-		'.$p->t('lvplan/raumtyp').': <SELECT name="raumtyp">
+		'.$p->t('lvplan/raumtyp').' <SELECT name="raumtyp" style="width: 100px;">
 		<OPTION value="">'.$p->t('global/alle').'</OPTION>';
 $raumtyp_obj = new raumtyp();
 $raumtyp_obj->getAll();
@@ -110,7 +112,7 @@ foreach ($raumtyp_obj->result as $row)
 	else 
 		$selected='';
 		
-	echo '<OPTION value="'.$row->raumtyp_kurzbz.'" '.$selected.'>'.$row->raumtyp_kurzbz.'</OPTION>';
+	echo '<OPTION value="'.$row->raumtyp_kurzbz.'" '.$selected.'>'.$row->beschreibung.'</OPTION>';
 }
 echo '	</SELECT>
 		'.$p->t('lvplan/anzahlPersonen').' <input type="text" size="3" name="anzahlpersonen" value="'.$anzahlpersonen.'">
@@ -168,7 +170,7 @@ if($sent)
 		{
 			echo '<br><table class="tablesorter" id="myTable" style="width: auto">
 			<thead>
-				<tr class="liste">
+				<tr>
 					<th>'.$p->t('lvplan/raum').'</th>
 					<th>'.$p->t('global/bezeichnung').'</th>
 					<th>'.$p->t('global/nummer').'</th>
@@ -182,7 +184,7 @@ if($sent)
 			foreach ($ort->result as $row)
 			{
 				$i++;
-				echo '<tr class="liste'.($i%2).'">';
+				echo '<tr>';
 				echo '<td><a href="'.RAUMINFO_PATH.$row->ort_kurzbz.'.html" class="Item" title="'.$p->t('lvplan/rauminfoAnzeigen').'">'.$row->ort_kurzbz.'</td>';
 				echo "<td>$row->bezeichnung</td>";
 				echo "<td>$row->planbezeichnung</td>";
@@ -195,4 +197,5 @@ if($sent)
 		}
 	}
 }
+echo '</body></html>';
 ?>
@@ -163,7 +163,8 @@ else
 	echo '<head>';
 	echo '<title>'.$p->t('global/kalender').'</title>';
 	echo '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
-	echo '<link rel="stylesheet" href="../../../skin/cis.css" type="text/css">';
+	echo '<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">';
+	echo '<link rel="stylesheet" media="print" href="../../../skin/cis.css" type="text/css">';
 	echo '<link rel="stylesheet" type="text/css" media="print" href="../../../skin/print.css" />';
 	echo '</head>';
 	echo '<body id="inhalt">';
@@ -56,16 +56,22 @@ $uid=get_uid();
 		-->
 	</script>
 	<LINK rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
+	<link href="../../../skin/flexcrollstyles.css" rel="stylesheet" type="text/css" />
+	<script src="../../../include/js/flexcroll.js" type="text/javascript" ></script>
 </HEAD>

 <BODY id="inhalt">
-<H2><table class="tabcontent">
-	<tr>
-	<td>&nbsp;<a class="Item" href="index.php"><?php echo $p->t('lvplan/lehrveranstaltungsplan');?></a> &gt;&gt; <?php echo $p->t('lvplan/wochenplan');?></td>
-	<td align="right"><A href="../../../cms/content.php?content_id=<?php echo $p->t('dms_link/lvPlanFAQ');?>" class="hilfe" target="_blank">HELP&nbsp;</A></td>
-	</tr>
-	</table>
-</H2>
+<div class="flexcroll" style="outline: none;">
+<h1><?php echo $p->t('lvplan/wochenplan');?></h1>
+<table class="tabcontent">
+<tr>
+<td>
+<a href="index.php"><?php echo $p->t('lvplan/hauptmenue');?></a><br>
+<?php echo '<a href="../../../cms/content.php?content_id='.$p->t("dms_link/lvPlanFAQ").'" class="hilfe" target="_blank">'.$p->t("global/hilfe").'</a>'; ?>
+</td>
+</tr>
+</table>
+
 <?php
 /****************************************************************************
 * Script: 			stpl_week.php
@@ -304,7 +310,8 @@ $stdplan->draw_week($raumres,$uid);
 if (isset($count))
 	echo "Es wurde".($count!=1?'n':'')." $count Stunde".($count!=1?'n':'')." reserviert!<BR>";
 ?>
-<HR>
-<P><?php echo $p->t('lvplan/fehlerUndFeedback');?> <A class="Item" href="mailto:<?php echo MAIL_LVPLAN?>"><?php echo $p->t('lvplan/lvKoordinationsstelle');?></A>.</P>
+
+<P><br><?php echo $p->t('lvplan/fehlerUndFeedback');?> <A class="Item" href="mailto:<?php echo MAIL_LVPLAN?>"><?php echo $p->t('lvplan/lvKoordinationsstelle');?></A>.</P>
+</div>
 </BODY>
 </HTML>