pari: branch asterisknow r1919 - /branches/asterisknow/config/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Thu Dec  6 11:36:34 2007
New Revision: 1919

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1919
Log:
Add delay in presenting the main gui panels - leave enough room for ztscan to update the main FXOFXS array in cfgbasic.html 

Modified:
    branches/asterisknow/config/cfgbasic.html
    branches/asterisknow/config/digital.html
    branches/asterisknow/config/home.html

Modified: branches/asterisknow/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/cfgbasic.html?view=diff&rev=1919&r1=1918&r2=1919
==============================================================================
--- branches/asterisknow/config/cfgbasic.html (original)
+++ branches/asterisknow/config/cfgbasic.html Thu Dec  6 11:36:34 2007
@@ -202,7 +202,7 @@
 	newpanel( ["Voicemail", "voicemail.html", "General settings for voicemail"]);
 	newpanel( ["Call Queues", "queues.html", "Call queues allow calls to be sequenced to one or more agents."]);
 	newpanel( ["Service Providers", "trunks.html", "Service Providers are outbound lines used to allow the system to make calls to the real world.  Trunks can be VoIP lines or traditional telephony lines."]);
-	newpanel( ["Digital Config", "digital.html", "Digital Configuration and setup allow the user to detect all digital cards (t1/e1/j1) and configure them. The user can access each individual line property, and also set each line as a trunk."]);
+	newpanel( ["Configure Hardware", "digital.html", "Configure & setup your T1/E1/ANalog Cards."]);
 	newpanel( ["mISDN Config", "misdn.html", "mISDN configuration from the asterisk GUI"]); // Uncomment when mISDN is completed.
 	newpanel( ["Calling Rules", "numberplan.html", "The Calling Rules define dialing permissions and least cost routing rules."]);
 	newpanel( ["Incoming Calls", "incoming.html", "Define how your incoming calls should be handled & configure DID (Direct inward Dialing)"]);
@@ -229,6 +229,10 @@
 function pingevery(a){
 	window.setTimeout(makeping, 1000);
 	keepPinging = setInterval( makeping, a*250 );
+	astmanEngine.run_tool(asterisk_guiZtscan, function(t) { // run ztscan and then try loading ztscan.conf
+		setTimeout( function(){config2json('ztscan.conf', 0, get_FXOFXSPORTS);} , 200);
+		// leave some time for ztscan to generate ztscan.conf
+	});
 }
 
 function makeping(){

Modified: branches/asterisknow/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/digital.html?view=diff&rev=1919&r1=1918&r2=1919
==============================================================================
--- branches/asterisknow/config/digital.html (original)
+++ branches/asterisknow/config/digital.html Thu Dec  6 11:36:34 2007
@@ -301,7 +301,7 @@
 }
 
 function localajaxinit(){
-	setWindowTitle("Digital Cards(T1/E1) Configuration");
+	setWindowTitle("Analog & Digital Cards(T1/E1) Setup & Configuration");
 	top._$('mainscreen').width= 798;
 	_$('save_b').disabled = true;
 	_$('cancel_b').disabled = true;

Modified: branches/asterisknow/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/home.html?view=diff&rev=1919&r1=1918&r2=1919
==============================================================================
--- branches/asterisknow/config/home.html (original)
+++ branches/asterisknow/config/home.html Thu Dec  6 11:36:34 2007
@@ -87,25 +87,23 @@
 		checkessentials();
 	}
 
-	parent.setLoggedOn(1);
-	parent.loggedon = 1;
-	localloggedon = 1;
-	_$('username').className  = "input9_disabled";
-	_$('secret').className  = "input9_disabled";
-	updateButtons();
-	_$('statusbar').innerHTML = "<img src='images/tick.gif'><i>Connected!</i>";
-	var _rc = parent._$('reloadconfig'); 
-	_rc.innerHTML = "Activate Changes";
-	_rc.onclick = parent.reloadConfig ;
-	_rc.style.display = "" ;
-	var _ll = parent._$('logoutlink'); 
-	_ll.innerHTML = "Logout";
-	_ll.onclick = parent.Logoff ;
-	_ll.style.display = "" ;
-
-	parent.astmanEngine.run_tool(asterisk_guiZtscan, function(t) { // run ztscan and then try loading ztscan.conf
-		setTimeout( function(){config2json('ztscan.conf', 0, parent.get_FXOFXSPORTS);} , 500); // leave some time for ztscan to generate ztscan.conf
-	});
+	setTimeout( function(){
+		parent.setLoggedOn(1);
+		parent.loggedon = 1;
+		localloggedon = 1;
+		_$('username').className  = "input9_disabled";
+		_$('secret').className  = "input9_disabled";
+		updateButtons();
+		_$('statusbar').innerHTML = "<img src='images/tick.gif'><i>Connected!</i>";
+		var _rc = parent._$('reloadconfig'); 
+		_rc.innerHTML = "Activate Changes";
+		_rc.onclick = parent.reloadConfig ;
+		_rc.style.display = "" ;
+		var _ll = parent._$('logoutlink'); 
+		_ll.innerHTML = "Logout";
+		_ll.onclick = parent.Logoff ;
+		_ll.style.display = "" ;
+	}, 1000 );
 }
 
 function loggedOff() {