[Netpass-devel] NetPass/www/htdocs/OSSTemplate/js ldap.js,NONE,1.1 radius.js,NONE,1.1 common.js,1.2,1.3 debug.js,1.9,1.10 network.js,1.5,1.6

[jeff m. <jef...@us...>]

Update of /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4634/www/htdocs/OSSTemplate/js

Modified Files:
	common.js debug.js network.js 
Added Files:
	ldap.js radius.js 
Log Message:
bug fixes to editor, auth methods UI feature

Index: debug.js
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/debug.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debug.js	2 Jun 2005 19:10:13 -0000	1.9
+++ debug.js	8 Jun 2005 16:35:42 -0000	1.10
@@ -1,4 +1,4 @@
-var DBGLEVEL = 0;
+var DBGLEVEL = 1;
 var dbgwin;
 var browserType_IE = 0;
 

--- NEW FILE: ldap.js ---
// when the ldap server field changes,
// do a submit to refresh the page

function ldap_onchange_ldapServer(prefix) {
	var RN = "ldap_onchange_ldapServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'ldapServer');
	for (var i = 1 ; i < o.options.length ; i++) {
		if (o.options[i].selected)
			document.forms[0].submit();
	}
}

function ldap_onfocus_addServer(prefix) {
	var RN = "ldap_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'ldapAddServer');
	if (o && o.value == "Add Server...") 
		o.value = '';
}

function ldap_onblur_addServer(prefix) {
	var RN = "ldap_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'ldapAddServer');
	var l = document.getElementById(prefix + 'ldapServer');
	if (o && l && o.value) {
		var oo = new Option (o.value, o.value, false, false);
		l.options[l.options.length] = oo;
		unHighLightList(prefix + 'ldapServer');
		sortList(prefix + 'ldapServer');
		ldap_clear_fields(prefix);
	}
	o.value = 'Add Server...';
}

function ldap_onclick_delServer() {
	var RN = "ldap_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'ldapServer');
	if (o) {
		for (var i = o.options.length-1 ; i > 0 ; i--) {
			if (o.options[i].selected)
				o.options[i] = undefined;
		}
	}
}

function ldap_clear_fields(prefix) {
	var o = document.getElementById(prefix + 'ldapBase');
	if (o) o.value = '';
	o = document.getElementById(prefix + 'ldapFilter');
	if (o) o.value = '';
	o = document.getElementById(prefix + 'ldapPasswordField');
	if (o) o.value = '';
}

Index: common.js
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/common.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common.js	4 May 2005 20:22:18 -0000	1.2
+++ common.js	8 Jun 2005 16:35:42 -0000	1.3
@@ -36,11 +36,17 @@
 }
 
 function sortList(ln) {
+	var RN = "sortList";
+
 	if (ln) {
 		var l = document.getElementById(ln);
 		if (l && l.options.length) {
 			var oa = new Array();
 			for (var i = 1 ; i < l.options.length ; i++) {
+				var si = oa.selectedIndex;
+				var sv = undefined;
+				if (si > -1) 
+					sv = oa.options[si].value;
 				oa[oa.length] = new Option( l.options[i].text, 
 							    l.options[i].value, 
 							    l.options[i].defaultSelected, 
@@ -56,6 +62,9 @@
 								    oa[i].defaultSelected,
 								    oa[i].selected)
 						;
+					if (oa[i].value == sv) {
+						l.selectedIndex = i;
+					}
 				}
 			}
 		}
@@ -65,15 +74,18 @@
 function unHighLightList(oname, item) {
         var RN  = "unHighLightList";
 
+	dbg(1, RN);
+
         var acl = document.getElementById(oname);
         if (acl) {
                 for(var i = 0 ; i < acl.options.length ; i++) {
-                        if (i && item) {
+                        if (item) {
                                 if (item == acl.options[i].value)
                                         acl.options[i].selected = false;
                         } else {
                                 acl.options[i].selected = false;
                         }
+			acl.selectedIndex = -1;
                 }
         } else {
                 dbg (1, RN + ": error cant find " + oname + " object");
@@ -83,7 +95,7 @@
 
 function highLightList(oname, item) {
         var RN  = "highLightList";
-
+	
         var acl = document.getElementById(oname);
         if (acl) {
                 for(var i = 1 ; i < acl.options.length ; i++) {
@@ -94,6 +106,7 @@
                         else {
                                 acl.options[i].selected = true;
                         }
+			acl.selectedIndex = -1;
                 }
         } else {
                 dbg (1, RN + ": error cant find " + oname + " object");

--- NEW FILE: radius.js ---
// when the radius server field changes,
// do a submit to refresh the page

function radius_onchange_radiusServer(prefix) {
	var RN = "radius_onchange_radiusServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'radiusServer');
	for (var i = 1 ; i < o.options.length ; i++) {
		if (o.options[i].selected)
			document.forms[0].submit();
	}
}

function radius_onfocus_addServer(prefix) {
	var RN = "radius_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'radiusAddServer');
	if (o && o.value == "Add Server...") 
		o.value = '';
}

function radius_onblur_addServer(prefix) {
	var RN = "radius_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'radiusAddServer');
	var l = document.getElementById(prefix + 'radiusServer');
	if (o && l && o.value) {
		var oo = new Option (o.value, o.value, false, false);
		l.options[l.options.length] = oo;
		unHighLightList(prefix + 'radiusServer');
		sortList(prefix + 'radiusServer');
		radius_clear_fields(prefix);
	}
	o.value = 'Add Server...';
}

function radius_onclick_delServer() {
	var RN = "radius_onfocus_addServer";
	dbg (1, RN);
	var o = document.getElementById(prefix + 'radiusServer');
	if (o) {
		for (var i = o.options.length-1 ; i > 0 ; i--) {
			if (o.options[i].selected)
				o.options[i] = undefined;
		}
	}
}

function radius_clear_fields(prefix) {
	var o = document.getElementById(prefix + 'radiusSecret');
	if (o) o.value = '';
}

Index: network.js
===================================================================
RCS file: /cvsroot/netpass/NetPass/www/htdocs/OSSTemplate/js/network.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- network.js	2 Jun 2005 20:02:27 -0000	1.5
+++ network.js	8 Jun 2005 16:35:42 -0000	1.6
@@ -82,6 +82,7 @@
 				nw.options[nw.options.length] = no;
 				unHighLightList("network");
 				nw.options[nw.options.length-1].selected = true;
+				nw.selectedIndex = nw.options.length;
 				sortList("network");
 			} else {
 				dbg (1, RN + ": network already exists: " + o.value);
@@ -134,6 +135,7 @@
 			servs.options[servs.options.length] = no;
 			unHighLightList("haNPServers");
 			servs.options[servs.options.length-1].selected = true;
+			servs.selectedIndex = servs.options.length;
 			sortList("haNPServers");
 		} else {
 			dbg (1, RN + ": server already exists: " + o.value);
@@ -201,25 +203,33 @@
 	var servs = document.getElementById('switches');
 	if (servs && o && o.value != "") {
 		var exists = false;
+		dbg(1, RN + ": everythings OK");
 		for(var i = 0 ; i < servs.options.length ; i++) {
 			if (servs.options[i].value == o.value) exists = true;
 		}
 		if (!exists) {
+			dbg(1, RN + ": doesnt exist");
 			var no = new Option(o.value, o.value, false, false);
 			servs.options[servs.options.length] = no;
 			unHighLightList("switches");
 			servs.options[servs.options.length-1].selected = true;
+			servs.selectedIndex = servs.options.length-1;
+			dbg(1, RN + ": calling sort");
 			sortList("switches");
 		} else {
 			dbg (1, RN + ": switch already exists: " + o.value);
 		}
+		dbg(1, RN + ": resetting input field");
+		dbg(1, RN + ": " + o.value + " reset");
+		o.value = 'Add Switch...';
+	} else {
+		dbg(1, RN + ": somethings wrong");
 	}
-	if (o) o.value = "Add Switch...";
 	return false;
 }
 
 function network_onfocus_addSwitch(o) {
-	var RN = "network_onblur_addSwitch";
+	var RN = "network_onfocus_addSwitch";
 	dbg(1, RN);
 	if (o && o.value == "Add Switch...") o.value = '';
 }