From 8512a6a8992c6626bc021e32ba17b0acdb4a3378 Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Tue, 14 Apr 2015 10:10:52 +0200
Subject: [PATCH] =?UTF-8?q?Bug=20behoben=20bei=20dem=20im=20Tempus=20beim?=
 =?UTF-8?q?=20Ziehen=20einer=20Stunde=20der=20Hintergrund=20weiss=20wird?=
 =?UTF-8?q?=20Bug=20behoben=20bei=20dem=20in=20der=20neuen=20Seamonkey=20V?=
 =?UTF-8?q?ersion=20die=20Anzeige=20bei=20aktivierten=20Kollissionscheck?=
 =?UTF-8?q?=20und=20Stundenplan-Tabelle=20nicht=20rot=20wird=20Bug=20behob?=
 =?UTF-8?q?en=20bei=20dem=20das=20Kontextmen=C3=BC=20bei=20den=20Stundenpl?=
 =?UTF-8?q?andetails=20transparent=20angezeigt=20wurde?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/dragboard.js.php                       | 5 +++--
 content/lvplanung/stpl-details-overlay.xul.php | 4 ++--
 content/tempus.js.php                          | 9 +++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/content/dragboard.js.php b/content/dragboard.js.php
index 4ef557e10..45e1fe27b 100644
--- a/content/dragboard.js.php
+++ b/content/dragboard.js.php
@@ -462,7 +462,7 @@ var boardObserver=
 		if (evt.target.tagName=="label")
 			evt.target.setAttribute("style","background-color:#AAFFAA;");
 		else
-			evt.target.setAttribute("style",styleNow+"border:1px dashed black;");
+			evt.target.setAttribute("style",styleNow+";border:1px dashed black;");
 	},
 	onDragExit: function (evt,flavour,session)
 	{
@@ -470,7 +470,7 @@ var boardObserver=
 		if (evt.target.tagName=="label")
 			evt.target.setAttribute("style","");
 		else
-			evt.target.setAttribute("style",styleNow+"border:1px solid black;");
+			evt.target.setAttribute("style",styleNow+";border:1px solid black;");
   	},
   	onDragOver: function(evt,flavour,session)
   	{
@@ -495,6 +495,7 @@ var boardObserver=
 
 			var stunde=evt.target.getAttribute("stunde");
 			var new_datum=evt.target.getAttribute("datum");
+
 			if (evt.target.tagName=="label")
 			{
 				var new_ort=evt.target.getAttribute("ort_kurzbz");
diff --git a/content/lvplanung/stpl-details-overlay.xul.php b/content/lvplanung/stpl-details-overlay.xul.php
index 55d069d6d..d29d395b0 100644
--- a/content/lvplanung/stpl-details-overlay.xul.php
+++ b/content/lvplanung/stpl-details-overlay.xul.php
@@ -44,10 +44,10 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 	<!-- ************************* -->
 	<vbox id="vboxSTPLDetailsListe">
 		<popupset>
-			<popup id="stpldetail-treestpldetail-popup">
+			<menupopup id="stpldetail-treestpldetail-popup">
 				<menuitem label="Bearbeiten" oncommand="STPLDetailEdit()" />
 				<menuitem label="Entfernen" oncommand="STPLDetailDelete()" />
-			</popup>
+			</menupopup>
 		</popupset>
 
 		<tree id="treeStplDetails" seltype="single" hidecolumnpicker="false" flex="1"
diff --git a/content/tempus.js.php b/content/tempus.js.php
index bf53492eb..64c66ae2d 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -234,7 +234,8 @@ function toggleIgnoreKollision()
 // ****
 function variableChange(variable, id, wert)
 {
-	item = document.getElementById(id);
+	if(id!=null)
+		item = document.getElementById(id);
 	
 	if(typeof(wert)==='undefined')
 	{
@@ -294,12 +295,14 @@ function updateignorekollision()
 	{
 		panel.label='Kollisionscheck AUS';
 		panel.style.backgroundColor='red';
+		panel.style.MozAppearance = "none"
 		document.getElementById('menu-prefs-ignore_kollision').setAttribute('checked','true');
 	}
 	else
 	{
 		panel.label='Kollisionscheck AN';
 		panel.style.backgroundColor='';
+		panel.style.MozAppearance = "none"
 		document.getElementById('menu-prefs-ignore_kollision').setAttribute('checked','false');
 	}		
 }
@@ -314,11 +317,13 @@ function updatedbstpltable()
 
 	if(panel.label=='stundenplan')
 	{
-		panel.style.backgroundColor='red';
+		panel.style.backgroundColor='#FF0000';
+		panel.style.MozAppearance = "none"
 	}
 	else
 	{
 		panel.style.backgroundColor='transparent';
+		panel.style.MozAppearance = "none"
 	}		
 }