pari: trunk r206 - in /trunk/config: ./ setup/
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Tue Jan 2 18:35:44 MST 2007
Author: pari
Date: Tue Jan 2 19:35:43 2007
New Revision: 206
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=206
Log:
Fix for setup wizard timeouts -- Pollevents in Setup wizard
Modified:
trunk/config/cfgadvanced.html
trunk/config/cfgappliance.html
trunk/config/cfgbasic.html
trunk/config/setup/1.html
trunk/config/setup/10.html
trunk/config/setup/2.html
trunk/config/setup/3.html
trunk/config/setup/4.html
trunk/config/setup/5.html
trunk/config/setup/6.html
trunk/config/setup/7.html
trunk/config/setup/install.html
Modified: trunk/config/cfgadvanced.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cfgadvanced.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/cfgadvanced.html (original)
+++ trunk/config/cfgadvanced.html Tue Jan 2 19:35:43 2007
@@ -205,7 +205,9 @@
<tr height=47><td valign="bottom" align='right' bgcolor='white' height=47><img align='left' src="images/digiumlogo.gif" align="left"></td>
<td valign='bottom' align='right' bgcolor='white' colspan=2>
<!-- <a href="#" onclick=" system_link()">System Configuration</a> | -->
- <a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> | <a href="#">Help</a>
+ <a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> |
+ <a target='_extern' href="http://www.asterisknow.org/bugs">Bugs</a> |
+ <a href="#">Help</a>
<input type="hidden" id="login_name">
</td>
</tr>
Modified: trunk/config/cfgappliance.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cfgappliance.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/cfgappliance.html (original)
+++ trunk/config/cfgappliance.html Tue Jan 2 19:35:43 2007
@@ -190,7 +190,9 @@
<body onload="javascript:registerajax()" topmargin=1>
<table border="0" align="center" cellspacing="0" cellpadding="0" bgcolor="#dddddd" width=950 height=570>
<tr height=47><td valign="bottom" align='right' bgcolor='white' height=47><img align='left' src="images/digiumlogo.gif" align="left"></td>
- <td valign='bottom' align='right' bgcolor='white' colspan=2><a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> | <a href="#">Help</a>
+ <td valign='bottom' align='right' bgcolor='white' colspan=2><a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> |
+ <a target='_extern' href="http://www.asterisknow.org/bugs">Bugs</a> |
+ <a href="#">Help</a>
<input type="hidden" id="login_name">
</td>
</tr>
Modified: trunk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/cfgbasic.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/cfgbasic.html (original)
+++ trunk/config/cfgbasic.html Tue Jan 2 19:35:43 2007
@@ -203,7 +203,9 @@
<tr height=47><td valign="bottom" align='right' bgcolor='white' height=47><img align='left' src="images/digiumlogo.gif" align="left"></td>
<td valign='bottom' align='right' bgcolor='white' colspan=2>
<!-- <a href="#" onclick=" system_link()">System Configuration</a> | -->
- <a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> | <a href="#">Help</a>
+ <a target='_extern' href="http://www.digium.com/en/company/profile/">About Digium</a> |
+ <a target='_extern' href="http://www.asterisknow.org/bugs">Bugs</a> |
+ <a href="#">Help</a>
<input type="hidden" id="login_name">
</td>
</tr>
Modified: trunk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/1.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/1.html (original)
+++ trunk/config/setup/1.html Tue Jan 2 19:35:43 2007
@@ -46,6 +46,9 @@
}
function getextconf(){
+ parent.loggedon = 1;
+ parent.astmanEngine.pollEvents();
+
var opt = {
method: 'get',
asynchronous: true,
@@ -212,7 +215,7 @@
<div class="heading">Pleae enter your admin Username and Password </div>
<table align="center">
<tr><td>Username:</td> <td><input id="username" size=12 value=admin></td> </tr>
- <tr><td>Secret:</td> <td><input type="password" id="secret" size=12 value=secret></td> </tr>
+ <tr><td>Secret:</td> <td><input type="password" id="secret" size=12></td> </tr>
<tr><td align='center' colspan='2' height=40 valign=bottom>
<input type="button" id="login" value="Login" onClick="login()" >
</td>
Modified: trunk/config/setup/10.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/10.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/10.html (original)
+++ trunk/config/setup/10.html Tue Jan 2 19:35:43 2007
@@ -39,7 +39,7 @@
if ( originalRequest.responseText.match("Pong") ) {
// load default numbnerplan settings
-
+ parent.astmanEngine.pollEvents();
}
}
Modified: trunk/config/setup/2.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/2.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/2.html (original)
+++ trunk/config/setup/2.html Tue Jan 2 19:35:43 2007
@@ -24,7 +24,7 @@
parent.$('back').disabled = false;
parent.$('back').onclick = function(){ window.location.href="1.html"; };
rawman_url = parent.rawman_url ;
- parent.astmanEngine.setURL(rawman_url);
+ //parent.astmanEngine.setURL(rawman_url);
ping();
}
@@ -60,6 +60,7 @@
onComplete: function(originalRequest){
$('sysinfo').innerHTML = originalRequest.responseText;
today = $('si_date').innerHTML;
+ parent.astmanEngine.pollEvents();
sysinfocallbacks_loaded();
},
onFailure: function(t) {
Modified: trunk/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/3.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/3.html (original)
+++ trunk/config/setup/3.html Tue Jan 2 19:35:43 2007
@@ -85,6 +85,7 @@
usercallbacks.loaded = function(){
+ parent.astmanEngine.pollEvents();
$('devices').selectitem(0);
parent.$('next').disabled = false;
parent.$('back').disabled = false;
Modified: trunk/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/4.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/4.html (original)
+++ trunk/config/setup/4.html Tue Jan 2 19:35:43 2007
@@ -109,11 +109,11 @@
}
callbacks.loaded = function() {
+ parent.astmanEngine.pollEvents();
$('devices').contentEditable = 'true';
$('devices').disabled = 0;
$('new').addEventListener("click", showSPdetails, false);
loadServiceProvidersintotable();
- parent.loadscreen(this);
}
callbacks.postselect = function(){
Modified: trunk/config/setup/5.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/5.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/5.html (original)
+++ trunk/config/setup/5.html Tue Jan 2 19:35:43 2007
@@ -125,6 +125,7 @@
}
numplan_callbacks.loaded = function() {
+ parent.astmanEngine.pollEvents();
if(!default_numberplan){
// Redirect To creating a default Number Plan
addthe_default_callingplan();
Modified: trunk/config/setup/6.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/6.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/6.html (original)
+++ trunk/config/setup/6.html Tue Jan 2 19:35:43 2007
@@ -148,6 +148,7 @@
callbacks.usesubfields = true;
callbacks.loaded = function() {
+ parent.astmanEngine.pollEvents();
var whichexten = "";
for (x=0;x<$('extensions').options.length;x++) {
var tmp;
Modified: trunk/config/setup/7.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/7.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/7.html (original)
+++ trunk/config/setup/7.html Tue Jan 2 19:35:43 2007
@@ -48,6 +48,7 @@
//$('cancel').addEventListener("click", hideuserdetails, false);
//$('save').addEventListener("click", saveuserdetails, false);
$('new').addEventListener("click", showuserdetails, false);
+ parent.astmanEngine.pollEvents();
loadusersintotable();
}
Modified: trunk/config/setup/install.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/install.html?view=diff&rev=206&r1=205&r2=206
==============================================================================
--- trunk/config/setup/install.html (original)
+++ trunk/config/setup/install.html Tue Jan 2 19:35:43 2007
@@ -32,10 +32,21 @@
var fxoports = new Array();
var fxsports = new Array();
var numberofsteps = 7;
+var loggedon = 0;
+var eventeater = {};
+
function localinit(){
}
+eventeater.eventcb = function(msgs) {
+ if (loggedon == 1){
+ astmanEngine.pollEvents();
+ }
+}
+
+astmanEngine.setURL('../../rawman');
+astmanEngine.setEventCallback(eventeater.eventcb);
</script>
<body onload="localinit()" topmargin=0 bgcolor="FFFFFF">
<TABLE width=800 cellpadding=0 cellspacing=0 border=0 align="center" style="border: 1px solid #660000; margin-top: 8px;">
More information about the asterisk-gui-commits
mailing list