From 88f0ff98f0bd5cfd74bc2a49549611002ca5f479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 22 Sep 2010 09:47:55 +0000
Subject: [PATCH] =?UTF-8?q?-=20Update=20der=20Sprechzeiten=20TWInternation?=
 =?UTF-8?q?al=20-=20Neuer=20Men=C3=BCpunkt=20f=C3=BCr=20=C3=96H=20Herbstwa?=
 =?UTF-8?q?hlen=202010=20-=20QM=20Update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/public/tw_international.html | 58 +++++++++++---------------------
 include/tw/cis_menu_main.inc.php | 10 ++++--
 2 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/cis/public/tw_international.html b/cis/public/tw_international.html
index 6285fd7b9..b00bb815b 100644
--- a/cis/public/tw_international.html
+++ b/cis/public/tw_international.html
@@ -100,65 +100,45 @@
 
 	  <tr>
 	  	<td>
-	  	<b>During the summer break office hours only by appointment!</b>
-	  	<!--
+	  	<!--<b>During the summer break office hours only by appointment!</b>-->
+	  	
 			<table>
 			<tr>
 				<td valign="top" nowrap>Angelina Kratschanova:</td>
-				<td>Mo</td><td nowrap>09:00 - 11:30 und 13:30 - 15:00 Uhr</td>
+				<td>Mo</td><td nowrap>13:00 - 15:30 Uhr</td>
 				<td width="10%"></td>
 				<td valign="top" nowrap>Erika Groh:</td>
-				<td>Di</td><td nowrap>09:00 - 11:30 und 13:30 - 15:00 Uhr</td>
+				<td>Mo</td><td nowrap>09:00 - 12:00 Uhr</td>
 			</tr>
 			<tr>
 				<td></td>
-				<td>Di</td><td>&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;13:00 - 15:00 Uhr</td>
+				<td>Mi</td><td>09:00 - 11:30 Uhr</td>
 				<td width="10%"></td>
 				<td></td>
-				<td>Mi</td><td nowrap>09:00 - 11:30 und 13:30 - 14:30 Uhr</td>
+				<td>Di</td><td nowrap>09:00 - 12:00 Uhr</td>
 			</tr>
 			<tr>
 				<td></td>
-				<td>Do</td><td>09:00 - 11:30 Uhr</td>
+				<td>Do</td><td>13:00 - 15:30 Uhr</td>
 				<td width="10%"></td>
 				<td></td>
-				<td>Do</td><td>13:30 - 16:00 Uhr</td>
+				<td>Mi</td><td>09:00 - 12:00 Uhr</td>
+			</tr>
+			<tr>
+				<td></td>
+				<td></td><td></td>
+				<td width="10%"></td>
+				<td></td>
+				<td>Do</td><td>09:00 - 12:00 Uhr</td>
 			</tr>
 			
 			</table>
-			-->
+			
 		</td>
 	  </tr>	  
-<!--
-	  <tr>
-	  	<td>
-			<table>
-			<tr>
-				<td valign="top" nowrap>Angelina Kratschanova:</td>
-				<td>Mo</td><td nowrap>09:00 - 11:30 Uhr und 13:00 - 15:00 Uhr</td>
-				<td width="10%"></td>
-				<td valign="top" nowrap>Erika Groh:</td>
-				<td>Mo</td><td nowrap>09:00 - 11:30 Uhr und 13:00 - 15:00 Uhr</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>Di</td><td>09:00 - 11:30 Uhr</td>
-				<td width="10%"></td>
-				<td></td>
-				<td>Do</td><td nowrap>09:00 - 11:30 Uhr und 13:00 - 15:00 Uhr</td>
-			</tr>
-			<tr>
-				<td></td>
-				<td>Mi</td><td>09:00 - 11:30 Uhr und 13:00 - 15:00 Uhr</td>
-				<td width="10%"></td>
-				<td></td>
-				<td>Fr</td><td>09:00 - 11:30 Uhr</td>
-			</tr>
-			
-			</table>
-		</td>
-	  </tr>
--->	  
+
+	 
+
 	  
 	  
 	  <!--<tr>
diff --git a/include/tw/cis_menu_main.inc.php b/include/tw/cis_menu_main.inc.php
index e9653376e..80e6fa0e1 100644
--- a/include/tw/cis_menu_main.inc.php
+++ b/include/tw/cis_menu_main.inc.php
@@ -67,7 +67,11 @@
 				  	<table class="tabcontent" id="oeh" style="display: visible">
 						<tr>
 				  			<td class="tdwrap"></td>
-							<td><a href="private/info/oeh/index2010.php" target="content" class="Item"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;&Ouml;H-Mandate 2010</a></td>
+							<td><a href="private/info/oeh/index2010.php" target="content" class="Item"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;&Ouml;H-Mandate Fr&uuml;hjahr 2010</a></td>
+				  		</tr>
+				  		<tr>
+				  			<td class="tdwrap"></td>
+							<td><a href="private/info/oeh/index2010herbst.php" target="content" class="Item"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;&Ouml;H-Herbstwahlen 2010</a></td>
 				  		</tr>
 				  	</table>
 				 </tr>
@@ -807,7 +811,7 @@
 			</tr>
 			</table>
 		</td>
-		</tr>
+		</tr>-->
   		
   			<tr>
 				<td class="tdwrap"><a href="public/kollegium.html" class="MenuItem" onClick="js_toggle_container('Kollegium');" target="content"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;Fachhochschulkollegium</a></td>
@@ -825,7 +829,7 @@
 				</tr>
 				</table>
 				</td>
-			</tr>-->
+			</tr>
 		<!-- Hauptmenue Studentenvertretung -->
 	<!--	<tr>
           <td class="tdwrap"><a href="?Studentenvertretung" class="MenuItem" onClick="return(js_toggle_container('Studentenvertretung'));"><img src="../skin/images/menu_item.gif" alt="menu item" width="7" height="9">&nbsp;Studentenvertretung</a></td>