From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sat, 30 Jan 2010 13:12:41 +0000 (+0000)
Subject: Script update
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a45aa7fa93873186a8104db2750e36f17147ed7;p=gosa.git

Script update


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15505 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/include/events.js b/gosa-core/html/include/events.js
deleted file mode 100644
index 3b893d239..000000000
--- a/gosa-core/html/include/events.js
+++ /dev/null
@@ -1,24 +0,0 @@
-window.onload 		= OnLoad;
-window.onresize 	= OnResize;
-window.onkeypress	= OnKeyPress;
-
-function OnKeyPress()
-{
-	keyPress();
-}
-
-function OnLoad()
-{
-	adjust();
-        if(document['loadHandler']) {
-               loadHandler();
-        }
-}
-
-function OnResize()
-{
-	adjust();
-        if(document['resizeHandler']) {
-	  resizeHandler();
-        }
-}
diff --git a/gosa-core/html/include/gosa.js b/gosa-core/html/include/gosa.js
index 4190e9e52..b99572049 100644
--- a/gosa-core/html/include/gosa.js
+++ b/gosa-core/html/include/gosa.js
@@ -1,136 +1,112 @@
-var browserType = "Not dectected, adjust focus.js";
-var firefoxType;
-
-if (document.layers) 
-{
-		browserType = "nn4";
-}
-
-if (document.all) 
-{
-		browserType = "ie";
-}
-
-if (window.navigator.userAgent.toLowerCase().match("gecko")) 
-{
-		browserType= "gecko";
-}
-
-if (window.navigator.userAgent.toLowerCase().match(/opera/i)) 
-{
-		browserType= "gecko";
-}
-
-if (browserType=="gecko" && window.navigator.userAgent.toLowerCase().match("firefox\/2")) 
-{
-		firefoxType= "firefox2";
-}else{
-		firefoxType= "firefox";
-}
-
-netscape = "";
-ver= navigator.appVersion; len = ver.length;
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2010 GONICUS GmbH
+ * 
+ * ID: $$Id: index.php 15301 2010-01-26 09:40:08Z cajus $$
+ *
+ * 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
+ */
 
-for (iln = 0; iln < len; iln++){
-  if (ver.charAt(iln) == "("){
-    break;
-  }
-}
-netscape= (ver.charAt(iln+1).toUpperCase() != "C");
+/* Install event handlers */
+Event.observe(window, 'resize', resizeHandler);
+Event.observe(window, 'load', resizeHandler);
+Event.observe(window, 'keypress', keyHandler);
 
 
+/* Ask before switching a plugin with this function */
 function question(text, url)
 {
-  if(document.mainform.ignore){
-        location.href= url;
-        return true;
-  }
-  if(confirm(text)){
-        location.href= url;
-        return true;
-  }
-  return false;
+	if(document.mainform.ignore){
+		location.href= url;
+		return true;
+	}
+	if(confirm(text)){
+		location.href= url;
+		return true;
+	}
+	return false;
 }
 
 
 /* Toggle checkbox that matches regex */
 function chk_set_all(regex,value)
 {
-        for (var i = 0; i < document.mainform.elements.length; i++) {
-                var _id=document.mainform.elements[i].id;
-                if(_id.match(regex)) {
-                        document.getElementById(_id).checked= value;
-                }
-        }
+	for (var i = 0; i < document.mainform.elements.length; i++) {
+		var _id=document.mainform.elements[i].id;
+		if(_id.match(regex)) {
+			document.getElementById(_id).checked= value;
+		}
+	}
 }
 
 
 function toggle_all_(regex,state_object)
 {
-		state = document.getElementById(state_object).checked;
-		chk_set_all(regex, state);
+	state = document.getElementById(state_object).checked;
+	chk_set_all(regex, state);
 }
 
 
-function scrollDown() {
-  document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight;
-  timeout= setTimeout("scrollDown()", 500);
-}
-
 /* Scroll down the body frame */
 function scrollDown2()
 {
-    document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight;
+	document.body.scrollTop = document.body.scrollHeight - document.body.clientHeight;
 }
 
 
 /* Toggle checkbox that matches regex */
 function acl_set_all(regex,value)
 {
-				for (var i = 0; i < document.mainform.elements.length; i++) {
-								var _id=document.mainform.elements[i].id;
-								if(_id.match(regex)) {
-												document.getElementById(_id).checked= value;
-								}
-				}
+	for (var i = 0; i < document.mainform.elements.length; i++) {
+		var _id=document.mainform.elements[i].id;
+		if(_id.match(regex)) {
+			document.getElementById(_id).checked= value;
+		}
+	}
 }
 
 /* Toggle checkbox that matches regex */
 function acl_toggle_all(regex)
 {
-				for (var i = 0; i < document.mainform.elements.length; i++) {
-								var _id=document.mainform.elements[i].id;
-								if(_id.match(regex)) {
-												if (document.getElementById(_id).checked == true){
-																document.getElementById(_id).checked= false;
-												} else {
-																document.getElementById(_id).checked= true;
-												}
-								}
-				}
+	for (var i = 0; i < document.mainform.elements.length; i++) {
+		var _id=document.mainform.elements[i].id;
+		if(_id.match(regex)) {
+			if (document.getElementById(_id).checked == true){
+				document.getElementById(_id).checked= false;
+			} else {
+				document.getElementById(_id).checked= true;
+			}
+		}
+	}
 }
 
 
-var enable_keyPress = true;
-function keyPress(DnEvents) {
-
-	/* We are forced to skip this Keyboard input filtering 
-   *  (enable_keyPress was set to false in the HTML content)
-   */
-	if(!enable_keyPress) return;
-
-  // determines whether Netscape or Internet Explorer
-  k = (netscape) ? DnEvents.keyCode : window.event.keyCode;
-  if (k == 13) { // enter key pressed
+/* Global key handler to estimate which element gets the next focus if enter is pressed */
+function keyHandler(DnEvents) {
+	// determines whether Netscape or Internet Explorer
+	k = (Prototype.Browser.Gecko) ? DnEvents.keyCode : window.event.keyCode;
+	if (k == 13) { // enter key pressed
 		if(typeof(nextfield)!='undefined') {
 			if(nextfield == 'login') {
-    	  return true; // submit, we finished all fields
-    	} else { // we are not done yet, send focus to next box
-      	eval('document.mainform.' + nextfield + '.focus()');
-      	return false;
-    	}
-  	} else {
-			if(netscape) {
+				return true; // submit, we finished all fields
+			} else { // we are not done yet, send focus to next box
+				eval('document.mainform.' + nextfield + '.focus()');
+				return false;
+			}
+		} else {
+			if(Prototype.Browser.Gecko) {
 				if(DnEvents.target.type == 'textarea') {
 					return true;
 				} else if (DnEvents.target.type != 'submit') {
@@ -148,7 +124,7 @@ function keyPress(DnEvents) {
 				} else {
 					return true;
 				}
-			// Check for konqueror
+				// Check for konqueror
 			} else if(document.clientWidth) {
 				// do nothing ATM
 			} else {
@@ -173,125 +149,100 @@ function keyPress(DnEvents) {
 		}
 	} else if (k==9) {
 		// Tab key pressed
-		if(netscape) {
+		if(Prototype.Browser.Gecko) {
 			if(DnEvents.target.type == 'textarea') {
 				document.getElementById(DnEvents.target.id).value+="\t";
-		 		return false;
+				return false;
 			}
-		// Check for konqueror
+			// Check for konqueror
 		} else if(document.clientWidth) {
 			// do nothing ATM
 		} else {
-		 	if(window.event.srcElement.type == 'textarea') {
+			if(window.event.srcElement.type == 'textarea') {
 				document.getElementById(window.event.srcElement.id).value+="\t";
-		 		return false;
-		 	}
+				return false;
+			}
 		}
 	}
 }
 
-function changeState(myField) {
-	if(document.getElementById(myField) != null){
-	  document.getElementById(myField).disabled=(document.getElementById(myField).disabled)?false:true;
-	}
+function changeState() {
+	for (var i = 0; i < arguments.length; i++) { 
+		var element = $(arguments[i]); 
+		if (element.hasAttribute('disabled')) { 
+			element.removeAttribute('disabled'); 
+		} else { 
+			element.setAttribute('disabled', 'disabled'); 
+		} 
+	} 
 }
 
-function setHidden(str) {
-	type = document.getElementById(str).style.display;
-	if((type=='')||(type=='block')) {
-		document.getElementById(str).style.display='none';
-	}else{
-		document.getElementById(str).style.display='block';
-	}
-}
 function changeSelectState(triggerField, myField) {
-  if (document.getElementById(triggerField).value != 2){
-	  document.getElementById(myField).disabled= true;
-  } else {
-	  document.getElementById(myField).disabled= false;
-  }
+	if (document.getElementById(triggerField).value != 2){
+		document.getElementById(myField).disabled= true;
+	} else {
+		document.getElementById(myField).disabled= false;
+	}
 }
 
 function changeSubselectState(triggerField, myField) {
-  if (document.getElementById(triggerField).checked == true){
-	  document.getElementById(myField).disabled= false;
-  } else {
-	  document.getElementById(myField).disabled= true;
-  }
+	if (document.getElementById(triggerField).checked == true){
+		document.getElementById(myField).disabled= false;
+	} else {
+		document.getElementById(myField).disabled= true;
+	}
 }
 
 function changeTripleSelectState(firstTriggerField, secondTriggerField, myField) {
-  if (
-  	document.getElementById(firstTriggerField).checked == true &&
-	document.getElementById(secondTriggerField).checked == true){
-	  document.getElementById(myField).disabled= false;
-  } else {
-	  document.getElementById(myField).disabled= true;
-  }
+	if (
+			document.getElementById(firstTriggerField).checked == true &&
+			document.getElementById(secondTriggerField).checked == true){
+		document.getElementById(myField).disabled= false;
+	} else {
+		document.getElementById(myField).disabled= true;
+	}
 }
 
 <!-- Second field must be non-checked -->
 function changeTripleSelectState_2nd_neg(firstTriggerField, secondTriggerField, myField) {
-  if (
-  	document.getElementById(firstTriggerField).checked == true &&
-	document.getElementById(secondTriggerField).checked == false){
-	  document.getElementById(myField).disabled= false;
-  } else {
-	  document.getElementById(myField).disabled= true;
-  }
-}
-// work together to analyze keystrokes
-if (netscape){
-  if(firefoxType== "firefox") {
-		window.captureEvents(Event.KEYPRESS);
+	if (
+			document.getElementById(firstTriggerField).checked == true &&
+			document.getElementById(secondTriggerField).checked == false){
+		document.getElementById(myField).disabled= false;
+	} else {
+		document.getElementById(myField).disabled= true;
 	}
-	window.onkeypress= keyPress;
-} else {
-	document.onkeydown= keyPress;
-}
-
-function hide(element) {
-  if (browserType == "gecko" )
-     document.poppedLayer = document.getElementById(element);
-  else if (browserType == "ie")
-     document.poppedLayer = document.all[element];
-  else
-     document.poppedLayer = document.layers[element];
- 	document.poppedLayer.style.visibility = "hidden";
 }
 
-function show(element) {
-  if (browserType == "gecko" )
-     document.poppedLayer = document.getElementById(element);
-  else if (browserType == "ie")
-     document.poppedLayer = document.all[element];
-  else
-     document.poppedLayer = document.layers[element];
-  document.poppedLayer.style.visibility = "visible";
+// work together to analyze keystrokes
+if (Prototype.Browser.Gecko){
+	window.onkeypress= keyHandler;
+} else {
+	document.onkeydown= keyHandler;
 }
 
 function GOsa_toggle(element) {
-  if (browserType == "gecko" )
-     document.poppedLayer = document.getElementById(element);
-  else if (browserType == "ie")
-     document.poppedLayer = document.all[element];
-  else
-     document.poppedLayer = document.layers[element];
-
-  if (document.poppedLayer.style.visibility == "visible") {
-	  hide (element);
+	if (Prototype.Browser.Gecko)
+		document.poppedLayer = document.getElementById(element);
+	else if (Prototype.Browser.IE)
+		document.poppedLayer = document.all[element];
+	else
+		document.poppedLayer = document.layers[element];
+
+	if (document.poppedLayer.style.visibility == "visible") {
+		hide (element);
 	} else {
-	  show (element);
+		show (element);
 	}
 }
 
 function popup(target, name) {
 	var mypopup= 
 		window.open(
-			target,
-			name,
-			"width=600,height=700,location=no,toolbar=no,directories=no,menubar=no,status=no,scrollbars=yes"
-		);
+				target,
+				name,
+				"width=600,height=700,location=no,toolbar=no,directories=no,menubar=no,status=no,scrollbars=yes"
+			   );
 	mypopup.focus();
 	return false;
 }
@@ -304,31 +255,31 @@ function divGOsa_toggle(element) {
 	var cell;
 	var cellname="tr_"+(element);
 
-	if (browserType == "gecko" ) {
-    document.poppedLayer = document.getElementById(element);
+	if (Prototype.Browser.Gecko) {
+		document.poppedLayer = document.getElementById(element);
 		cell= document.getElementById(cellname);
 
-	  if (document.poppedLayer.style.visibility == "visible") {
-		  hide (element);
+		if (document.poppedLayer.style.visibility == "visible") {
+			hide (element);
 			cell.style.height="0px";
 			document.poppedLayer.style.height="0px";
 		} else {
-		  show (element);
+			show (element);
 			document.poppedLayer.style.height="";
 			if(document.defaultView) {
 				cell.style.height=document.defaultView.getComputedStyle(document.poppedLayer,"").getPropertyValue('height');
 			}
 		}
-	} else if (browserType == "ie") {
-    document.poppedLayer = document.getElementById(element);
+	} else if (Prototype.Browser.IE) {
+		document.poppedLayer = document.getElementById(element);
 		cell= document.getElementById(cellname);
-	  if (document.poppedLayer.style.visibility == "visible") {
-		  hide (element);
+		if (document.poppedLayer.style.visibility == "visible") {
+			hide (element);
 			cell.style.height="0px";
 			document.poppedLayer.style.height="0px";
 			document.poppedLayer.style.position="absolute";
 		} else {
-		  show (element);
+			show (element);
 			cell.style.height="";
 			document.poppedLayer.style.height="";
 			document.poppedLayer.style.position="relative";
@@ -336,32 +287,32 @@ function divGOsa_toggle(element) {
 	}
 }
 
-function adjust (e) {
+function resizeHandler (e) {
 	if (!e) e=window.event;
 	if (document.getElementById("menucell") && document.getElementById("d_scrollbody")) {
 		var inner_height= window.innerHeight;
 		var min_height= 450;
 		var px_height= min_height;
 		var suggested= px_height;
-	
+
 		// document.defaultView allows access to the rendered size of elements and should be supported by modern browsers
 		if(document.defaultView) {
-                        var menu_height= 0;
-                        if (document.getElementById("d_height")){
-  			  suggested= parseInt(document.getElementById("d_height").value);
-                        } else {
-  			  menu_height=parseInt(document.defaultView.getComputedStyle(document.getElementById("menucell"),"").getPropertyValue('height'));
-			  // Minimum height for divlist should be the bottom edge of the menu
-			  min_height= menu_height-197;
-			  suggested= min_height;
-			  if((inner_height-230)-suggested>0) {
-			  	suggested= inner_height-230;
-			  }
-		
-                        }
-	
-		// IE uses other height specifications
-		} else if (browserType == "ie") {
+			var menu_height= 0;
+			if (document.getElementById("d_height")){
+				suggested= parseInt(document.getElementById("d_height").value);
+			} else {
+				menu_height=parseInt(document.defaultView.getComputedStyle(document.getElementById("menucell"),"").getPropertyValue('height'));
+				// Minimum height for divlist should be the bottom edge of the menu
+				min_height= menu_height-197;
+				suggested= min_height;
+				if((inner_height-230)-suggested>0) {
+					suggested= inner_height-230;
+				}
+
+			}
+
+			// IE uses other height specifications
+		} else if (Prototype.Browser.IE) {
 			suggested= document.all.menucell.offsetHeight;
 			offset= absTop(d_scrollbody);
 			suggested-= offset;
@@ -375,19 +326,19 @@ function adjust (e) {
 			suggested = suggested -20;
 		}
 
-	        if (!document.getElementById("list_workaround")) {
-		  document.getElementById("d_scrollbody").style.height=suggested+"px";
-                } else {
-		  if (browserType != "ie") {
-                    current_height= parseInt(document.defaultView.getComputedStyle(document.getElementById("t_nscrollbody"),"").getPropertyValue('height'));
-                    if (current_height < menu_height) {
-  		      document.getElementById("d_scrollbody").style.height=suggested+20+"px";
-                    }
-                  }
-                }
-	        if (document.getElementById("t_nscrollbody")) {
-              		document.getElementById("t_nscrollbody").style.height=(suggested-22)+"px";
-                }
+		if (!document.getElementById("list_workaround")) {
+			document.getElementById("d_scrollbody").style.height=suggested+"px";
+		} else {
+			if (!Prototype.Browser.IE) {
+				current_height= parseInt(document.defaultView.getComputedStyle(document.getElementById("t_nscrollbody"),"").getPropertyValue('height'));
+				if (current_height < menu_height) {
+					document.getElementById("d_scrollbody").style.height=suggested+20+"px";
+				}
+			}
+		}
+		if (document.getElementById("t_nscrollbody")) {
+			document.getElementById("t_nscrollbody").style.height=(suggested-22)+"px";
+		}
 	}
 	return true;
 }
@@ -397,92 +348,93 @@ function absTop(e) {
 }
 
 /* Set focus to first valid input field
-    avoid IExplorer warning about hidding or disabled fields
-*/
+   avoid IExplorer warning about hidding or disabled fields
+ */
 function focus_field()
 {
-    var i     = 0;
-    var e     = 0;
-    var found = false;
-    var element_name = "";
-    var element =null;
-
-    while(focus_field.arguments[i] && !found){
-
-        var tmp = document.getElementsByName(focus_field.arguments[i]);
-        for(e = 0 ; e < tmp.length ; e ++ ){
-
-            if(tmp[e].disabled != true &&  tmp[e].type != "none" && tmp[e].type != "hidden" ){
-                found = true;
-                element = tmp[e];
-            }
-        }
-        i++;
-    }
-
-    if(element && found){
-        element.blur();
-        element.focus();
-    }
+	var i     = 0;
+	var e     = 0;
+	var found = false;
+	var element_name = "";
+	var element =null;
+
+	while(focus_field.arguments[i] && !found){
+
+		var tmp = document.getElementsByName(focus_field.arguments[i]);
+		for(e = 0 ; e < tmp.length ; e ++ ){
+
+			if(tmp[e].disabled != true &&  tmp[e].type != "none" && tmp[e].type != "hidden" ){
+				found = true;
+				element = tmp[e];
+				break;
+			}
+		}
+		i++;
+	}
+
+	if(element && found){
+		element.blur();
+		element.focus();
+	}
 }
 
 
 /*  This function pops up messages from message queue 
-		All messages are hidden in html output (style='display:none;').
-		This function makes single messages visible till there are no more dialogs queued.
-
-		hidden inputs: 
-			current_msg_dialogs		- Currently visible dialog
-			closed_msg_dialogs		- IDs of already closed dialogs 
-			pending_msg_dialogs		- Queued dialog IDs. 
-*/
+    All messages are hidden in html output (style='display:none;').
+    This function makes single messages visible till there are no more dialogs queued.
+
+    hidden inputs: 
+    current_msg_dialogs		- Currently visible dialog
+    closed_msg_dialogs		- IDs of already closed dialogs 
+    pending_msg_dialogs		- Queued dialog IDs. 
+ */
 function next_msg_dialog()
 {
-		var s_pending = "";
-		var a_pending = new Array();
-		var i_id			= 0;
-		var i					= 0;
-		var tmp				= "";
-		var ele 			= null;
-		var ele2 			= null;
-		var cur_id 		= "";
-
-		if(document.getElementById('current_msg_dialogs')){
-				cur_id = document.getElementById('current_msg_dialogs').value;
-				if(cur_id != ""){
-						ele = document.getElementById('e_layer' + cur_id);
-						ele.onmousemove = "";
-						hide('e_layer' + cur_id); 	
-						document.getElementById('closed_msg_dialogs').value += "," + cur_id;
-						document.getElementById('current_msg_dialogs').value= ""; 
-				}
+	var s_pending = "";
+	var a_pending = new Array();
+	var i_id			= 0;
+	var i					= 0;
+	var tmp				= "";
+	var ele 			= null;
+	var ele2 			= null;
+	var cur_id 		= "";
+
+	if(document.getElementById('current_msg_dialogs')){
+		cur_id = document.getElementById('current_msg_dialogs').value;
+		if(cur_id != ""){
+			ele = document.getElementById('e_layer' + cur_id);
+			ele.onmousemove = "";
+			hide('e_layer' + cur_id); 	
+			document.getElementById('closed_msg_dialogs').value += "," + cur_id;
+			document.getElementById('current_msg_dialogs').value= ""; 
 		}
+	}
 
-		if(document.getElementById('pending_msg_dialogs')){
-				s_pending = document.getElementById('pending_msg_dialogs').value;
-				a_pending = s_pending.split(",");
-				if(a_pending.length){
-						i_id = a_pending.pop();
-						for (i = 0 ; i < a_pending.length; ++i){
-								tmp = tmp + a_pending[i] + ',';
-						}
-						tmp = tmp.replace(/,$/g,"");
-						if(i_id != ""){
-								ele = document.getElementById('e_layer' + i_id);
-								ele3 = document.getElementById('e_layerTitle' + i_id);
-								ele.style.display= 'block'	;
-								document.getElementById('pending_msg_dialogs').value= tmp;
-								document.getElementById('current_msg_dialogs').value= i_id;
-								ele2 = document.getElementById('e_layer2') ;
-								ele3.onmousedown = start_move_div_by_cursor;
-								ele2.onmouseup 	= stop_move_div_by_cursor;
-								ele2.onmousemove = move_div_by_cursor;
-						}else{
-								ele2 = document.getElementById('e_layer2') ;
-								ele2.style.display ="none";
-						}
-				}
+	if(document.getElementById('pending_msg_dialogs')){
+		s_pending = document.getElementById('pending_msg_dialogs').value;
+		a_pending = s_pending.split(",");
+		if(a_pending.length){
+			i_id = a_pending.pop();
+			for (i = 0 ; i < a_pending.length; ++i){
+				tmp = tmp + a_pending[i] + ',';
+			}
+			tmp = tmp.replace(/,$/g,"");
+			if(i_id != ""){
+				ele = document.getElementById('e_layer' + i_id);
+				ele3 = document.getElementById('e_layerTitle' + i_id);
+				ele.style.display= 'block'	;
+				document.getElementById('pending_msg_dialogs').value= tmp;
+				document.getElementById('current_msg_dialogs').value= i_id;
+				ele2 = document.getElementById('e_layer2') ;
+				ele3.onmousedown = start_move_div_by_cursor;
+				ele2.onmouseup 	= stop_move_div_by_cursor;
+				ele2.onmousemove = move_div_by_cursor;
+			}else{
+				ele2 = document.getElementById('e_layer2') ;
+				ele2.style.display ="none";
+			}
 		}
+	}
 }
 
 
@@ -498,118 +450,110 @@ var div_offset_y  	= 0;
  */
 function start_move_div_by_cursor(e)
 {
-		var x = 0; 
-		var y = 0;	
-		var cur_id = 0;
-		var dialog = null;
-		var event = null;
-
-		/* Get current msg_dialog position
-     */
-		cur_id = document.getElementById('current_msg_dialogs').value;
-		if(cur_id != ""){
-				dialog = document.getElementById('e_layer' + cur_id);
-				x = dialog.style.left;
-				y = dialog.style.top;
-				x = x.replace(/[^0-9]/g,"");
-				y = y.replace(/[^0-9]/g,"");
-				if(!y) y = 1;
-				if(!x) x = 1;
-		}
+	var x = 0; 
+	var y = 0;	
+	var cur_id = 0;
+	var dialog = null;
+	var event = null;
+
+	/* Get current msg_dialog position
+	 */
+	cur_id = document.getElementById('current_msg_dialogs').value;
+	if(cur_id != ""){
+		dialog = document.getElementById('e_layer' + cur_id);
+		x = dialog.style.left;
+		y = dialog.style.top;
+		x = x.replace(/[^0-9]/g,"");
+		y = y.replace(/[^0-9]/g,"");
+		if(!y) y = 1;
+		if(!x) x = 1;
+	}
 
-		/* Get mouse position within msg_dialog 
-     */
-		if(window.event){
-				event = window.event;
-				if(event.offsetX){
-						div_offset_x   = event.clientX -x;
-						div_offset_y   = event.clientY -y;
-						enable_move_div_by_cursor = true;
-				}
-		}else if(e){
-				event = e;
-				if(event.layerX){
-						div_offset_x	= event.screenX -x;
-						div_offset_y	= event.screenY -y;
-						enable_move_div_by_cursor = true;
-				}
+	/* Get mouse position within msg_dialog 
+	 */
+	if(window.event){
+		event = window.event;
+		if(event.offsetX){
+			div_offset_x   = event.clientX -x;
+			div_offset_y   = event.clientY -y;
+			enable_move_div_by_cursor = true;
+		}
+	}else if(e){
+		event = e;
+		if(event.layerX){
+			div_offset_x	= event.screenX -x;
+			div_offset_y	= event.screenY -y;
+			enable_move_div_by_cursor = true;
 		}
+	}
 }
 
 
 /* Deactivate msg_dialog movement 
-*/
+ */
 function stop_move_div_by_cursor()
 {
-		mouse_x_on_div = 0;
-		mouse_y_on_div = 0;
-		div_offset_x = 0;
-		div_offset_y = 0;
-		enable_move_div_by_cursor = false;
+	mouse_x_on_div = 0;
+	mouse_y_on_div = 0;
+	div_offset_x = 0;
+	div_offset_y = 0;
+	enable_move_div_by_cursor = false;
 }
 
 
 /* Move msg_dialog with cursor */
 function move_div_by_cursor(e)
 {
-		var event 				= false;
-		var mouse_pos_x		= 0;
-		var mouse_pos_y 	= 0;
-		var	cur_div_x = 0;
-		var cur_div_y = 0;
-		var cur_id	= 0;
-		var dialog = null;
-
-
-		if(undefined !== enable_move_div_by_cursor && enable_move_div_by_cursor == true){
-
-				if(document.getElementById('current_msg_dialogs')){
-
-						/* Get mouse position on screen 
-             */
-						if(window.event){
-								event = window.event;
-								mouse_pos_x  =event.clientX;
-								mouse_pos_y  =event.clientY;
-						}else if (e){
-								event = e;
-								mouse_pos_x  =event.screenX;
-								mouse_pos_y  =event.screenY;
-						}else{
-							return;
-						}
+	var event 				= false;
+	var mouse_pos_x		= 0;
+	var mouse_pos_y 	= 0;
+	var	cur_div_x = 0;
+	var cur_div_y = 0;
+	var cur_id	= 0;
+	var dialog = null;
 
-						/* Get id of current msg_dialog */
-						cur_id = document.getElementById('current_msg_dialogs').value;
-						if(cur_id != ""){
-								dialog = document.getElementById('e_layer' + cur_id);
-	
-								/* Calculate new position */
-								cur_div_x = mouse_pos_x - div_offset_x;
-								cur_div_y = mouse_pos_y - div_offset_y;
-
-								/* Ensure that dialog can't be moved out of screen */
-								if(cur_div_x < 0 ) cur_div_x = 0
-								if(cur_div_y < 0 ) cur_div_y = 0
-							
-								/* Assign new values */
-								dialog.style.left = (cur_div_x ) + "px";
-								dialog.style.top  = (cur_div_y ) + "px";
-						}
-				}
-		}
-}
 
-function send_menu_action(str)
-{
-		if(str != "" && str != "#"){
-				if(document.getElementById('menu_action')){
-						document.getElementById('menu_action').value=str;
-						document.mainform.submit();
-				}
+	if(undefined !== enable_move_div_by_cursor && enable_move_div_by_cursor == true){
+
+		if(document.getElementById('current_msg_dialogs')){
+
+			/* Get mouse position on screen 
+			 */
+			if(window.event){
+				event = window.event;
+				mouse_pos_x  =event.clientX;
+				mouse_pos_y  =event.clientY;
+			}else if (e){
+				event = e;
+				mouse_pos_x  =event.screenX;
+				mouse_pos_y  =event.screenY;
+			}else{
+				return;
+			}
+
+			/* Get id of current msg_dialog */
+			cur_id = document.getElementById('current_msg_dialogs').value;
+			if(cur_id != ""){
+				dialog = document.getElementById('e_layer' + cur_id);
+
+				/* Calculate new position */
+				cur_div_x = mouse_pos_x - div_offset_x;
+				cur_div_y = mouse_pos_y - div_offset_y;
+
+				/* Ensure that dialog can't be moved out of screen */
+				if(cur_div_x < 0 ) cur_div_x = 0
+					if(cur_div_y < 0 ) cur_div_y = 0
+
+						/* Assign new values */
+						dialog.style.left = (cur_div_x ) + "px";
+				dialog.style.top  = (cur_div_y ) + "px";
+			}
+		}
 	}
 }
 
+
+// Global storage for baseSelector timer
 var rtimer;
 
 // vim:ts=2:syntax
diff --git a/gosa-core/ihtml/themes/default/GOsa_MultiSelectHeaderSubEntry.ihtml b/gosa-core/ihtml/themes/default/GOsa_MultiSelectHeaderSubEntry.ihtml
deleted file mode 100644
index 979ef2afa..000000000
--- a/gosa-core/ihtml/themes/default/GOsa_MultiSelectHeaderSubEntry.ihtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-15"></meta>
-<title>The PHP Layers Menu - Templates</title>
-<link rel="StyleSheet" href="../layersmenu-gtk2.css" type="text/css"></link>
-<style type="text/css">
-<!--
-.submenu	{
-	position: relative;
-	visibility: visible;
-}
-//-->
-</style>
-</head>
-<body>
-
-<pre>
-This is a sub menu template.
-This comment does not appear on the resulting page.
-
-The table tags just inside the first div are needed
-to avoid problems with layers that cross the boundaries of the browsing window
-and to make things work with Opera 6.
-If you are sure that *all* your layers stay inside the browsing window
-and you do not have to support Opera 6
-(or if you will provide a "compatibility" menu version to Opera 6),
-you can safely remove it.
---
-</pre>
-
-<!-- BEGIN template -->
-
-<div id="{layer_label}" class="submenu" onmouseover="clearLMTO();" onmouseout="setLMTO();">
-<table border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td nowrap="nowrap">
-<div class="subframe">
-<!-- BEGIN sub_menu_cell -->
-<div id="{refid}" class="item">
-<div style='cursor: pointer;' onClick="send_menu_action('{href}');"{onmouseover}{title}{target}><img
-align="top" src="{imgwww}{transparent}" width="1" height="16" border="0"
-alt="" /><!-- BEGIN cell_icon --><img
-align="top" src="{iconsrc}" width="{iconwidth}" height="{iconheight}" border="0"
-alt="{iconalt}" />&nbsp;<!-- END cell_icon -->{text}<!-- BEGIN cell_arrow -->&nbsp;<img
-class="fwdarr" src="{imgwww}{arrowsrc}" width="{arrowwidth}" height="{arrowheight}"
-border="0" alt=">>" /><!-- END cell_arrow -->&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-</div>
-<!-- END sub_menu_cell -->
-<!-- BEGIN separator -->
-<div class="separator">&nbsp;</div>
-<!-- END separator -->
-</div>
-</td>
-</tr>
-</table>
-</div>
-
-<!-- END template -->
-
-</body>
-</html>
diff --git a/gosa-core/ihtml/themes/default/headers.tpl b/gosa-core/ihtml/themes/default/headers.tpl
index c771bf7cb..8edfd2159 100644
--- a/gosa-core/ihtml/themes/default/headers.tpl
+++ b/gosa-core/ihtml/themes/default/headers.tpl
@@ -27,13 +27,12 @@
 
   <link rel="shortcut icon" href="favicon.ico">
 
-  <script language="javascript" src="include/events.js" type="text/javascript"></script>
 {if $iePngWorkaround}
   <script language="javascript" src="include/png.js" type="text/javascript"></script>
 {/if}
+  <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
   <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
 {if $usePrototype == 'true'}
-  <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
   <script language="javascript" src="include/scriptaculous.js" type="text/javascript"></script>
   <script language="javascript" src="include/effects.js" type="text/javascript"></script>
   <script language="javascript" src="include/dragdrop.js" type="text/javascript"></script>
diff --git a/gosa-core/ihtml/themes/default/password.tpl b/gosa-core/ihtml/themes/default/password.tpl
index fabd05230..0dfc2f5fb 100644
--- a/gosa-core/ihtml/themes/default/password.tpl
+++ b/gosa-core/ihtml/themes/default/password.tpl
@@ -21,6 +21,7 @@
   <link rel="shortcut icon" href="favicon.ico">
 
   {if isset($ieworkaround)}<script language="javascript"src="include/png.js" type="text/javascript"></script>{/if}
+  <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
   <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
   <script language="javascript" src="include/pwdStrength.js" type="text/javascript"></script>
 </head>
diff --git a/gosa-core/ihtml/themes/default/setup_headers.tpl b/gosa-core/ihtml/themes/default/setup_headers.tpl
index 2ca2943ed..25c0f38ba 100644
--- a/gosa-core/ihtml/themes/default/setup_headers.tpl
+++ b/gosa-core/ihtml/themes/default/setup_headers.tpl
@@ -18,6 +18,7 @@
   <style type="text/css">@import url('themes/default/style.css');</style>
   <link rel="shortcut icon" href="favicon.ico">
 
-  <script language="javascript"src="include/png.js" type="text/javascript"></script>
-  <script language="javascript"src="include/gosa.js" type="text/javascript"></script>
+  <script language="javascript" src="include/png.js" type="text/javascript"></script>
+  <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
+  <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
 </head>