From 0292f00409eae91db6d9dde1871d3b5e60e438a1 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Wed, 15 Apr 2015 18:55:38 +0200
Subject: [PATCH] =?UTF-8?q?-=20Stundenplandb=20und=20Ignore-Kollision=20St?=
 =?UTF-8?q?atus=20wird=20jetzt=20auch=20direkt=20nach=20dem=20Tempus=20sta?=
 =?UTF-8?q?rt=20farblich=20korrekt=20markiert=20-=20Fehlermeldung=20beim?=
 =?UTF-8?q?=20Eintragen=20von=20max-kollision=20behoben=20wenn=20die=20Var?=
 =?UTF-8?q?iable=20vorher=20nicht=20gesetzt=20war=20-=20alten=20Link=20auf?=
 =?UTF-8?q?=20ToDo=20Liste=20aus=20Tempus-Men=C3=BC=20entfernt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/fasDBDML.php   | 12 ++++++++++--
 content/tempus.js.php  | 23 +++++++++++------------
 content/tempus.xul.php |  9 +--------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/content/fasDBDML.php b/content/fasDBDML.php
index 0e5ad4f5a..da3bb60f4 100644
--- a/content/fasDBDML.php
+++ b/content/fasDBDML.php
@@ -582,8 +582,16 @@ if(!$error)
 		}
 		else 
 		{
-			$return = false;
-			$errormsg = 'Fehler: '.$variable->errormsg;
+			if($variable->errormsg=='')
+			{
+				$return = true;
+				$data = '';
+			}
+			else
+			{
+				$return = false;
+				$errormsg = 'Fehler: '.$variable->errormsg;
+			}
 		}
 	}
 	else
diff --git a/content/tempus.js.php b/content/tempus.js.php
index 64c66ae2d..ed27b118b 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -90,10 +90,17 @@ function onLoad()
   		//wenn zb ein IFrame geladen wird
   		onLoad=function() {return false};
 
+		if(document.getElementById('statusbarpanel-ignore_kollision'))
+		{
+			// Anzeige von DBTable und Ignorekoll. aktualisieren
+			updateignorekollision();
+			updatedbstpltable();
+		}
+
   		//Notizen des Users laden
 		notiz = document.getElementById('box-notizen');
-		notiz.LoadNotizTree('','','','','','','', getUsername(),'');
-
+		if(notiz)
+			notiz.LoadNotizTree('','','','','','','', getUsername(),'');
 	}
 	catch(e)
 	{
@@ -294,7 +301,7 @@ function updateignorekollision()
 	if(getvariable('ignore_kollision')=='true')
 	{
 		panel.label='Kollisionscheck AUS';
-		panel.style.backgroundColor='red';
+		panel.style.backgroundColor='#FF0000';
 		panel.style.MozAppearance = "none"
 		document.getElementById('menu-prefs-ignore_kollision').setAttribute('checked','true');
 	}
@@ -322,7 +329,7 @@ function updatedbstpltable()
 	}
 	else
 	{
-		panel.style.backgroundColor='transparent';
+		panel.style.backgroundColor='';
 		panel.style.MozAppearance = "none"
 	}		
 }
@@ -463,14 +470,6 @@ function UnDo(log_id, bezeichnung)
 	}
 }
 
-// ****
-// * Oeffnet die ToDoListe fuers Tempus
-// ****
-function HelpOpenToDo()
-{
-	window.open('ToDo_Tempus.html','ToDo');
-}
-
 // ****
 // * Zeigt das Fenster zur Kollisionspruefung auf Studentenebene an
 // ****
diff --git a/content/tempus.xul.php b/content/tempus.xul.php
index 160ab0c84..d1dcc514b 100644
--- a/content/tempus.xul.php
+++ b/content/tempus.xul.php
@@ -79,7 +79,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
   <command id="menu-extras-rescheck:command" oncommand="ResCheckShow();"/>
   <command id="menu-extras-synclvplan:command" oncommand="SyncLVPlan();"/>
   <command id="menu-help-about:command" oncommand="OpenAboutDialog()"/>
-  <command id="menu-help-todo:command" oncommand="HelpOpenToDo();"/>
   <command id="menu-help-manual:command" oncommand="OpenManualTempus();"/>
 </commandset>
 
@@ -264,12 +263,6 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
                label     = "&menu-help-manual.label;"
                command   =  "menu-help-manual:command"
                accesskey = "&menu-help-manual.accesskey;"/>
-            <menuitem
-               id        =  "menu-help-todo"
-               key       = "&menu-help-todo.key;"
-               label     = "&menu-help-todo.label;"
-               command   =  "menu-help-todo:command"
-               accesskey = "&menu-help-todo.accesskey;"/>
           </menupopup>
     </menu>
   </menubar>
@@ -316,7 +309,7 @@ echo '<?xml-stylesheet href="datepicker/datepicker.css" type="text/css"?>';
 	?>
 	<statusbarpanel id="statusbarpanel-db_table" label="<?php echo $db_stpl_table; ?>"/>
 	<statusbarpanel>
-		<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: RED;"':'');?> oncommand="updateignorekollision()"/>
+		<toolbarbutton id="statusbarpanel-ignore_kollision" label="Kollisionscheck <?php echo ($ignore_kollision=='true'?'AUS':'AN'); ?>" <?php echo ($ignore_kollision=='true'?'style="background-color: red;"':'');?> oncommand="updateignorekollision()"/>
 	</statusbarpanel>
 	<statusbarpanel id="statusbarpanel-text" label="<?php echo htmlspecialchars($error_msg); ?>" flex="4" crop="right" />
 	<statusbarpanel id="progress-panel" class="statusbarpanel-progress">