pari: branch aadk r1261 - in /branches/aadk/config: ./ images/ scripts/ setup/
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Wed Jul 18 13:32:01 CDT 2007
Author: pari
Date: Wed Jul 18 13:32:00 2007
New Revision: 1261
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1261
Log:
merging recent changes from trunk
Added:
branches/aadk/config/images/ngt.jpg (with props)
branches/aadk/config/images/simplesignal.jpg (with props)
branches/aadk/config/images/voicepulse.gif (with props)
branches/aadk/config/images/voilaip.gif (with props)
Modified:
branches/aadk/config/backup.html
branches/aadk/config/callparking.html
branches/aadk/config/cfgbasic.html
branches/aadk/config/flashupdate.html
branches/aadk/config/graphs.html
branches/aadk/config/guialert.html
branches/aadk/config/home.html
branches/aadk/config/iax.html
branches/aadk/config/incoming.html
branches/aadk/config/jabber.html
branches/aadk/config/jingle.html
branches/aadk/config/localexts.html
branches/aadk/config/meetme.html
branches/aadk/config/menus.html
branches/aadk/config/moh.html
branches/aadk/config/networking.html
branches/aadk/config/numberplan.html
branches/aadk/config/options.html
branches/aadk/config/queues.html
branches/aadk/config/record.html
branches/aadk/config/ringgroups.html
branches/aadk/config/scripts/astman.js
branches/aadk/config/scripts/tooltip.js
branches/aadk/config/setup/1.html
branches/aadk/config/setup/10.html
branches/aadk/config/setup/4.html
branches/aadk/config/setup/5.html
branches/aadk/config/setup/7.html
branches/aadk/config/setup/8.html
branches/aadk/config/setup/install.html
branches/aadk/config/setup/setup.css
branches/aadk/config/sip.html
branches/aadk/config/status.html
branches/aadk/config/sysinfo.html
branches/aadk/config/timezone.html
branches/aadk/config/trunks.html
branches/aadk/config/upload2.html
branches/aadk/config/users.html
branches/aadk/config/voicemail.html
branches/aadk/config/zapata.html
Modified: branches/aadk/config/backup.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/backup.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/backup.html (original)
+++ branches/aadk/config/backup.html Wed Jul 18 13:32:00 2007
@@ -1,22 +1,16 @@
<!--
- * Asterisk-GUI - an Asterisk configuration interface
- *
- * "Backup / Restore" management
- *
- * Copyright (C) 2006-2007, Digium, Inc.
+ * Configuration for "Backup / Restore" from Compact Flash
+ *
+ * Copyright (C) 2006 - 2007, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
* Pari Nannapaneni <pari at digium.com>
*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All Rights Reserved.
+ *
+ * Distribution of this file is subject to the license
+ * agreement you accepted when obtained and/or activated
+ * the Digium product containing this file.
*
-->
<script src="scripts/prototype.js"></script>
Modified: branches/aadk/config/callparking.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/callparking.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/callparking.html (original)
+++ branches/aadk/config/callparking.html Wed Jul 18 13:32:00 2007
@@ -25,7 +25,7 @@
<script>
var phonecallbacks = new Object;
var widgets = {};
-var fieldnames = ['save','cancel','parkext','parkpos','parkingtime','pickupexten','atxfernoanswertimeout'];
+var fieldnames = ['save','cancel','parkext','parkpos','parkingtime'];
phonecallbacks.format = function(t) {
if(t.name.match('general'))
@@ -73,12 +73,6 @@
<tr> <td align=right>Number of seconds a call can be parked for:</td>
<td> <input size=2 type='text' id='parkingtime' class="input8" dfalt="45"></td>
</tr>
- <tr> <td align=right>Pickup Extension:</td>
- <td> <input size=2 type='text' id='pickupexten' class="input8" dfalt="*8"></td>
- </tr>
- <tr> <td align=right>Timeout for answer on attended transfer:</td>
- <td> <input size=2 type='text' id='atxfernoanswertimeout' class="input8" dfalt="15"></td>
- </tr>
<tr><td colspan=2 align=center height=40 valign=bottom>
<input type='button' id='save' value='Save' class="buttonbold">
<input type='button' id='cancel' value='Cancel' class="buttonbold">
Modified: branches/aadk/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/cfgbasic.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/cfgbasic.html (original)
+++ branches/aadk/config/cfgbasic.html Wed Jul 18 13:32:00 2007
@@ -1,26 +1,21 @@
<!--
* Asterisk-GUI - an Asterisk configuration interface
*
- * Top level for configuration file
- *
- * Copyright (C) 2006-2007, Digium, Inc.
+ * Copyright (C) 2006 - 2007, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
* Pari Nannapaneni <pari at digium.com>
*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All Rights Reserved.
+ *
+ * Distribution of this file is subject to the license
+ * agreement you accepted when obtained and/or activated
+ * the Digium product containing this file.
*
-->
<script>
-var browser_alert = "You owe it to yourself to try it out !<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>Get Firefox</A>";
+//var browser_alert = "You owe it to yourself to try it out !<BR><A href='http://www.getfirefox.com' style='font-size: 13px; font-family:arial,sans-serif,Helvetica,Trebuchet MS; color : #6C74A3;' target='_blank'>Get Firefox</A>";
+var browser_alert = "";
</script>
<script src="scripts/prototype.js"></script>
<script src="scripts/astman.js"></script>
@@ -34,10 +29,43 @@
eventeater.pingstatus = false;
var keepPinging;
var CF_status = 0;
+var MainScreenPanels = [];
+var newMSpanel = function(s){
+ var r = {};
+ r.PanelName = s[0];
+ r.FileName = s[1];
+ r.PanelDesc = s[2];
+ MainScreenPanels.push(r);
+};
+
+function updateMainScreenPanels(){
+ MainScreenPanels = [];
+ newMSpanel( ["Home", "home.html", "Asterisk Configuration Panel - Please click on a panel to manage related features"]);
+ newMSpanel( ["Users", "users.html", "Users is a short cut for quickly adding and removing all the necessary configuration components for any new phone."]);
+ newMSpanel( ["Conferencing", "meetme.html", "MeetMe conference bridging allow quick, ad-hoc conferences with or without security."]);
+ newMSpanel( ["Voicemail", "voicemail.html", "General settings for voicemail"]);
+ newMSpanel( ["Call Queues", "queues.html", "Call queues allow calls to be sequenced to one or more agents."]);
+ 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( ["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( ["Update", "flashupdate.html", "Update Firmware installed on the appliance."]);
+ newMSpanel( ["Options", "localexts.html", "Admin Settings"]);
+}
+
+
function fit_toScreen(){
var t = ASTGUI.displayHeight();
- var minimumheight = 60;
+ var minimumheight = 150;
var c =_$('configpanel');
c.WIH = t;
_$('TOP_MAINTABLE').rows[1].cells[0].height = (t - 70) ;
@@ -142,7 +170,6 @@
_$( s.id + "_U" ).style.height = _$('configpanel').pheight;
_$( s.id + "_U" ).style.display = "";
- _$('AdvancedOptionsSelect').selectedIndex=-1;
_$('mainscreen').style.display = "none";
_$('mainscreen').src = s.id + ".html";
_$('mainscreen').currentpage = s.id + ".html";
@@ -150,6 +177,7 @@
function returnpanels(){
var panels = [];
+ var u;
var newpanel = function(s){
var r = {};
@@ -159,33 +187,16 @@
panels.push(r);
}
- newpanel( ["Home", "home.html", "Asterisk Configuration Panel - Please click on a panel to manage related features"]);
- newpanel( ["Users", "users.html", "Users is a short cut for quickly adding and removing all the necessary configuration components for any new phone."]);
- newpanel( ["Conferencing", "meetme.html", "MeetMe conference bridging allow quick, ad-hoc conferences with or without security."]);
- 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( ["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)"]);
- newpanel( ["Networking", "networking.html", "Configures networking parameters"]);
- newpanel( ["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"]);
- newpanel( ["Time Based Rules", "timerules.html", "define call routing rules based on date and time"]);
- newpanel( ["Call Parking", "callparking.html", "configure call parking features"]);
- newpanel( ["Ring Groups", "ringgroups.html", "define RingGroups to dial more than one extension"]);
- newpanel( ["Record a Menu", "record.html", "Allows you to record custom voicemenus over a phone"]);
- newpanel( ["Active Channels", "status.html", "Monitor active channels."]);
- newpanel( ["Graphs", "graphs.html", "View Graphs of your System Information."]);
- newpanel( ["System Info", "sysinfo.html", "System Information."]);
- newpanel( ["File Editor", "feditor.html", "Edit Asterisk Config Files"]);
- newpanel( ["Asterisk CLI", "cli.html", "Asterisk Command Line Interface"]);
- newpanel( ["Backup", "backup.html", "Backup Management."]);
- newpanel( ["Update", "flashupdate.html", "Update Firmware installed on the appliance."]);
- newpanel( ["Options", "localexts.html", "Admin Settings"]);
+ for( var y=0; y < MainScreenPanels.length ; y++){
+ u = MainScreenPanels[y];
+ newpanel([ u.PanelName, u.FileName, u.PanelDesc ]);
+ }
return panels;
}
function pingevery(a){
+ setTimeout( makeping, 1000);
keepPinging = setInterval( makeping, a*250 );
}
@@ -226,9 +237,9 @@
}
function registerajax() {
+ updateMainScreenPanels();
fit_toScreen();
ASTGUI.events.add( window , 'resize', fit_toScreen );
- pao();
astmanEngine = new Astman();
astmanEngine.setURL(asterisk_rawmanPath );
@@ -258,20 +269,6 @@
makerequest("","",r, function(t){ gui_feedback("Restarted Asterisk !!",'blue'); } );
}
-
-function pao(){
- var acb = _$('dimg');
- var tmp_left = acb.offsetLeft -1;
- var tmp_top = acb.offsetTop -1 ;
- var tmp_parent = acb;
- while(tmp_parent.offsetParent != document.body){
- tmp_parent = tmp_parent.offsetParent;
- tmp_left += tmp_parent.offsetLeft;
- }
- _$('AdvancedOptions').style.left = tmp_left + 700 ;
- _$('AdvancedOptions').style.top = 1 ;
- _$('AdvancedOptionsSelect').selectedIndex=-1;
-}
function hide_advops(){
_$('AdvancedOptions').style.display='none';
@@ -316,9 +313,7 @@
</td>
<td align="right" bgcolor="white" valign="bottom">
<!-- <a href="#" onclick=" system_link()">System Configuration</a> | -->
- <a target="_extern" href="http://www.digium.com/en/company/profile/">About Digium</a> |
- <a target="_extern" href="http://www.asterisknow.org/bugs">Report a Bug</a> |
- <a target="_extern" href="http://www.asterisknow.org/help">Help</a>
+ <a target="_extern" href="http://www.digium.com/en/company/profile/">About Digium</a>
<input id="login_name" type="hidden">
</td>
</tr>
@@ -339,31 +334,12 @@
<div style="padding-top: 0pt; padding-bottom: 0pt;" id="tooltip_round" class="tooltip_round"><div style="background-color: rgb(221, 221, 221);"><span style="border-style: solid; border-color: rgb(206, 206, 206); border-width: 0px 1px; overflow: hidden; background-color: rgb(191, 191, 191); display: block; height: 1px; font-size: 1px; margin-left: 1px; margin-right: 1px;"></span><span style="border-style: solid; border-color: rgb(206, 206, 206); border-width: 0px 1px; overflow: hidden; background-color: rgb(191, 191, 191); display: block; height: 1px; font-size: 1px; margin-left: 0px; margin-right: 0px;"></span></div>
<div id="tooltip" style="margin-left: 4px; font-family: Trebuchet MS,Arial,Helvetica,sans-serif; font-size: 11px;">Move the mouse over to a field to see tooltips</div>
<div style="background-color: rgb(221, 221, 221);"><span style="border-style: solid; border-color: rgb(206, 206, 206); border-width: 0px 1px; overflow: hidden; background-color: rgb(191, 191, 191); display: block; height: 1px; font-size: 1px; margin-left: 0px; margin-right: 0px;"></span><span style="border-style: solid; border-color: rgb(206, 206, 206); border-width: 0px 1px; overflow: hidden; background-color: rgb(191, 191, 191); display: block; height: 1px; font-size: 1px; margin-left: 1px; margin-right: 1px;"></span></div></div>
+ <center> <div id="buynow_div" style="position:absolute; top:250px; margin-left:4px; margin-right:4px; width:240px;" align="center"></div> </center>
</td>
</tr>
<tr><td colspan="3" align="center" height="18">
- <div id="status" class="statusbar">Copyright 2006-2007 Digium, Inc. Digium and Asterisk are registered <a href="http://www.digium.com/en/company/profile/trademarkpolicy.php">trademarks</a> of Digium, Inc. All Rights Reserved. <i><a href="http://www.digium.com/en/company/profile/terms.php">Legal Information</a></i></div>
+ <div id="status" class="statusbar">Copyright 2006-2007 Digium, Inc. Digium and Asterisk are registered <a href="http://www.digium.com/en/company/profile/trademarkpolicy.php">trademarks</a> of Digium, Inc. All Rights Reserved. <i><a href="http://www.digium.com/en/docs/APPLIANCE/appliance-pla.pdf" target="_blank">Legal Information</a></i></div>
</td>
</tr>
</tbody></table>
-<div id="AdvancedOptions" style="display:none; position:absolute; z-index:1004; width:220px; background-color : #EFEFEF; padding : 2px 2px 4px 2px;">
- <table cellpadding=1 cellspacing=0 border=0 width=220>
- <tr> <td align=right>Goto: </td>
- <td align="center">
- <select id="AdvancedOptionsSelect" class="input9" onchange="goto_advancedoption()">
- <option value="moh.html">Music on Hold</option>
- <option value="emailsettings.html">VM Email settings</option>
- <option value="sip.html">Global SIP Settings</option>
- <option value="iax.html">Global IAX Settings</option>
- <!-- <option value="jabber.html">Jabber</option>
- <option value="jingle.html">Jingle</option>
- <option value="zapata.html">Zap Channel</option> -->
- <option value="options.html">Change Password</option>
- <option value="TOSETUP">Setup Wizard</option>
- </select>
- </td>
- <td align="right" valign="top"><span style="color: #909090; font-size: 8pt;cursor:pointer;" onclick="hide_advops();">X</span></td>
- </tr>
- </table>
-</div>
</body>
Modified: branches/aadk/config/flashupdate.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/flashupdate.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/flashupdate.html (original)
+++ branches/aadk/config/flashupdate.html Wed Jul 18 13:32:00 2007
@@ -25,8 +25,8 @@
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
<script>
var uImage_filename;
-var uimage_uploadpath = "/tmp";
-var flashresult_path = "/var/lib/asterisk/static-http/flashresult";
+var uImage_uploadpath = "/var/lib/asterisk/sounds/imageupdate";
+
function execute_applyuimage(a){
var b;
@@ -35,12 +35,11 @@
_$('status_message').style.display = "";
if(a=="http"){
-
- b = asterisk_guiapplyUimage +" " + _$('httpurl').value ;
-
+
+ b = "imageupload wget -O "+ uImage_uploadpath + "/uImage " + _$('httpurl').value;
}else if(a == "file"){
- b = asterisk_guiapplyUimage +" file " + asterisk_guiUploads_path_appliance + uImage_filename ;
+ b = "imageupload mv " + uImage_uploadpath + "/" + uImage_filename + " " + uImage_uploadpath + "/uImage";
}else if(a == "tftp"){
@@ -49,13 +48,11 @@
}else{
var fname = "" ;
}
- b = asterisk_guiapplyUimage +" tftp " + _$('tftpurl').value + fname ;
-
- }
-
- parent.astmanEngine.run_tool( "rm -f " + flashresult_path , onSuccess = function(){
- parent.astmanEngine.run_tool( b, onSuccess = function(){ check_flashupdateresult();} );
- });
+ b = "imageupload tftp -g -r " + fname + " -l " + uImage_uploadpath + "/uImage " + _$('tftpurl').value;
+
+ }
+ parent.astmanEngine.run_tool( b, onSuccess = function(){ check_flashupdateresult();} );
+
}
@@ -83,7 +80,7 @@
function flashupdate_success(){
_$('status_message').style.display = "none";
gui_feedback('Firmware upgraded','green', 5000 );
- var f= "Finished upgrading firmware <BR> note: new firmware will be loaded on reboot";
+ var f= "Finished upgrading firmware <BR> note: new firmware will be loaded on reboot <BR> Reboot may take 5+ minutes";
gui_alert(f);
_$('fstatus').innerHTML = f;
}
@@ -102,7 +99,7 @@
for( var d in c ){
if ( c.hasOwnProperty(d) && d == 'post_mappings' ) {
- if ( c[d]['uploads'] == uimage_uploadpath ){
+ if ( c[d]['uploads'] == uImage_uploadpath ){
ispmdefined = 1;
}
}
@@ -116,7 +113,6 @@
_$('tdupload').style.display="none";
parent.loadscreen(this);
- parent.astmanEngine.run_tool("mkdir -p " + uimage_uploadpath, callback = function() {});
}
Modified: branches/aadk/config/graphs.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/graphs.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/graphs.html (original)
+++ branches/aadk/config/graphs.html Wed Jul 18 13:32:00 2007
@@ -29,33 +29,6 @@
var tabs = new Array('tab1');
var divs_tohide = new Array('cpu_div');
-function update_graph(graph) {
- var tmp_command = "sh " + asterisk_scriptsFolder + "graphs.sh cpu > /var/lib/asterisk/static-http/config/graphs/data_cpu.html";
- parent.astmanEngine.run_tool(tmp_command);
- return true;
- }
-
-function load_graphs() {
- var _sm = _$('status_message').style ;
- _sm.display = "" ;
-
- var opt = {
- method: 'get',
- asynchronous: true,
- onComplete: function(originalRequest){
- _sm.display = 'none' ;
- _$('todaylog').innerHTML = (originalRequest.responseText) ? "<PRE>"+originalRequest.responseText.escapeHTML() +"</PRE>" : "No log messages found on this Day" ;
-
- },
- onFailure: function(t) {
- _sm.display = 'none' ;
- gui_alert("Config Error: " + t.status + ": " + t.statusText);
- }
- };
- opt.parameters="";
- var tmp = new Ajax.Request("graphs/cpu_data", opt);
- return true;
-}
function show_window(x){
for(i=0; i < tabs.length ; i++){
@@ -65,14 +38,15 @@
document.getElementById(tabs[x-1]).className = "tabselected";
document.getElementById(tabs[x-1]).blur();
- clearInterval(interval_handler); /*stop our other real-time refreshers... */
+ //clearInterval(interval_handler); /*stop our other real-time refreshers... */
switch(x){
case 1:
var divs_toshow = new Array('cpu_div');
- var interval_handler = setInterval("update_graph()",5000);
+ //var interval_handler = setInterval(update_graph,5000);
break;
}
+
for(var i=0; i < divs_tohide.length; i++ )
_$(divs_tohide[i]).style.display = "none";
for(var i=0; i < divs_toshow.length; i++ )
@@ -111,8 +85,8 @@
<div id="information" style=" border: solid 0px black; background: transparent; padding: 4px; height:440px; width:95%;">
<BR>
<div id="cpu_div" style="display:none">
- <div id="cpu" style="font-family:courier; font-size:10pt;"></div><BR>
- <embed id="cpu_embed" type="image/svg+xml" src="graphs/graph_cpu.svgz"
+ <div id="cpu" style="font-family:courier; font-size:10pt;"></div><BR>
+ <embed id="cpu_embed" type="image/svg+xml" src="graphs/graph_cpu.svgz"
width="500" height="250" />
</div>
</div>
Modified: branches/aadk/config/guialert.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/guialert.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/guialert.html (original)
+++ branches/aadk/config/guialert.html Wed Jul 18 13:32:00 2007
@@ -5,13 +5,19 @@
}
if(top.alertmsgtype == 1 ){
document.getElementById('message').innerHTML = top.alertmsg ;
+ document.getElementById('div_status').style.display = "none" ;
document.getElementById('div_alert').style.display = "" ;
try{document.getElementById('ok').focus() ;}catch(e){ }
+ }
+
+ if(top.alertmsgtype == 2 ){
+ document.getElementById('div_status_message').innerHTML = top.alertmsg ;
+ document.getElementById('div_status').style.display = "" ;
+ document.getElementById('div_alert').style.display = "none" ;
}
}
function close_guialert( ){
- //top.document.body.removeChild( top.document.getElementById( top.alertframename ) );
top.document.getElementById( top.alertframename ).style.display = "none";
}
</script>
@@ -34,13 +40,45 @@
<TABLE cellpadding=0 cellspacing=3 border=0 width="100%">
<TR><TD colspan=2 height=10></TD></TR>
<TR><TD align="right"></TD>
- <TD align="center" bgcolor="#FFFFFF"><div id='message'></div> </TD>
+ <TD align="center" bgcolor="#FFFFFF"><div id='message'></div> </TD>
</TR>
<TR><TD colspan=2 height=10></TD></TR>
- <TR> <TD align="center" colspan=2> <input type="button" id="ok" onclick="close_guialert()" value="Ok"> </TD>
+ <TR> <TD align="center" colspan=2>
+ <input type="button" id="ok" onclick="close_guialert()" value="Ok">
+ </TD>
+ </TR>
<TR><TD colspan=2 height=10></TD></TR>
- </TR>
</TABLE>
</div>
+
+ <div id="div_status" 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">
+ <font style="color:#FFFFFF; font-size: 12px; font-weight:bold;">Loading ...</font>
+ </TD>
+ <TD Height="20" align="right"></TD>
+ <TD width=4></TD>
+ </TR>
+ </table>
+
+ <TABLE cellpadding=0 cellspacing=3 border=0 width="100%">
+ <TR><TD colspan=2 height=10></TD></TR>
+
+ <TR> <TD align="right">
+ <img src='images/loading.gif'>
+ </TD>
+ <TD align="center" bgcolor="#FFFFFF" valign=middle>
+ <div id='div_status_message'></div>
+ </TD>
+ </TR>
+
+ <TR><TD colspan=2 height=10></TD></TR>
+ </TABLE>
+
+ </div>
+
+
</td></tr></table>
</body>
Modified: branches/aadk/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/home.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/home.html (original)
+++ branches/aadk/config/home.html Wed Jul 18 13:32:00 2007
@@ -1,22 +1,16 @@
<!--
- * Asterisk-GUI - an Asterisk configuration interface
- *
- * Initial login screen
- *
- * Copyright (C) 2006-2007, Digium, Inc.
+ * Main Page for Appliance GUI
+ *
+ * Copyright (C) 2006 - 2007, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
* Pari Nannapaneni <pari at digium.com>
*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All Rights Reserved.
+ *
+ * Distribution of this file is subject to the license
+ * agreement you accepted when obtained and/or activated
+ * the Digium product containing this file.
*
-->
<script src="scripts/prototype.js"></script>
@@ -66,7 +60,7 @@
var f = t.responseText;
if( f.match("Pong")){
_$('statusbar').innerHTML = "<img src='images/tick.gif'><i>Connected!</i>";
- loggedOn();
+ if( loggedOn() ){ gui_sysinfo_mount(); }
parent.loadscreen(this);
return;
}
@@ -84,6 +78,10 @@
function loggedOn() {
if ((parent.loggedon == 1) && (localloggedon == 1)){ return; }
+ if(!parent.eventeater.pingstatus){
+ parent.eventeater.pingstatus = true;
+ parent.pingevery(60);
+ }
if(_$('secret').value=="password"){
parent.loggedon = 1;
localloggedon = 1;
@@ -91,20 +89,14 @@
_ll.innerHTML = "Logout";
_ll.onclick = parent.Logoff ;
_ll.style.display = "" ;
- parent.gui_alert("You are using the default password provided by the Appliance!! \n\n You MUST change your password ");
+ parent.gui_alert("You are using the default password provided with the appliance !! \n\n It is strongly recommended that you change your default password ");
window.location.href="options.html?forcepassword=yes";
- return;
+ return false;
}
if( parent.asterisk_guitools_inextconf == 0){
checkessentials();
}
-
- if(!parent.eventeater.pingstatus){
- parent.eventeater.pingstatus = true;
- parent.pingevery(60);
- }
-
parent.setLoggedOn(1);
parent.loggedon = 1;
localloggedon = 1;
@@ -121,7 +113,7 @@
_ll.innerHTML = "Logout";
_ll.onclick = parent.Logoff ;
_ll.style.display = "" ;
-
+ return true;
}
function loggedOff() {
@@ -161,8 +153,14 @@
parent.gui_feedback("Login Successful",'blue',6000);
_$('statusbar').innerHTML = "<img src='images/tick.gif'><i>Connected!</i>";
//parent.astmanEngine.pollEvents();
- setTimeout( gui_sysinfo_mount, 100);
- loggedOn();
+ if( loggedOn() ){
+ gui_sysinfo_mount();
+ if( document.attachEvent && window.XMLHttpRequest){
+ alert("Internet Explorer 7 is not currently supported by this version of the Asterisk Appliance.\n" +
+ "You may experience issues when using IE7. Digium recommends that you use one of the \n" +
+ "following browsers: Firefox, Safari, or Internet Explorer versions prior to 7.0" );
+ }
+ }
}else if( msgs[0].headers['message'] == "Authentication failed" ){
parent.gui_feedback("Invalid Username/Password",'default',6000);
_$('username').focus();
@@ -256,12 +254,15 @@
function gui_sysinfo_mount(){
- _$('message_text').innerHTML = " Checking for Compact Flash ";
- _$('status_message').style.display ="" ;
+ if( parent.Searched4CF ){return;}else{ parent.Searched4CF = 1;}
+ parent.ASTGUI.dialog.waitWhile("Checking for Compact Flash");
+ //_$('message_text').innerHTML = " Checking for Compact Flash ";
+ //_$('status_message').style.display ="" ;
parent.astmanEngine.run_tool(parent.asterisk_guiSysInfo , callback = function() {
var opt = { method: 'get', asynchronous: true,
onComplete: function(originalRequest){
- _$('status_message').style.display ="none" ;
+ parent.ASTGUI.dialog.hide();
+ //_$('status_message').style.display ="none" ;
_$('sysinfohtml').innerHTML = originalRequest.responseText;
if( $('cf_status').innerHTML == "1"){
parent.CF_status = 1;
@@ -270,7 +271,7 @@
parent.gui_feedback("did not find any Compact Flash mounted");
}
},
- onFailure: function(t) { alert("Config Error: " + t.status + ": " + t.statusText); }
+ onFailure: function(t) { }
};
opt.parameters="";
var tmp = new Ajax.Request( parent.asterisk_guiSysInfo_output, opt);
Modified: branches/aadk/config/iax.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/iax.html?view=diff&rev=1261&r1=1260&r2=1261
==============================================================================
--- branches/aadk/config/iax.html (original)
+++ branches/aadk/config/iax.html Wed Jul 18 13:32:00 2007
@@ -1,22 +1,16 @@
<!--
- * Asterisk-GUI - an Asterisk configuration interface
- *
- * Global IAX Settings
- *
- * Copyright (C) 2006-2007, Digium, Inc.
+ * Configuration for global "IAX" settings
+ *
+ * Copyright (C) 2006 - 2007, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
* Pari Nannapaneni <pari at digium.com>
*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All Rights Reserved.
+ *
+ * Distribution of this file is subject to the license
+ * agreement you accepted when obtained and/or activated
+ * the Digium product containing this file.
*
-->
<script src="scripts/prototype.js"></script>
@@ -44,6 +38,11 @@
}
function localajaxinit(){
+ var adjust_toScreen = function(){
+ _$('iaxsettings_form').style.height= ASTGUI.displayHeight() - 70 ;
+ };
+ ASTGUI.events.add( window , 'resize', adjust_toScreen);
+ ASTGUI.events.add(document, 'mouseover', show_tooltip);
setWindowTitle("IAX");
parent.loadscreen(this);
for (var x =0; x< fieldnames.length; x++ ) {
@@ -72,12 +71,12 @@
case 'ulaw': addtosel("u-law","ulaw",selectbox_id) ; break;
case 'alaw': addtosel("a-law","alaw",selectbox_id) ; break;
case 'gsm': addtosel("GSM","gsm",selectbox_id) ; break ;
- case 'ilbc': addtosel("ILBC","ilbc",selectbox_id) ; break ;
- case 'speex': addtosel("SPEEX","speex",selectbox_id) ; break ;
case 'g726': addtosel("G.726","g726",selectbox_id) ; break ;
- case 'adpcm': addtosel("ADPCM","adpcm",selectbox_id) ; break ;
- case 'lpc10': addtosel("LPC10","lpc10",selectbox_id) ; break ;
- case 'g729': addtosel("G.729","g729",selectbox_id) ; break ;
+// case 'ilbc': addtosel("ILBC","ilbc",selectbox_id) ; break ;
+// case 'speex': addtosel("SPEEX","speex",selectbox_id) ; break ;
+// case 'adpcm': addtosel("ADPCM","adpcm",selectbox_id) ; break ;
+// case 'lpc10': addtosel("LPC10","lpc10",selectbox_id) ; break ;
+// case 'g729': addtosel("G.729","g729",selectbox_id) ; break ;
default: break
}
@@ -130,12 +129,12 @@
selectbox_add("disallowed", "ulaw");
selectbox_add("disallowed", "alaw");
selectbox_add("disallowed", "gsm");
- selectbox_add("disallowed", "ilbc");
- selectbox_add("disallowed", "speex");
selectbox_add("disallowed", "g726");
- selectbox_add("disallowed", "adpcm");
- selectbox_add("disallowed", "lpc10");
- selectbox_add("disallowed", "g729");
+// selectbox_add("disallowed", "ilbc");
+// selectbox_add("disallowed", "speex");
+// selectbox_add("disallowed", "adpcm");
+// selectbox_add("disallowed", "lpc10");
+// selectbox_add("disallowed", "g729");
}else{
var tmp = _$('disallow').value.split(",");
for(var x=0; x < tmp.length; x++){
@@ -169,44 +168,44 @@
<span style="cursor: pointer; cursor: hand;" onclick="window.location.href=window.location.href;" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
</div>
<div class="mainscreenContentBox" id="userscontent">
-<div style="height :425px;width : 530px ; overflow :auto;">
+<div style="height :425px;width : 530px ; overflow :auto;" id='iaxsettings_form'>
<table class="field_text" align="center" width="100%" cellpadding=3 cellspacing=0 border=0>
<tr> <td align=right colspan=2> </td> </tr>
- <tr> <td align=right>Bind Port:</td>
+ <tr> <td align=right tip="en,iax_general,0">Bind Port:</td>
<td> <input type='text' size=4 id='bindport' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Bind Address:</td>
+ <tr> <td align=right tip="en,iax_general,1">Bind Address:</td>
<td> <input type='text' size=14 id='bindaddr' class="input8"></td>
</tr>
- <tr> <td align=right>IAX1 Compatibility:</td>
+ <tr> <td align=right tip="en,iax_general,2">IAX1 Compatibility:</td>
<td><input type='checkbox' id='iaxcompat'></td>
</tr>
- <tr> <td align=right>No Checksums:</td>
+ <tr> <td align=right tip="en,iax_general,3">No Checksums:</td>
<td><input type='checkbox' id='nochecksums'></td>
</tr>
- <tr> <td align=right>Delay Reject:</td>
+ <tr> <td align=right tip="en,iax_general,4">Delay Reject:</td>
<td><input type='checkbox' id='delayreject'></td>
</tr>
- <tr> <td align=right>ADSI:</td>
+ <tr> <td align=right tip="en,iax_general,5">ADSI:</td>
<td><input type='checkbox' id='adsi'></td>
</tr>
<tr> <td colspan=2><B>Call Detail Records</B></td> </tr>
- <tr> <td align=right>AMA Flags:</td>
+ <tr> <td align=right tip="en,iax_general,6">AMA Flags:</td>
<td> <input type='text' size=14 id='amaflags' class="input8"></td>
</tr>
- <tr> <td align=right>Accountcode:</td>
+ <tr> <td align=right tip="en,iax_general,7">Accountcode:</td>
<td> <input type='text' size=14 id='accountcode' class="input8"></td>
</tr>
- <tr> <td align=right>Music On Hold Interpret:</td>
+ <tr> <td align=right tip="en,iax_general,8">Music On Hold Interpret:</td>
<td> <input type='text' size=14 id='mohinterpret' class="input8"></td>
</tr>
- <tr> <td align=right>Music On Hold Suggest:</td>
+ <tr> <td align=right tip="en,iax_general,9">Music On Hold Suggest:</td>
<td> <input type='text' size=14 id='mohsuggest' class="input8"></td>
</tr>
- <tr> <td align=right>Language:</td>
+ <tr> <td align=right tip="en,iax_general,10">Language:</td>
<td> <input type='text' size=3 dfalt='en' id='language' class="input8"></td>
</tr>
- <tr> <td align=right>Bandwidth:</td>
+ <tr> <td align=right tip="en,iax_general,11">Bandwidth:</td>
<td> <select id="bandwidth" class="input8">
<option value="low">low</option>
<option value="medium">medium</option>
@@ -217,69 +216,69 @@
<tr> <td colspan=2><B>Jitter Buffer</B></td></tr>
- <tr> <td align=right>Enable Jitter Buffer:</td>
+ <tr> <td align=right tip="en,iax_general,12">Enable Jitter Buffer:</td>
<td><input type='checkbox' id='jitterbuffer'></td>
</tr>
- <tr> <td align=right>Force Jitter Buffer:</td>
+ <tr> <td align=right tip="en,iax_general,13">Force Jitter Buffer:</td>
<td><input type='checkbox' id='forcejitterbuffer'></td>
</tr>
- <tr> <td align=right>Drop Count:</td>
+ <tr> <td align=right tip="en,iax_general,14">Drop Count:</td>
<td> <input type='text' size=4 id='dropcount' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Max Jitter Buffer:</td>
+ <tr> <td align=right tip="en,iax_general,15">Max Jitter Buffer:</td>
<td> <input type='text' size=4 id='maxjitterbuffer' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Max Interpolation Frames:</td>
+ <tr> <td align=right tip="en,iax_general,16">Max Interpolation Frames:</td>
<td> <input type='text' size=4 id='maxjitterinterps' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Resync Threshold:</td>
+ <tr> <td align=right tip="en,iax_general,17">Resync Threshold:</td>
<td> <input type='text' size=4 id='resyncthreshold' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Max Excess Buffer:</td>
+ <tr> <td align=right tip="en,iax_general,18">Max Excess Buffer:</td>
<td> <input type='text' size=4 id='maxexcessbuffer' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Min Excess Buffer:</td>
+ <tr> <td align=right tip="en,iax_general,19">Min Excess Buffer:</td>
<td> <input type='text' size=4 id='minexcessbuffer' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Jitter Shrink Rate:</td>
+ <tr> <td align=right tip="en,iax_general,20">Jitter Shrink Rate:</td>
<td> <input type='text' size=4 id='jittershrinkrate' pattern='^\d*$' class="input8"></td>
</tr>
<!-- Done with Jitter Buffer -->
<tr> <td colspan=2><B>IAX Trunking Options</B></td></tr>
- <tr> <td align=right>Trunk Freq:</td>
+ <tr> <td align=right tip="en,iax_general,21">Trunk Freq:</td>
<td> <input type='text' size=4 id='trunkfreq' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Trunk Time Stamps:</td>
+ <tr> <td align=right tip="en,iax_general,22">Trunk Time Stamps:</td>
<td><input type='checkbox' id='trunktimestamps'></td>
</tr>
<tr> <td colspan=2><B>IAX Registration Options</B></td></tr>
- <tr> <td align=right>Min Reg Expire:</td>
+ <tr> <td align=right tip="en,iax_general,23">Min Reg Expire:</td>
<td> <input type='text' size=4 id='minregexpire' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Max Reg Expire:</td>
+ <tr> <td align=right tip="en,iax_general,24">Max Reg Expire:</td>
<td> <input type='text' size=4 id='maxregexpire' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>IAX ThreadCount:</td>
+ <tr> <td align=right tip="en,iax_general,25">IAX ThreadCount:</td>
<td> <input type='text' size=4 id='iaxthreadcount' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>IAX Max ThreadCount:</td>
+ <tr> <td align=right tip="en,iax_general,26">IAX Max ThreadCount:</td>
<td> <input type='text' size=4 id='iaxmaxthreadcount' pattern='^\d*$' class="input8"></td>
</tr>
- <tr> <td align=right>Register:</td>
+ <tr> <td align=right tip="en,iax_general,27">Register:</td>
<td> <input type='text' size=12 id='register' class="input8"></td>
</tr>
- <tr> <td align=right>Reg Context:</td>
+ <tr> <td align=right tip="en,iax_general,28">Reg Context:</td>
<td> <input type='text' size=12 id='regcontext' class="input8"></td>
</tr>
- <tr> <td align=right>Auto Kill:</td>
[... 3465 lines stripped ...]
More information about the asterisk-gui-commits
mailing list