pari: branch aadk r894 - in /branches/aadk: ./ config/ config/scripts/

Tue May 8 10:21:42 MST 2007

Author: pari
Date: Tue May  8 12:21:42 2007
New Revision: 894

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=894
Log:
Merged revisions 887-888 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r887 | pari | 2007-05-07 11:39:36 -0500 (Mon, 07 May 2007) | 1 line

If session timed out during keepPinging, then show login page
........
r888 | pari | 2007-05-07 13:43:01 -0500 (Mon, 07 May 2007) | 1 line

Fixing postion of gui_alert
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/cfgbasic.html
    branches/aadk/config/guialert.html
    branches/aadk/config/scripts/astman.js

Propchange: branches/aadk/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May  8 12:21:42 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-884
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-893

Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=894&r1=893&r2=894
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Tue May  8 12:21:42 2007
@@ -60,10 +60,10 @@
 		parameters: "action=ping",
 		asynchronous: true,
 		onComplete: function(t){
-			//if( t.responseText.match("Authentication failed") || t.responseText =="" ){
-			//	window.clearInterval(keepPinging);
-			//}
-			// For some reason, I could not get clearInterval to work. I will fix this soon. - pari
+			if( t.responseText.match(asterisk_guipingerror) ){
+				window.location.href=window.location.href;
+			}
+			
 		}
 	};
 	tmp = new Ajax.Request( asterisk_rawmanPath, opt);

Modified: branches/aadk/config/guialert.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/guialert.html?view=diff&rev=894&r1=893&r2=894
==============================================================================
--- branches/aadk/config/guialert.html (original)
+++ branches/aadk/config/guialert.html Tue May  8 12:21:42 2007
@@ -18,7 +18,8 @@
 <head>
 </head>
 <body onload="update()" topmargin=0 leftmargin=0 style="background-color: transparent; cursor: not-allowed">
-	<div id="div_alert" STYLE="display:none; position: absolute; left: 260; top: 180; width:360;  background-color:#FFFFFF; border-width: 2px; border-color: #7E5538; border-style: solid; background-style: solid; cursor: default">
+<table width="100%" height="570" align=center border=0><tr><td valign="middle" align=center>
+	<div id="div_alert" STYLE="display:none; width:360;  background-color:#FFFFFF; border-width: 2px; border-color: #7E5538; border-style: solid; background-style: solid; cursor: default">
 		<table width="100%" cellpadding=0 cellspacing=0>
 		<TR bgcolor="#7E5538"  style="background-image:url('images/title_gradient.gif');">
 				<TD Height="20" align="center">
@@ -41,4 +42,5 @@
 		</TR>
 		</TABLE>
 	</div>
+</td></tr></table>
 </body>

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=894&r1=893&r2=894
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Tue May  8 12:21:42 2007
@@ -20,6 +20,7 @@
  */
 
 var sc_displaytime = 1000;
+var asterisk_guipingerror = "Message: Authentication Required";
 var asterisk_guiappname =  "Asterisk GUI (Beta)";
 var asterisk_guitools = "asterisk_guitools";
 var asterisk_guitoolsversion = "0.7";
@@ -1606,7 +1607,7 @@
 		me.eventcallback(msgs);
 	};
 	this.eventResponse = function(t) {
-		if( t.responseText.match("Message: Authentication Required") ){		
+		if( t.responseText.match(asterisk_guipingerror) ){		
 				parent.window.location.href = parent.window.location.href ;
 		}
 		var _nu = navigator.userAgent; 

