pari: branch appliance r412 - in /branches/appliance: ./ config/
config/scrip...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Mon Mar 12 07:49:13 MST 2007
Author: pari
Date: Mon Mar 12 09:49:12 2007
New Revision: 412
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=412
Log:
Merged revisions 397-406,408-410 via svnmerge from
https://svn.digium.com/svn/asterisk-gui/trunk
........
r397 | pari | 2007-03-05 10:28:45 -0600 (Mon, 05 Mar 2007) | 1 line
updated some tooltips
........
r398 | pari | 2007-03-05 11:36:06 -0600 (Mon, 05 Mar 2007) | 1 line
Link for service providers signup/home page - add regurl field in providers.conf
........
r399 | pari | 2007-03-05 11:39:11 -0600 (Mon, 05 Mar 2007) | 1 line
added regurl field to the sample providers.conf
........
r400 | pari | 2007-03-05 18:50:00 -0600 (Mon, 05 Mar 2007) | 1 line
Critical fix in core astman - fieldbyname, catbyname are declared as Arrays and used as Objects through out the script. Declaring them Objects instead.
........
r401 | pari | 2007-03-07 15:23:33 -0600 (Wed, 07 Mar 2007) | 1 line
create jingle.conf and providers.conf if they are not found
........
r402 | pari | 2007-03-07 16:53:26 -0600 (Wed, 07 Mar 2007) | 1 line
[1]: select boxes are defaulting to first element when the value is 'empty or invalid (no longer exits)'. [2] in Calling Rules new numberplan is being built on numberplan1 - instead build on whatever available
........
r403 | pari | 2007-03-07 18:02:50 -0600 (Wed, 07 Mar 2007) | 1 line
trying to make tooltips more noticeable
........
r404 | pari | 2007-03-07 19:46:31 -0600 (Wed, 07 Mar 2007) | 1 line
IE6 giving an error at focus()
........
r405 | pari | 2007-03-07 21:22:24 -0600 (Wed, 07 Mar 2007) | 1 line
'Incoming Calling Rules' in setup wizard
........
r406 | pari | 2007-03-08 16:02:39 -0600 (Thu, 08 Mar 2007) | 1 line
incoming.html was not properly fixed in commit 405
........
r408 | pari | 2007-03-09 15:46:40 -0600 (Fri, 09 Mar 2007) | 1 line
Codec Preferences for trunks :)
........
r409 | pari | 2007-03-09 21:02:15 -0600 (Fri, 09 Mar 2007) | 1 line
Fix: 'Disallow all()' when disallow all is checked
........
r410 | pari | 2007-03-09 22:10:42 -0600 (Fri, 09 Mar 2007) | 1 line
Fixes for Global SIP/IAX codec preferences
........
Added:
branches/appliance/config/setup/8.html
- copied unchanged from r410, trunk/config/setup/8.html
Modified:
branches/appliance/ (props changed)
branches/appliance/config/cfgadvanced.html
branches/appliance/config/cfgappliance.html
branches/appliance/config/cfgbasic.html
branches/appliance/config/guialert.html
branches/appliance/config/iax.html
branches/appliance/config/incoming.html
branches/appliance/config/localexts.html
branches/appliance/config/menus.html
branches/appliance/config/numberplan.html
branches/appliance/config/queues.html
branches/appliance/config/record.html
branches/appliance/config/scripts/astman.js
branches/appliance/config/scripts/tooltip.js
branches/appliance/config/setup/1.html
branches/appliance/config/setup/10.html
branches/appliance/config/setup/2.html
branches/appliance/config/setup/3.html
branches/appliance/config/setup/4.html
branches/appliance/config/setup/5.html
branches/appliance/config/setup/6.html
branches/appliance/config/setup/7.html
branches/appliance/config/setup/install.html
branches/appliance/config/sip.html
branches/appliance/config/stylesheets/schwing.css
branches/appliance/config/trunks.html
branches/appliance/configs/providers.conf.sample
Propchange: branches/appliance/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 12 09:49:12 2007
@@ -1,1 +1,1 @@
-/trunk:1-394
+/trunk:1-411
Modified: branches/appliance/config/cfgadvanced.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/cfgadvanced.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/cfgadvanced.html (original)
+++ branches/appliance/config/cfgadvanced.html Mon Mar 12 09:49:12 2007
@@ -82,7 +82,7 @@
"Define how your incoming calls should be handled & configure DID (Direct inward Dialing)"),
new PanelDef("menus", "Voice Menus", "accordion-icon.gif",
- "Menus allow for more efficient routing of calls from incoming callers."),
+ "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"),
new PanelDef("record", "Record a Menu", "accordion-icon.gif",
"Allows you to record custom voicemenus over a phone"),
@@ -169,11 +169,17 @@
}
function show_Acctooltip(name, tip){
- if(loggedon == 1)
- $('tooltip').innerHTML = tip;
+ if( loggedon != 1){ return; }
+ new Rico.Effect.FadeTo( 'tooltip_round', .01, 100, 10, {
+ complete:function() {
+ $('tooltip').innerHTML = tip ;
+ new Rico.Effect.FadeTo( 'tooltip_round', 1, 10, 1, {complete:function() { } } );
+ }
+ } );
}
function registerajax() {
+ Rico.Corner.round('tooltip_round', {compact:true});
var pnameheight = 22;
var pheight = (503 - (pnameheight*panels.length) ) ;
accordion = new Rico.Accordion( $('configpanel'), { panelHeight: pheight,onHideTab:fademainscreen,onShowTab:showmainscreen });
@@ -257,9 +263,7 @@
</td>
<td valign=top width=250 height="505">
<div id="logoutlink" class="mainscreenTooltipBar" align=right style="font-weight:bold;cursor: pointer; cursor: hand;"> </div>
- <div style="margin-left: 4px;">
- <BR>
- <font style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; font-weight: bold">Tooltips:</font>
+ <div id="tooltip_round" class="tooltip_round">
<div id='tooltip' style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; "><script>document.write(tooltip_default);</script></div>
</div>
</td>
Modified: branches/appliance/config/cfgappliance.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/cfgappliance.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/cfgappliance.html (original)
+++ branches/appliance/config/cfgappliance.html Mon Mar 12 09:49:12 2007
@@ -82,7 +82,7 @@
"Configures networking parameters"),
new PanelDef("menus", "Voice Menus", "accordion-icon.gif",
- "Menus allow for more efficient routing of calls from incoming callers."),
+ "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"),
new PanelDef("record", "Record a Menu", "accordion-icon.gif",
"Allows you to record custom voicemenus over a phone"),
@@ -157,11 +157,17 @@
}
function show_Acctooltip(name, tip){
- if(loggedon == 1)
- $('tooltip').innerHTML = tip;
+ if( loggedon != 1){ return; }
+ new Rico.Effect.FadeTo( 'tooltip_round', .01, 100, 10, {
+ complete:function() {
+ $('tooltip').innerHTML = tip ;
+ new Rico.Effect.FadeTo( 'tooltip_round', 1, 10, 1, {complete:function() { } } );
+ }
+ } );
}
function registerajax() {
+ Rico.Corner.round('tooltip_round', {compact:true});
if( navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Konqueror") != -1 || navigator.userAgent.indexOf("Safari") != -1 ){
gui_alert(browser_alert);
}
@@ -242,9 +248,7 @@
</td>
<td valign=top width=250 height="505">
<div id="logoutlink" class="mainscreenTooltipBar" align=right style="font-weight:bold;cursor: pointer; cursor: hand;"> </div>
- <div style="margin-left: 4px;">
- <BR>
- <font style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; font-weight: bold">Tooltips:</font>
+ <div id="tooltip_round" class="tooltip_round">
<div id='tooltip' style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; "><script>document.write(tooltip_default);</script></div>
</div>
</td>
Modified: branches/appliance/config/cfgbasic.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/cfgbasic.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/cfgbasic.html (original)
+++ branches/appliance/config/cfgbasic.html Mon Mar 12 09:49:12 2007
@@ -85,7 +85,7 @@
// "Music on hold sometimes keeps people less angry while they wait for an answer."),
new PanelDef("menus", "Voice Menus", "accordion-icon.gif",
- "Menus allow for more efficient routing of calls from incoming callers."),
+ "Menus allow for more efficient routing of calls from incoming callers. Also known as IVR (Interactive Voice Response) menus or Digital Receptionist"),
new PanelDef("record", "Record a Menu", "accordion-icon.gif",
"Allows you to record custom voicemenus over a phone"),
@@ -163,11 +163,17 @@
}
function show_Acctooltip(name, tip){
- if(loggedon == 1)
- $('tooltip').innerHTML = tip;
+ if( loggedon != 1){ return; }
+ new Rico.Effect.FadeTo( 'tooltip_round', .01, 100, 10, {
+ complete:function() {
+ $('tooltip').innerHTML = tip ;
+ new Rico.Effect.FadeTo( 'tooltip_round', 1, 10, 1, {complete:function() { } } );
+ }
+ } );
}
function registerajax() {
+ Rico.Corner.round('tooltip_round', {compact:true});
if( navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Konqueror") != -1 || navigator.userAgent.indexOf("Safari") != -1 ){
gui_alert(browser_alert);
}
@@ -258,9 +264,7 @@
</td>
<td valign=top width=250 height="505">
<div id="logoutlink" class="mainscreenTooltipBar" align=right style="font-weight:bold;cursor: pointer; cursor: hand;"> </div>
- <div style="margin-left: 4px;">
- <BR>
- <font style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; font-weight: bold">Tooltips:</font>
+ <div id="tooltip_round" class="tooltip_round">
<div id='tooltip' style="margin-left:4px; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; "><script>document.write(tooltip_default);</script></div>
</div>
</td>
Modified: branches/appliance/config/guialert.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/guialert.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/guialert.html (original)
+++ branches/appliance/config/guialert.html Mon Mar 12 09:49:12 2007
@@ -6,6 +6,7 @@
if(top.alertmsgtype == 1 ){
document.getElementById('message').innerHTML = top.alertmsg ;
document.getElementById('div_alert').style.display = "" ;
+ try{document.getElementById('ok').focus() ;}catch(e){ }
}
}
Modified: branches/appliance/config/iax.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/iax.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/iax.html (original)
+++ branches/appliance/config/iax.html Mon Mar 12 09:49:12 2007
@@ -27,7 +27,7 @@
<script>
var phonecallbacks = new Object;
var widgets = new Array;
-var fieldnames = new Array('status', 'save', 'cancel', 'bindport', 'bindaddr', 'iaxcompat', 'nochecksums', 'delayreject', 'amaflags', 'adsi', 'accountcode', 'language', 'mohinterpret', 'mohsuggest', 'bandwidth','jitterbuffer', 'forcejitterbuffer', 'dropcount', 'maxjitterbuffer', 'maxjitterinterps', 'resyncthreshold', 'maxexcessbuffer', 'minexcessbuffer', 'jittershrinkrate', 'trunkfreq', 'trunktimestamps', 'minregexpire', 'maxregexpire', 'iaxthreadcount', 'iaxmaxthreadcount' , 'register', 'authdebug', 'tos', 'regcontext', 'autokill', 'codecpriority', 'rtcachefriends', 'rtupdate', 'rtautoclear', 'rtignoreexpire','allow','disallow');
+var fieldnames = new Array('status', 'save', 'cancel', 'bindport', 'bindaddr', 'iaxcompat', 'nochecksums', 'delayreject', 'amaflags', 'adsi', 'accountcode', 'language', 'mohinterpret', 'mohsuggest', 'bandwidth','jitterbuffer', 'forcejitterbuffer', 'dropcount', 'maxjitterbuffer', 'maxjitterinterps', 'resyncthreshold', 'maxexcessbuffer', 'minexcessbuffer', 'jittershrinkrate', 'trunkfreq', 'trunktimestamps', 'minregexpire', 'maxregexpire', 'iaxthreadcount', 'iaxmaxthreadcount' , 'register', 'authdebug', 'tos', 'regcontext', 'autokill', 'codecpriority', 'rtcachefriends', 'rtupdate', 'rtautoclear', 'rtignoreexpire','disallow','allow');
phonecallbacks.format = function(t) {
@@ -76,17 +76,29 @@
}
function selectbox_add(selectbox_id, codec){
switch(codec) {
- case 'ulaw': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="ulaw">u-law</option>'; break
- case 'alaw': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="alaw">a-law</option>'; break
- case 'gsm': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="gsm">GSM</option>'; break
- case 'ilbc': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="ilbc">ILBC</option>'; break
- case 'speex': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="speex">SPEEX</option>'; break
- case 'g726': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="g726">G.726</option>'; break
- case 'adpcm': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="adpcm">ADPCM</option>'; break
- case 'lpc10': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="lpc10">LPC10</option>'; break
- case 'g729': $(selectbox_id).innerHTML = $(selectbox_id).innerHTML + '<option value="g729">G.729a</option>'; break
+ 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 ;
default: break
}
+
+ function addtosel(a,b,c){ // a is text, b is value, c is the select box id
+ var newoption = document.createElement('option');
+ newoption.text = a ;
+ newoption.value = b ;
+ var selectbox = document.getElementById( c );
+ try {
+ selectbox.add(newoption, null); // standards compliant; doesn't work in IE
+ }catch(ex) {
+ selectbox.add(newoption); // IE only
+ }
+ }
}
function selectbox_remove(selectbox_id,codec){
for (var x=0; x < $(selectbox_id).length; x++){
@@ -116,14 +128,12 @@
}
}
$('div_setordercodecs').style.display = "none";
- for (var x =0; x < fieldnames.length; x++) {
- widgets[fieldnames[x]].disabled = false;
- }
+ $('bg_transparent').style.display = "none";
+ $('save').disabled = false;
+ $('cancel').disabled = false;
}
function cancel_ordercodecs(){
- for (var x =0; x < fieldnames.length; x++) {
- widgets[fieldnames[x]].disabled = false;
- }
+ $('bg_transparent').style.display = "none";
$('div_setordercodecs').style.display = "none";
}
function update_div_setordercodecs(){
@@ -151,11 +161,18 @@
selectbox_remove("disallowed",tmp[x]);
}
- for (var x =0; x < fieldnames.length; x++) {
- widgets[fieldnames[x]].disabled = true;
- }
-
- $('div_setordercodecs').style.display='block';
+ $('bg_transparent').style.display='';
+ $('div_setordercodecs').style.display='';
+}
+
+function disallow_all_refresh(){
+ if( $('disallow_all').checked ){
+ $('disallow').value = "all";
+ $('allow').value = "";
+ update_div_setordercodecs();
+ $('save').disabled = false;
+ $('cancel').disabled = false;
+ }
}
// End of Allowed/Disallowed codescs related functions
</script>
@@ -367,36 +384,9 @@
<td> <input type='text' id='disallow' class="input8" size=9></td>
</tr>
<tr ><td align=right>Allowed Codecs:</td>
- <td> <input type='text' id='allow' class="input8" size=9><input type=button id="sd" value="Edit" onclick="update_div_setordercodecs()">
- <div style="position:absolute; display:none; left: 160; top: 210; width:350; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid;" id="div_setordercodecs">
- <table align=center>
- <tr><td><BR></td></tr>
- <tr><td class="field_text">Allowed</td>
- <td></td>
- <td class="field_text">Disallowed</td>
- </tr>
- <tr><td><select id="allowed" size=9 class="input8"></select></td>
- <td><input type="button" id="select_codec" value="<" onclick="enable_selectedcodec()"><BR><input type="button" id="deselect_codec" value=">" onclick="disable_selectedcodec()"></td>
- <td><select id="disallowed" size=9 class="input8">
- </select>
- </td>
- </tr>
- <tr><td></td>
- <td></td>
- <td class="field_text"><input type=checkbox id="disallow_all">Disallow All</td>
- </tr>
- <tr><td colspan=3 align=Center>
- <input type="button" class="buttonbold" id="setordercodecs" value="update" onclick="update_ordercodecs()">
- <input type="button" class="buttonbold" id="cancel_setorder" value="Cancel" onclick="cancel_ordercodecs()">
- </td>
- </tr>
- <tr><td><BR></td></tr>
- </table>
- </div>
+ <td> <input type='text' id='allow' class="input8" size=9><input type=button id="sd" value="Edit" onclick="update_div_setordercodecs()">
</td>
</tr>
-
-
</table>
</div>
<HR>
@@ -406,5 +396,36 @@
</table>
</div>
<div style='visibility:hidden;overflow:hidden;width:0px;height:0px'><select size="5" id="hiddenfield" style="width:220px"></select></div>
-<div id='tooltip' style="margin-left:5px;height: 60px; width:575px; overflow :auto; font-family : Trebuchet MS, Arial, Helvetica, sans-serif;font-size: 11px; "></div>
+<div id="div_setordercodecs" style="position:absolute; display:none; left: 120; top: 70; width:350; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid; z-index:5">
+ <table width="100%" cellpadding=0 cellspacing=0 onmousedown="startDrag(event , 'div_setordercodecs');">
+ <TR bgcolor="#7E5538" style="background-image:url('images/title_gradient.gif');">
+ <TD Height="20" align="center" style="cursor: move"><font style="color:#FFFFFF; font-size: 12px; font-weight:bold;">Codec Preferences</font></TD>
+ <TD Height="20" align="right" style="cursor: move"><A href="#" onclick="cancel_ordercodecs();"><font style="color:#FFFFFF; font-size: 12px; font-weight:bold;">X</font></A></TD>
+ <TD width=4></TD>
+ </TR>
+ </table>
+<table align=center>
+ <tr><td><BR></td></tr>
+ <tr><td class="field_text">Allowed</td>
+ <td></td>
+ <td class="field_text">Disallowed</td>
+ </tr>
+ <tr><td><select id="allowed" size=9 class="input8"></select></td>
+ <td><input type="button" id="select_codec" value="<" onclick="enable_selectedcodec()"><BR><input type="button" id="deselect_codec" value=">" onclick="disable_selectedcodec()"></td>
+ <td><select id="disallowed" size=9 class="input8"></select></td>
+ </tr>
+ <tr><td></td>
+ <td></td>
+ <td class="field_text"><input type=checkbox id="disallow_all" onclick="disallow_all_refresh();">Disallow All</td>
+ </tr>
+ <tr><td colspan=3 align=Center>
+ <input type="button" class="buttonbold" id="setordercodecs" value="update" onclick="update_ordercodecs()">
+ <input type="button" class="buttonbold" id="cancel_setorder" value="Cancel" onclick="cancel_ordercodecs()">
+ </td>
+ </tr>
+ <tr><td><BR></td></tr>
+</table>
+</div>
+<div id="bg_transparent" STYLE="display:none; position: absolute; left: 0; top: 24; width:100%; height:100%; background-color:#EFEFEF; -moz-opacity:.50;opacity:.50; border-width: 1px; border-color: #EFEFEF; border-style: solid; z-index:3">
+</div>
</body>
Modified: branches/appliance/config/incoming.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/incoming.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/incoming.html (original)
+++ branches/appliance/config/incoming.html Mon Mar 12 09:49:12 2007
@@ -21,6 +21,7 @@
<script src="scripts/prototype.js"></script>
<script src="scripts/rico.js"></script>
<script src="scripts/astman.js"></script>
+<script src="scripts/tooltip.js"></script>
<link href="stylesheets/rico.css" media="all" rel="Stylesheet" type="text/css" />
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
<script>
@@ -132,11 +133,14 @@
}
for ( var i in didtrunks ){ // for each trunk
- if( i == "extend"){ continue;}
- for(var j in didtrunks[i]){ // for each parttern of the trunk
- if( j == "extend" || j == "trunkname"){ continue;}
+ if( didtrunks.hasOwnProperty(i) ){
+ for(var j in didtrunks[i]){ // for each pattern of the trunk
+ if( didtrunks[i].hasOwnProperty(j) ){
+ if( j == "trunkname"){ continue;}
addrowtotable( j, i, didtrunks[i][j].action, didtrunks[i][j].priority);
+ }
}
+ }
}
if( $('callingRulesTable').rows.length == 0){
@@ -495,7 +499,7 @@
<center><div style="height:25px;color: #FF0000;" id='status' class="field_text9"></div></center>
<BR>
- <center><input type="button" id="adddid" value="Add a Incoming Rule" onclick="add_incomingrule();"></center>
+ <center><input type="button" id="adddid" value="Add a Incoming Rule" onclick="add_incomingrule();" onmouseover="show_tooltip('en', 'incoming',0);"></center>
<div id="userscontent" STYLE="display:none; position: absolute; left: 20; top: 40; width:475; height:190; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">
<table width="100%" cellpadding=0 cellspacing=0 onmousedown="startDrag(event , 'userscontent');">
@@ -511,7 +515,7 @@
<option value="allunmatched">All Unmatched incoming calls</option>
<option value="frompattern">incoming calls that match </option>
</select>
- <span id="thatmatch">pattern <input type="text" id="frompattern" size=12 onchange="enablesave();" onkeyup="enablesave();" class="input9"></span>
+ <span id="thatmatch" onmouseover="show_tooltip('en', 'incoming', 1);">pattern <input type="text" id="frompattern" size=12 onchange="enablesave();" onkeyup="enablesave();" class="input9"></span>
</NOBR>
</TD>
</TR>
Modified: branches/appliance/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/localexts.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/localexts.html (original)
+++ branches/appliance/config/localexts.html Mon Mar 12 09:49:12 2007
@@ -143,7 +143,7 @@
<option value="0">Varying</option>
</select> </td>
</tr>
- <tr ><td class="field_text" align=left>Starting point of Allocation of extensions : <input type=text id="userbase" size=5 class="input9"></td></tr>
+ <tr ><td class="field_text" align=left>Fist Extension Number : <input type=text id="userbase" size=5 class="input9"></td></tr>
<tr ><td class="field_text" align="left"><input type=checkbox id="allow_aliasextns">Allow analog phones to be assigned to multiple extensions</td></tr>
<tr ><td class="field_text" align="left"><input type=checkbox id="allow_an_extns">Allow extensions to be AlphaNumeric (SIP/IAX users)</td></tr>
</table>
Modified: branches/appliance/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/menus.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/menus.html (original)
+++ branches/appliance/config/menus.html Mon Mar 12 09:49:12 2007
@@ -25,7 +25,6 @@
<script src="scripts/tooltip.js"></script>
<link href="stylesheets/rico.css" media="all" rel="Stylesheet" type="text/css" />
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
-
<script>
var widgets = new Array;
var adstatus;
@@ -1331,7 +1330,12 @@
<!--
for (var k=0; k< keys.length; k++){
var p = generate_fields( keys[k] ) ;
- document.write("<TR bgcolor='#FFFFFF'>\n"
+ switch(keys[k]){
+ case 't': var omo = "onmouseover=\"show_tooltip('en', 'menus', 6 );\" " ; break;
+ case 'i': var omo = "onmouseover=\"show_tooltip('en', 'menus', 7 );\" " ; break;
+ default: var omo = "" ;
+ }
+ document.write("<TR bgcolor='#FFFFFF' " + omo + ">\n"
+ "<TD width=35 align=center><font style=\"font-size: 10pt\">"+keys[k]+"</font></TD>\n"
+ "<TD>"
+ p
Modified: branches/appliance/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/numberplan.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/numberplan.html (original)
+++ branches/appliance/config/numberplan.html Mon Mar 12 09:49:12 2007
@@ -351,7 +351,7 @@
}
var newCell4 = newRow.insertCell(4);
- newCell4.innerHTML = "<A href=\"#\" onclick=\"editcallingrule('"+ a +"', '"+ b +"')\">Edit</A> <A href=\"#\" onclick=\"deletecallingrule('"+ a +"', '"+ b +"')\">Delete</A>";
+ newCell4.innerHTML = "<A href=\"#\" onclick=\"editcallingrule('"+ a +"', '"+ b +"')\" onmouseover=\"show_tooltip('en', 'callingrules', 2);\">Edit</A> <A href=\"#\" onclick=\"deletecallingrule('"+ a +"', '"+ b +"')\" onmouseover=\"show_tooltip('en', 'callingrules', 3);\">Delete</A>";
newCell4.width=75;
newCell4.align="center";
return true;
@@ -498,7 +498,7 @@
break;
c++ ;
}
- gen = $('extensions').stored_config.catbyname['numberplan-custom-1'];
+ gen = $('extensions').stored_config.catbyname[$('extensions').value];
temp = objcopy(gen);
temp.name = "numberplan-custom-" + c ;
temp.fieldbyname['plancomment'] = "DialPlan" + c;
@@ -635,7 +635,7 @@
<center>
<fieldset style="width: 500px" id="fieldset1">
<legend> List of DialPlans: </legend>
- <CENTER><select id="extensions" class="input9" style="z-index:2"></select> <a href="#" class="splbutton" onclick="newnumberplan()">new</a> <a href="#" class="splbutton" onclick="delete_numberplan()">delete</a>
+ <CENTER><select id="extensions" class="input9" style="z-index:2"></select> <a href="#" class="splbutton" onclick="newnumberplan()" onmouseover="show_tooltip('en', 'callingrules', 0);">new</a> <a href="#" class="splbutton" onclick="delete_numberplan()" onmouseover="show_tooltip('en', 'callingrules', 1);">delete</a>
<input id='new' value='New' type="button" style="display:none">
<input id='delete' value='Delete' type="button" style="display:none">
<div id="npcontent" STYLE="display:none; position: absolute; left: 110; top: 40; width:320; height:110; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid; z-index:6">
@@ -681,7 +681,7 @@
</div>
<center><div style="height:25px;color: #FF0000;" id='status' class="field_text9"></div></center>
<BR>
- <div STYLE="position: absolute; left:186; top: 460;"><input type="button" id="addrule" value="Add a Calling Rule" onclick="add_callingrule();"></div>
+ <div STYLE="position: absolute; left:186; top: 460;"><input type="button" id="addrule" value="Add a Calling Rule" onclick="add_callingrule();" onmouseover="show_tooltip('en', 'callingrules', 4);"></div>
</fieldset>
</center>
@@ -694,15 +694,15 @@
</TR>
</table>
<TABLE align=center cellpadding=2 cellspacing=2 border=0 width="480">
- <TR>
+ <TR onmouseover="show_tooltip('en', 'callingrules', 5);">
<TD align="right" width=175>Rule Name:</TD>
<TD><input type="text" id="rulename" size="" onChange="enablesave();" onkeyup="enablesave();" class="input9"></TD>
</TR>
- <TR>
+ <TR onmouseover="show_tooltip('en', 'callingrules', 6);">
<TD align="right" height=40> Place this call through :</TD>
<TD><select id="trunks" class="input9" onChange="enablesave();"></select></TD>
</TR>
- <TR id="define_usual" height=100>
+ <TR id="define_usual" height=100 onmouseover="show_tooltip('en', 'callingrules', 7);">
<TD valign="top" align=right>Dialing Rules :</TD>
<TD valign="top"> If the number begins with <input id="beginswith" class="input9" type='text' size=6 onChange="enablesave();" onkeyup="enablesave();"> and
followed by <input id="followedby" type='text' class="input9" size=1 onChange="enablesave();" onkeyup="enablesave();"> digits <input type="checkbox" id="ormore" onChange="enablesave();"> or more <BR>
@@ -710,7 +710,7 @@
</TD>
</TR>
- <TR id="define_advanced" height=100>
+ <TR id="define_advanced" height=100 onmouseover="show_tooltip('en', 'callingrules', 8);">
<TD valign="top" align=right>
Custom Pattern:
</TD>
@@ -723,7 +723,7 @@
</table>
</TD>
</TR>
- <TR>
+ <TR onmouseover="show_tooltip('en', 'callingrules', 9);">
<TD colspan=2 align=center>Strip <input type="text" id="strip" class="input9" size="1" onChange="enablesave();" onkeyup="enablesave();"> digits from the front and prepend <input type="text" id="prepend" class="input9" size="3" onChange="enablesave();" onkeyup="enablesave();"> before dialing</TD>
</TR>
<TR>
Modified: branches/appliance/config/queues.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/queues.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/queues.html (original)
+++ branches/appliance/config/queues.html Mon Mar 12 09:49:12 2007
@@ -526,7 +526,7 @@
<tr onmouseover="show_tooltip('en', 'queues', 10);" ><td class="field_text">JoinEmpty:</td><td><input type=checkbox id='joinempty'></td></tr>
<tr onmouseover="show_tooltip('en', 'queues', 11);" ><td class="field_text">LeaveWhenEmpty:</td><td><input type=checkbox id='leavewhenempty'></td></tr>
<tr onmouseover="show_tooltip('en', 'queues', 12);" ><td class="field_text">Report Hold Time:</td><td><input type=checkbox id='reportholdtime'></td></tr>
- <tr>
+ <tr onmouseover="show_tooltip('en', 'queues', 13);" >
<td colspan=2 class="field_text">
Music On Hold: <select id="musicclass" class="input8"></select>
</td>
Modified: branches/appliance/config/record.html
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/record.html?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/record.html (original)
+++ branches/appliance/config/record.html Mon Mar 12 09:49:12 2007
@@ -22,6 +22,7 @@
<script src="scripts/prototype.js"></script>
<script src="scripts/rico.js"></script>
<script src="scripts/astman.js"></script>
+<script src="scripts/tooltip.js"></script>
<link href="stylesheets/rico.css" media="all" rel="Stylesheet" type="text/css" />
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
@@ -311,7 +312,7 @@
<BR><BR>
<div id="status"></div>
<BR><BR>
- <input type="button" id="vvv" value="Record a new Voice Menu" onclick="show_record();">
+ <input type="button" id="vvv" value="Record a new Voice Menu" onclick="show_record();" onmouseover="show_tooltip('en', 'record', 0);">
<div id="recordnew_content" STYLE="display:none; position: absolute; left: 20; top: 125; width:475; height:150; background-color:#F4EFE5; border-width: 1px; border-color: #7E5538; border-style: solid;z-index:5">
<table width="100%" cellpadding=0 cellspacing=0 onmousedown="startDrag(event , 'recordnew_content');">
@@ -327,7 +328,7 @@
</table>
<table cellpadding=2 cellspacing=2 border=0>
<tr> <td colspan=2 height=15 valign=middle align=center class="field_text"></td></tr>
- <tr><td class="field_text">File Name:</td>
+ <tr onmouseover="show_tooltip('en', 'record', 1);"><td class="field_text">File Name:</td>
<td><input id='newvmenu_name' size=24 class="input9">
<input type="hidden" id="format" value="gsm">
</td>
@@ -346,7 +347,7 @@
</select>
</td>
</tr> -->
- <tr> <td class="field_text">Extension used for recording:</td>
+ <tr onmouseover="show_tooltip('en', 'record', 2);"> <td class="field_text">Extension used for recording:</td>
<td><select id='newvmenu_ext' class="input9"></select></td>
</tr>
<tr> <td colspan=2 align=center height=10></td></tr>
Modified: branches/appliance/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/scripts/astman.js?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/scripts/astman.js (original)
+++ branches/appliance/config/scripts/astman.js Mon Mar 12 09:49:12 2007
@@ -738,7 +738,7 @@
for (;y<box.stored_config.catcnt;y++) {
box.stored_config.categories[y] = null;
}
- box.stored_config.catbyname[value] = null;
+ delete box.stored_config.catbyname[value];
--box.stored_config.catcnt;
if (updatebox && box.options[box.selectedIndex].value == "") {
if (box.widgets['status'])
@@ -809,7 +809,7 @@
}
if (!category) {
category = new Object;
- category.fieldbyname = new Array;
+ category.fieldbyname = { };
category.fields = new Array;
}
@@ -1024,10 +1024,19 @@
tmp = box.callbacks.format(box.stored_config.catbyname[tmp[0]], tmp[1]);
if (tmp) {
box.options[box.selectedIndex].innerHTML = tmp;
+ var tmp_newopt = document.createElement('option');
+ tmp_newopt.text = box.options[box.selectedIndex].innerHTML ;
+ tmp_newopt.value = box.options[box.selectedIndex].value;
+
for (var y = 0; y < box.options.length + 1; y++) {
if (!box.options[y] ||
do_compare(box, box.options[box.selectedIndex], box.options[y])) {
+ try{
box.options.add(box.options[box.selectedIndex], y);
+ }catch(e){
+ box.remove(box.selectedIndex);
+ box.add(tmp_newopt, y);
+ }
break;
}
}
@@ -1562,7 +1571,7 @@
}
}
} else {
- widgets[x].selectedIndex = 0;
+ widgets[x].selectedIndex = -1;
widgets[x].value = thevalue;
}
@@ -1698,11 +1707,11 @@
};
this.doConfig = function(t, box) {
if( t[0].headers['message'] && t[0].headers['message'] == "Config file not found" ){
- if( box.config_file == "zapscan.conf" || box.config_file == "contactinfo.conf" ){
+ if( box.config_file == "zapscan.conf" || box.config_file == "contactinfo.conf" || box.config_file == "jingle.conf" || box.config_file == "providers.conf" ){
parent.astmanEngine.run_tool("/bin/touch /etc/asterisk/"+box.config_file, function(){ window.location.href = window.location.href ; } );
return ;
} else {
- gui_alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
+ alert( "Asterisk says it cannot find a required config file (" + box.config_file + ") \n You will be now redirected to the main page !" );
parent.window.location.href = parent.window.location.href ;
return ;
}
@@ -1717,7 +1726,7 @@
box.innerHTML = '';
cfg.categories = new Array;
- cfg.catbyname = new Array;
+ cfg.catbyname = { };
cfg.names = new Array;
for (x=0;t[0].names[x];x++) {
map = t[0].names[x].split('-');
@@ -1727,7 +1736,7 @@
cfg.categories[catcnt] = new Object;
cfg.categories[catcnt].fields = new Array;
- cfg.categories[catcnt].fieldbyname = new Array;
+ cfg.categories[catcnt].fieldbyname = { };
cfg.categories[catcnt].names = new Array;
cfg.categories[catcnt].subfields = new Array;
cfg.categories[catcnt].name = t[0].headers[t[0].names[x]];
Modified: branches/appliance/config/scripts/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/branches/appliance/config/scripts/tooltip.js?view=diff&rev=412&r1=411&r2=412
==============================================================================
--- branches/appliance/config/scripts/tooltip.js (original)
+++ branches/appliance/config/scripts/tooltip.js Mon Mar 12 09:49:12 2007
@@ -4,7 +4,12 @@
var tooltips = new Object;
function show_tooltip(lang, file,tip){
- parent.parent.$('tooltip').innerHTML = tooltips[file][lang][tip];
+ new top.Rico.Effect.FadeTo( 'tooltip_round', .01, 100, 10, {
+ complete:function() {
+ top.$('tooltip').innerHTML = tooltips[file][lang][tip];
+ new top.Rico.Effect.FadeTo( 'tooltip_round', 1, 10, 1, {complete:function() { } } );
+ }
+ } );
}
@@ -45,7 +50,7 @@
tooltips['meetme'] .en[8] = "<B>Quiet Mode:</B> This option enables Quiet mode. If this option is checked, all users entering this conference will be marked as quiet, and will be in Listen-Only mode.";
tooltips['meetme'] .en[9] = "<B>Wait for Market User:</B> If this option is set, then users joining the conference will not be able to speak to one-another until the marked user has joined the conference.";
tooltips['meetme'] .en[10] = "<B>Set Marked User:</B> This option sets the person that enters the bridge using this extension as Marked. This option works in conjunction with the obove \"Wait for marked user\" option.";
- tooltips['meetme'] .en[11] = "<B>Set Marked User:</B> Record this conference in a WAV format. Default filename is meetme-conf-rec-${Conference Number}-${UNIQUEID}.";
+ tooltips['meetme'] .en[11] = "<B>Record Conference:</B> Record this conference in a WAV format. Default filename is meetme-conf-rec-${Conference Number}-${UNIQUEID}.";
// Tooltips for Voicemail
tooltips['voicemail']= new Object;
@@ -83,6 +88,7 @@
tooltips['queues'].en[10] = "<B> JoinEmpty:</B> Defining this option allows callers to enter the Queue when no Agents are available. If this option is not defined, callers will not be able to enter Queues with no available agents.";
tooltips['queues'].en[11] = "<B>LeaveWhenEmpty:</B> Defining this option forces all callers to exit the Queue if New Callers are also not able to Enter the Queue. This option should generally be set in concert with the JoinEmpty option.";
tooltips['queues'].en[12] = "<B> Report Hold Time:</B> Enabling this option causes Asterisk to report, to the Agent, the hold time of the caller before the caller is connected to the Agent.";
+ tooltips['queues'].en[13] = "<B> Music On Hold:</B> Select the 'Music on Hold' Class for this Queue";
// Tooltips for SIP_General (sip_general)
tooltips['sip_general']= new Object;
@@ -207,4 +213,44 @@
tooltips['menus'].en[3] = "<B>Dial other Extensions:</B>Is the caller allowed to dial extensions other than the ones defined below?";
tooltips['menus'].en[4] = "<B>Keypress Events:</B>Define the actions that occur when a user presses the corresponding digit.";
[... 773 lines stripped ...]
More information about the asterisk-gui-commits
mailing list