diff -rN -U 5 ../aadk/config/cfgbasic.html ./config/cfgbasic.html --- ../aadk/config/cfgbasic.html 2007-07-18 20:32:00.000000000 +0200 +++ ./config/cfgbasic.html 2008-05-01 16:11:55.000000000 +0200 @@ -26,11 +26,12 @@ var accordion; var tooltip_default = "Move the mouse over to a field to see tooltips"; var asterisk_guitools_inextconf = 0; eventeater.pingstatus = false; var keepPinging; -var CF_status = 0; +var CF_status = 1; +var Searched4CF = 1; var MainScreenPanels = []; var newMSpanel = function(s){ var r = {}; r.PanelName = s[0]; r.FileName = s[1]; @@ -48,17 +49,17 @@ newMSpanel( ["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."]); newMSpanel( ["Calling Rules", "numberplan.html", "The Calling Rules define dialing permissions and least cost routing rules."]); newMSpanel( ["Incoming Calls", "incoming.html", "Define how your incoming calls should be handled & configure DID (Direct inward Dialing)"]); newMSpanel( ["Networking", "networking.html", "Configures networking parameters"]); newMSpanel( ["Voice Menus", "menus.html", "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"]); - newMSpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]); + //newMSpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]); newMSpanel( ["Call Parking", "callparking.html", "configure call parking features"]); newMSpanel( ["Ring Groups", "ringgroups.html", "define RingGroups to dial more than one extension"]); newMSpanel( ["Active Channels", "status.html", "Monitor active channels."]); // newMSpanel( ["Graphs", "graphs.html", "View Graphs of your System Information."]); newMSpanel( ["System Info", "sysinfo.html", "System Information."]); - newMSpanel( ["Backup", "backup.html", "Backup Management."]); + //newMSpanel( ["Backup", "backup.html", "Backup Management."]); newMSpanel( ["Update", "flashupdate.html", "Update Firmware installed on the appliance."]); newMSpanel( ["Options", "localexts.html", "Admin Settings"]); } @@ -66,15 +67,15 @@ function fit_toScreen(){ var t = ASTGUI.displayHeight(); var minimumheight = 150; var c =_$('configpanel'); c.WIH = t; - _$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 70) ; + _$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 90) ; var pnameheight = 22; c.pnameheight = pnameheight; var panels = returnpanels(); - var pheight = (( t - 70) - (pnameheight*panels.length) ) ; + var pheight = (( t - 90) - (pnameheight*panels.length) ) ; if(pheight > minimumheight){ c.pheight = pheight; }else{ pheight = minimumheight; c.pheight = minimumheight ; @@ -279,11 +280,11 @@ } function goto_advancedoption(){ _$('mainscreen').style.display = "none"; - if( _$('AdvancedOptionsSelect').value == 'TOSETUP'){top.window.location.href = "./setup/install.html"; return;} + //if( _$('AdvancedOptionsSelect').value == 'TOSETUP'){top.window.location.href = "./setup/install.html"; return;} var t; var panels = returnpanels(); for( var r=0; r < panels.length; r++ ){ t = panels[r].page.split(".html")[0]; @@ -295,39 +296,37 @@ _$('mainscreen').src = _$('AdvancedOptionsSelect').value ; } - Asterisk Configuration GUI (Beta) - + Asterisk Configuration GUI (Beta) - - + + - +
  - - About Digium  +
-
+
Loading Screen 
- +
    
diff -rN -U 5 ../aadk/config/cli.html ./config/cli.html --- ../aadk/config/cli.html 2007-06-04 20:47:14.000000000 +0200 +++ ./config/cli.html 2008-05-01 16:09:34.000000000 +0200 @@ -83,11 +83,11 @@ } } -
+
Asterisk Command Line Interface      
diff -rN -U 5 ../aadk/config/feditor.html ./config/feditor.html --- ../aadk/config/feditor.html 2007-06-04 20:47:14.000000000 +0200 +++ ./config/feditor.html 2008-05-01 16:09:34.000000000 +0200 @@ -336,11 +336,11 @@ config2json( global_fileBeingEdited, 0, fileparsed ); }); } -
+
File Editor       diff -rN -U 5 ../aadk/config/flashupdate.html ./config/flashupdate.html --- ../aadk/config/flashupdate.html 2007-07-18 20:32:00.000000000 +0200 +++ ./config/flashupdate.html 2008-05-01 16:09:34.000000000 +0200 @@ -23,71 +23,113 @@
@@ -223,11 +223,11 @@
Advanced Options Setup Wizard 
diff -rN -U 5 ../aadk/config/networking.html ./config/networking.html --- ../aadk/config/networking.html 2007-07-18 20:32:00.000000000 +0200 +++ ./config/networking.html 2008-05-01 16:09:34.000000000 +0200 @@ -19,11 +19,11 @@
Change Password
- +
Local Extension settings Change PasswordSetup Wizard 
diff -rN -U 5 ../aadk/config/ringgroups.html ./config/ringgroups.html --- ../aadk/config/ringgroups.html 2007-07-18 20:32:00.000000000 +0200 +++ ./config/ringgroups.html 2008-05-01 16:09:34.000000000 +0200 @@ -487,11 +487,11 @@ function cancel_rg(){ _$('ringgroup_editdiv').style.display = 'none'; } -
+
Ring Groups      
diff -rN -U 5 ../aadk/config/scripts/astman.js ./config/scripts/astman.js --- ../aadk/config/scripts/astman.js 2007-07-18 20:32:00.000000000 +0200 +++ ./config/scripts/astman.js 2008-05-01 16:09:34.000000000 +0200 @@ -30,11 +30,11 @@ var asterisk_scriptsFolder = "/var/lib/asterisk/scripts/" ; /* Directory for gui scripts (graphs.sh, for example) */ var asterisk_Sounds_path = "/var/lib/asterisk/sounds/"; var asterisk_menusRecord_path = asterisk_Sounds_path + "record/"; var asterisk_guiSysInfo = "sh " + asterisk_scriptsFolder + "gui_sysinfo" ; var asterisk_guiSysInfo_output = "./sysinfo_output.html"; -var asterisk_guiNetworkSettings = "sh " + asterisk_scriptsFolder + "networking.sh"; +var asterisk_guiNetworkSettings = "sh " + "/persistent/autorun/S30networking.sh reload"; var asterisk_guiZapscan = "/sbin/zapscan.bin" ; var asterisk_rawmanPath = "../../rawman" ; var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist var asterisk_configfolder = "/etc/asterisk/"; var asterisk_guiapplyUimage = "flashupdate" ; @@ -1143,11 +1143,12 @@ onFailure: function(t) { gui_alert("Tool Error: " + t.status + ": " + t.statusText); } }; var tmp; - opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=60000"; + //opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=60000"; + opt.parameters="action=originate&channel=" + encodeURIComponent("Local/executecommand@"+asterisk_guitools ) + "&Variable=command%3d"+ encodeURIComponent(tool) + "&application=noop&timeout=7200000"; tmp = new Ajax.Request(this.url, opt); }; this.cliCommand = function(cmd, callback) { var opt = { diff -rN -U 5 ../aadk/config/scripts/tooltip.js ./config/scripts/tooltip.js --- ../aadk/config/scripts/tooltip.js 2007-08-01 01:09:01.000000000 +0200 +++ ./config/scripts/tooltip.js 2008-05-01 16:09:34.000000000 +0200 @@ -318,6 +318,13 @@ tooltips['networking'] .en[0] = "Hostname: Set the host name for your Asterisk Appliance" ; tooltips['networking'] .en[1] = "NTP Server: Sync time from a network time server" ; tooltips['networking'] .en[2] = "SSH: Enable/Disable SSH access to your Asterisk Appliance" ; tooltips['networking'] .en[3] = "URL for Polycom Auto Provisioning: Set http address for Auto Provisioning Polycom Phones.
Example: http://192.168.69.1/phoneprov" ; - +// Tooltips for flashupdate.html in english + tooltips['flashupdate']= new Object; + tooltips['flashupdate'].en = new Array; + tooltips['flashupdate'].en[0] = "Ramdisk: Update the main read-only filesystem"; + tooltips['flashupdate'].en[1] = "Kernel: Update the kernel image"; + tooltips['flashupdate'].en[2] = "U-Boot: Update the u-boot bootloader"; + tooltips['flashupdate'].en[3] = "FPGA Firmware: Update the FPGA firmware"; + tooltips['flashupdate'].en[4] = "HTTP URL: Full HTTP url to the image to update from (ie: http://pikatech.com/sample/image.fs"; diff -rN -U 5 ../aadk/config/setup/1.html ./config/setup/1.html --- ../aadk/config/setup/1.html 2007-07-18 20:32:00.000000000 +0200 +++ ./config/setup/1.html 2008-05-01 16:09:34.000000000 +0200 @@ -148,11 +148,11 @@ var tmp = new Ajax.Request(rawman_url, opt); } function scan_zapteldevices(){ - parent.astmanEngine.run_tool(asterisk_guiZapscan, onSuccess=function(){ config2json('zapscan.conf',1,zapscan_conf_loaded); }); + config2json('zapscan.conf',1,zapscan_conf_loaded); return; } zapscan_conf_loaded = function(c){ var _zapchan = _$('zapchan') ; @@ -240,11 +240,11 @@