pari: branch asterisknow r363 - in /branches/asterisknow: ./ config/
config/s...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Mon Feb 19 11:25:23 MST 2007
Author: pari
Date: Mon Feb 19 12:25:22 2007
New Revision: 363
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=363
Log:
Merged revisions 350-354,356-361 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk
........
r350 | pari | 2007-02-16 00:03:02 -0600 (Fri, 16 Feb 2007) | 1 line
fix: When 'No Changes made' - only save button is being disabled, but not the cancel button
........
r351 | pari | 2007-02-16 00:44:49 -0600 (Fri, 16 Feb 2007) | 1 line
fix: Save and cancel buttons are being enabled When keys like CTRL or CAPSLOCK are pressed
........
r352 | pari | 2007-02-16 12:24:29 -0600 (Fri, 16 Feb 2007) | 1 line
Added fromuser and contact fields - requested in http://bugs.digium.com/view.php?id=8854
........
r353 | pari | 2007-02-16 12:59:35 -0600 (Fri, 16 Feb 2007) | 1 line
minor improvements to hover tab colors
........
r354 | pari | 2007-02-16 13:21:04 -0600 (Fri, 16 Feb 2007) | 1 line
making some room so that we can add more options to the page in future
........
r356 | pari | 2007-02-17 14:03:01 -0600 (Sat, 17 Feb 2007) | 1 line
Allow Alphanumeric extensions for users who want to create SIP/IAX only extensions
........
r357 | pari | 2007-02-17 15:16:55 -0600 (Sat, 17 Feb 2007) | 1 line
setting default values that make more sense
........
r358 | pari | 2007-02-17 15:42:36 -0600 (Sat, 17 Feb 2007) | 1 line
fixing queues.html so that it would be compatible with the alphanumeric extensions as well. Note: The GUI does not yet provide a way for the agents to login
........
r359 | pari | 2007-02-17 23:14:43 -0600 (Sat, 17 Feb 2007) | 1 line
Handle the case where a calling rule is defined outside the GUI
........
r360 | pari | 2007-02-18 02:28:31 -0600 (Sun, 18 Feb 2007) | 1 line
Donot allow a duplicate calling rules
........
r361 | pari | 2007-02-19 08:56:53 -0600 (Mon, 19 Feb 2007) | 1 line
fix for the bug reported in http://forums.digium.com/viewtopic.php?t=13698
........
Modified:
branches/asterisknow/ (props changed)
branches/asterisknow/config/localexts.html
branches/asterisknow/config/menus.html
branches/asterisknow/config/numberplan.html
branches/asterisknow/config/options.html
branches/asterisknow/config/queues.html
branches/asterisknow/config/scripts/astman.js
branches/asterisknow/config/setup/3.html
branches/asterisknow/config/setup/6.html
branches/asterisknow/config/stylesheets/rico.css
branches/asterisknow/config/stylesheets/schwing.css
branches/asterisknow/config/sysinfo.html
branches/asterisknow/config/trunks.html
branches/asterisknow/config/users.html
branches/asterisknow/config/voicemail.html
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 19 12:25:22 2007
@@ -1,1 +1,1 @@
-/trunk:1-346,349
+/trunk:1-362
Modified: branches/asterisknow/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/localexts.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/localexts.html (original)
+++ branches/asterisknow/config/localexts.html Mon Feb 19 12:25:22 2007
@@ -26,7 +26,7 @@
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
<script>
var usercallbacks = new Object;
-var fieldnames = new Array('status', 'save','userbase','localextenlength','allow_aliasextns','vmsecret','hasvoicemail','hasdirectory','hassip','hasiax','hasmanager','callwaiting','threewaycalling','hasagent','cancel');
+var fieldnames = new Array('status', 'save','userbase','localextenlength','allow_aliasextns','vmsecret','hasvoicemail','hasdirectory','hassip','hasiax','hasmanager','callwaiting','threewaycalling','hasagent','cancel','allow_an_extns');
var widgets = new Array;
var focus_fields = new Array('localextenlength','userbase','vmsecret');
@@ -118,9 +118,9 @@
<div class="mainscreenContentBox" id="userscontent">
<TABLE align=center width="520" cellpadding=0 cellspacing=0 style="margin: 5px 0 0 0;">
<TR>
- <TD valign="bottom" align="center" class="tab"><a href="#" class="tab" style="border-bottom: 4px solid #000000; font-weight:bold; background: #FFFFFF; font-size: 13px">Local Extension settings</a></TD>
- <TD><a href="options.html" class="tab" style="border-bottom: 0px solid #777788; font-weight:bold; background: #DDDDEE; font-size: 11px">Change Password</a></TD>
- <TD valign="bottom" align="left"><a href="#" class="tab" onclick="tosetup();" style="border-bottom: 0px solid #777788; font-weight:bold; background: #DDDDEE; font-size: 11px">Run Setup Wizard</a></TD>
+ <TD valign="bottom" align="center" class="tab"><a href="#" class="tabselected">Local Extension settings</a></TD>
+ <TD><a href="options.html" class="tab">Change Password</a></TD>
+ <TD valign="bottom" align="left"><a href="#" class="tab" onclick="tosetup();">Run Setup Wizard</a></TD>
</TR>
</TABLE>
<BR>
@@ -130,28 +130,51 @@
<fieldset style="width: 400px">
<legend> Local Extension Settings: </legend>
<table align='center' width='390' cellpadding=2 cellspacing=1>
- <tr ><td class="field_text">
+ <tr ><td class="field_text" align=left>
Local Extensions are
<select id="localextenlength" class="input9">
<option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option>
</select> digits long </td>
</tr>
- <tr ><td class="field_text">Starting point of Allocation of extensions : <input type=text id="userbase" size=5 class="input9"></td></tr>
- <tr ><td class="field_text" align="center"><input type=checkbox id="allow_aliasextns">Allow analog phones to be assigned to multiple extensions</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"><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>
</fieldset><BR>
<fieldset style="width: 400px">
<legend> Default Settings for a New User: </legend>
<table align='center' width='390' cellpadding=2 cellspacing=1>
- <tr onmouseover="show_tooltip('en', 'users', 16);"><td class="field_text" align="right">VM Password:</td><td><input size='5' id='vmsecret' pattern='^[0-9*]*$' class="input8"></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 8);"><td class="field_text" align="right">Voicemail:</td><td><input type='checkbox' id='hasvoicemail'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 9);"><td class="field_text" align="right">In Directory:</td><td><input type='checkbox' id='hasdirectory'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 10);"><td class="field_text" align="right">SIP:</td><td><input type='checkbox' id='hassip'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 11);"><td class="field_text" align="right">IAX:</td><td><input type='checkbox' id='hasiax'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 12);"><td class="field_text" align="right">CTI:</td><td><input type='checkbox' id='hasmanager'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 13);"><td class="field_text" align="right">Call Waiting:</td><td><input type='checkbox' id='callwaiting'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 14);"><td class="field_text" align="right">3-Way Calling:</td><td><input type='checkbox' id='threewaycalling'></td></tr>
- <tr onmouseover="show_tooltip('en', 'users', 15);"><td class="field_text" align="right">Is Agent:</td><td><input type='checkbox' id='hasagent' dfalt='1'><input type='hidden' dfalt='dynamic' id='host'></td>
+
+ <tr> <td onmouseover="show_tooltip('en', 'users', 15);" class="field_text" align="right"><input type='checkbox' id='hasagent'></td>
+ <td onmouseover="show_tooltip('en', 'users', 15);" class="field_text" >Is Agent</td>
+ <td onmouseover="show_tooltip('en', 'users', 8);" align=right><input type='checkbox' id='hasvoicemail'></td>
+ <td onmouseover="show_tooltip('en', 'users', 8);" class="field_text" align="left">Voicemail</td>
+ </tr>
+
+
+ <tr> <td onmouseover="show_tooltip('en', 'users', 9);" class="field_text" align="right"><input type='checkbox' id='hasdirectory'></td>
+ <td onmouseover="show_tooltip('en', 'users', 9);" class="field_text" >In Directory</td>
+ <td onmouseover="show_tooltip('en', 'users', 12);" align=right><input type='checkbox' id='hasmanager'></td>
+ <td onmouseover="show_tooltip('en', 'users', 12);" class="field_text" align="left">CTI</td>
+ </tr>
+
+ <tr> <td onmouseover="show_tooltip('en', 'users', 10);" class="field_text" align="right"><input type='checkbox' id='hassip'></td>
+ <td onmouseover="show_tooltip('en', 'users', 10);" class="field_text" >SIP</td>
+ <td onmouseover="show_tooltip('en', 'users', 11);" align=right><input type='checkbox' id='hasiax'></td>
+ <td onmouseover="show_tooltip('en', 'users', 11);" class="field_text" align="left">IAX</td>
+ </tr>
+
+ <tr> <td onmouseover="show_tooltip('en', 'users', 13);" class="field_text" align="right"><input type='checkbox' id='callwaiting'></td>
+ <td onmouseover="show_tooltip('en', 'users', 13);" class="field_text" >Call Waiting</td>
+ <td onmouseover="show_tooltip('en', 'users', 14);" align=right><input type='checkbox' id='threewaycalling'></td>
+ <td onmouseover="show_tooltip('en', 'users', 14);" class="field_text" align="left">3-Way Calling</td>
+ </tr>
+
+ <tr>
+ <td onmouseover="show_tooltip('en', 'users', 16);" align=right><input size='3' id='vmsecret' pattern='^[0-9*]*$' class="input9"> </td>
+ <td onmouseover="show_tooltip('en', 'users', 16);" class="field_text" align="left">VoiceMail Password</td>
+ <td align=right></td>
+ <td class="field_text" align="left"></td>
</tr>
</table>
</fieldset>
Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Mon Feb 19 12:25:22 2007
@@ -1077,7 +1077,7 @@
<option value="GotoExtension">Goto Extension</option>
<option value="Hangup">Hangup</option>
</select>
- <input type=text id="newstep_var" style="display:none" size=4 disabled>
+ <input type=text id="newstep_var" style="display:none" size=4 disabled class="input8">
<select id='add_newstep_extensions' style="display:none" onChange=" $('newstep_var').value = $('add_newstep_extensions').value;" class="input8"></select>
<select id='add_newstep_menus' style="display:none" onChange=" $('newstep_var').value = $('add_newstep_menus').value;" class="input8"></select>
<div id="combodiv_sounds">
Modified: branches/asterisknow/config/numberplan.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/numberplan.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/numberplan.html (original)
+++ branches/asterisknow/config/numberplan.html Mon Feb 19 12:25:22 2007
@@ -60,6 +60,7 @@
function add_callingrule(){
isnewrule = true;
+ iscustom = false;
$('rulename').value = "";
$('trunks').selectedIndex = -1 ;
$('pattern').value = "";
@@ -120,8 +121,6 @@
var commentstring = "custom";
}else{
var commentstring = "standard";
- //build a pattern into $('pattern').value
- buildpatternstring();
}
var rule_string = $('pattern').value + ',' + this_priority + ',Macro(trunkdial,${' + $('trunks').value + '}/'+ $('prepend').value +'${EXTEN:' + $('strip').value + '})' ;
@@ -140,7 +139,7 @@
}
m[$('pattern').value][this_priority] = new ruleinanpdata($('trunks').value, $('strip').value, $('prepend').value);
m[$('pattern').value][this_priority].rulename = $('rulename').value ;
- m[$('pattern').value][this_priority].ruledesc = parsepattern($('pattern').value,0) ;
+ m[$('pattern').value][this_priority].ruledesc = (iscustom) ? "custom" : parsepattern($('pattern').value,0) ;
oncomplete();
},
onFailure: function(t) {
@@ -156,15 +155,24 @@
function saverule(){
if ( !checkfields() ) return false;
+ if( !iscustom){
+ buildpatternstring();
+ }
if(isnewrule){
var newpriority=1;
var m = numberplansdata[$('extensions').value]['npdata'];
- if( typeof m[$('pattern').value] !="undefined" ){
- for ( var y in m[$('pattern').value] ){
- if ( y == "extend"){break;}
- newpriority++;
- }
+
+ if( m.hasOwnProperty($('pattern').value) && m[$('pattern').value].hasOwnProperty(''+newpriority) ) {
+ alert("A rule for this pattern is already defined !") ;
+ return ;
}
+
+// if( typeof m[$('pattern').value] !="undefined" ){
+// for ( var y in m[$('pattern').value] ){
+// if ( m[$('pattern').value].hasOwnProperty( y ) ){break;}
+// newpriority++;
+// }
+// }
add_rule_fromeditform( newpriority, oncomplete = function(){ show_npdata_table( $('extensions').value ); } );
}else{ // update exiting rule
// delete existing rule
@@ -206,6 +214,8 @@
}
for ( k =0 ; k < z['npcomments'].length ; k++ ){
var temp = z['npcomments'][k].split(",");
+ if( typeof y[temp[0]] == "undefined"){ continue ; }
+ if ( typeof y[temp[0]][temp[1]] == "undefined" ){ continue ; }
y[temp[0]][temp[1]].rulename = temp[2] ;
if(temp[3] !="custom")
y[temp[0]][temp[1]].ruledesc = parsepattern(temp[0],0) ;
@@ -244,7 +254,7 @@
addrowtotable( x , sorted_priorities[z] , "undefined" , m[x][sorted_priorities[z]].digits2strip );
}else if(trunk_exists == 0){
rules_nosp.push(m[x][sorted_priorities[z]].rulename) ;
- $('trunks').selectedIndex = -1;
+ //$('trunks').selectedIndex = -1;
addrowtotable( x , sorted_priorities[z] , "invalid" , m[x][sorted_priorities[z]].digits2strip );
}else{
addrowtotable( x , sorted_priorities[z] , m[x][sorted_priorities[z]].trunk , m[x][sorted_priorities[z]].digits2strip );
@@ -330,11 +340,12 @@
newCell0.align="center";
var newCell1 = newRow.insertCell(1);
- newCell1.innerHTML = m[a][b].rulename ;
+ newCell1.innerHTML = (m[a][b].rulename) ? m[a][b].rulename : "Not Defined" ;
newCell1.width=90;
var newCell2 = newRow.insertCell(2);
- newCell2.innerHTML = m[a][b].ruledesc ;
+ newCell2.innerHTML = (m[a][b].ruledesc) ? m[a][b].ruledesc : a ;
+ if(newCell2.innerHTML == "custom"){ newCell2.innerHTML = "custom ("+ a + ")"; }
if(c == "invalid" || c== "undefined" ){
var newCell3 = newRow.insertCell(3);
@@ -412,9 +423,11 @@
$('strip').value = m[a][b].digits2strip;
$('prepend').value = m[a][b].prepend;
$('save_a').disabled = 1;
- if( m[a][b].ruledesc == 'custom' ){
+ if( m[a][b].ruledesc == 'custom' || !m[a][b].ruledesc ){
// if this is a custom pattern then donot try to parse the pattern
iscustom = true;
+ (m[a][b].rulename) ? $('rulename').value = m[a][b].rulename : $('rulename').value = "";
+ m[a][b].ruledesc = 'custom' ;
$('define_advanced').style.display="";
$('define_usual').style.display="none";
}else{
Modified: branches/asterisknow/config/options.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/options.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/options.html (original)
+++ branches/asterisknow/config/options.html Mon Feb 19 12:25:22 2007
@@ -237,9 +237,9 @@
<TABLE align=center width="520" cellpadding=0 cellspacing=0 style="margin: 5px 0 0 0;">
<TR>
- <TD valign="bottom" align="center"><a href="localexts.html" class="tab" style="border-bottom: 0px solid #777788; font-weight:bold; background: #DDDDEE; font-size: 11px">Local Extension settings</a></TD>
- <TD><a href="#" class="tab" style="border-bottom: 4px solid #000000; font-weight:bold; background: #FFFFFF; font-size: 13px">Change Password</a></TD>
- <TD valign="bottom" align="left"><a href="#" onclick="tosetup();" class="tab" style="border-bottom: 0px solid #777788; font-weight:bold; background: #DDDDEE; font-size: 11px">Run Setup Wizard</a></TD>
+ <TD valign="bottom" align="center"><a href="localexts.html" class="tab">Local Extension settings</a></TD>
+ <TD><a href="#" class="tabselected">Change Password</a></TD>
+ <TD valign="bottom" align="left"><a href="#" onclick="tosetup();" class="tab">Run Setup Wizard</a></TD>
</TR>
</TABLE>
<BR>
Modified: branches/asterisknow/config/queues.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/queues.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/queues.html (original)
+++ branches/asterisknow/config/queues.html Mon Feb 19 12:25:22 2007
@@ -202,7 +202,7 @@
q =0;
for (k=0;k< $('agents').length ;k++ ){
if( $('agents').options[k].selected ){
- queueagents [r][q] = $('agents').options[k].innerHTML.substr(0,localextenlength);
+ queueagents [r][q] = $('agents').options[k].innerHTML.split(' -- ')[0] ;
q = q+1;
}
}
@@ -229,7 +229,7 @@
for (k=0;k< $('agents').length ;k++ ){
selectedagent = "selectedagent" + k;
if( $(selectedagent).checked ){
- queueagents [j][q] = $('agents').options[k].innerHTML.substr(0,localextenlength);
+ queueagents [j][q] = $('agents').options[k].innerHTML.split(' -- ')[0] ;
$('agents').options[k].selected = true;
q = q+1;
}else{
@@ -350,13 +350,13 @@
$('testmulti').innerHTML ="";
for (k=0;k< $('agents').length ;k++ ){
selectedagent = "selectedagent" + k;
- if( InArray( queueagents [j], $('agents').options[k].innerHTML.substr(0,localextenlength) ) ){
+ var str_checked = "";
+ $('agents').options[k].selected = false;
+ if( InArray( queueagents [j], $('agents').options[k].innerHTML.split(' -- ')[0] ) ){
$('agents').options[k].selected = true;
- $('testmulti').innerHTML += '<LABEL FOR=' + selectedagent + '><INPUT id="' + selectedagent + '" TYPE="CHECKBOX" VALUE="'+ $('agents').options[k].innerHTML.substr(0,localextenlength) + '" checked onclick="$(\'save_q\').disabled=false; $(\'cancel\').disabled=false;"> ' + $('agents').options[k].innerHTML.substr(localextenlength+4) +' (' + $('agents').options[k].innerHTML.substr(0,localextenlength) + ')' + '</LABEL><BR>';
- }else{
- $('agents').options[k].selected = false;
- $('testmulti').innerHTML += '<LABEL FOR=' + selectedagent + '><INPUT id="' + selectedagent + '" TYPE="CHECKBOX" VALUE="'+ $('agents').options[k].innerHTML.substr(0,localextenlength) + '" onclick="$(\'save_q\').disabled=false; $(\'cancel\').disabled=false;"> ' + $('agents').options[k].innerHTML.substr(localextenlength+4) +' (' + $('agents').options[k].innerHTML.substr(0,localextenlength) + ')' + '</LABEL><BR>';
+ str_checked = " checked ";
}
+ $('testmulti').innerHTML += '<LABEL FOR=' + selectedagent + '><INPUT id="' + selectedagent + '" TYPE="CHECKBOX" VALUE="'+ $('agents').options[k].innerHTML.split(' -- ')[0] + '"'+ str_checked + ' onclick="$(\'save_q\').disabled=false; $(\'cancel\').disabled=false;"> ' + $('agents').options[k].innerHTML.split(' -- ')[1] +' (' + $('agents').options[k].innerHTML.split(' -- ')[0]+ ')' + '</LABEL><BR>';
}
$('save_q').disabled = false;
}
@@ -382,7 +382,7 @@
for (k=0;k< $('agents').length ;k++ ){
selectedagent = "selectedagent" + k;
$('agents').options[k].selected = false;
- $('testmulti').innerHTML += '<LABEL FOR=' + selectedagent + '><INPUT id="' + selectedagent + '" TYPE="CHECKBOX" VALUE="'+ $('agents').options[k].innerHTML.substr(0,localextenlength) + '" onclick="$(\'save_q\').disabled=false; $(\'cancel\').disabled=false;"> ' + $('agents').options[k].innerHTML.substr(localextenlength+4) +' (' + $('agents').options[k].innerHTML.substr(0,localextenlength) + ')' + '</LABEL><BR>';
+ $('testmulti').innerHTML += '<LABEL FOR=' + selectedagent + '><INPUT id="' + selectedagent + '" TYPE="CHECKBOX" VALUE="'+ $('agents').options[k].innerHTML.split(' -- ')[0] + '" onclick="$(\'save_q\').disabled=false; $(\'cancel\').disabled=false;"> ' + $('agents').options[k].innerHTML.split(' -- ')[1] +' (' + $('agents').options[k].innerHTML.split(' -- ')[0] + ')' + '</LABEL><BR>';
}
return tmp;
}
@@ -488,7 +488,7 @@
</tr>
<tr onmouseover="show_tooltip('en', 'queues', 3);" >
<td valign='top' class="field_text">Agents:</td>
- <td><select size="4" multiple='true' id='agents' style='width:200px; display:none;'></select>
+ <td><select multiple='true' id='agents' style='display:none;'></select>
<div id="testmulti" style='border:1px solid; font-size: 8pt; height:75px; width: 200px;overflow :auto;'></div>
</td>
</tr>
Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Mon Feb 19 12:25:22 2007
@@ -945,6 +945,8 @@
}
if (box.widgets['save'])
box.widgets['save'].disabled = true;
+ if (box.widgets['cancel'])
+ box.widgets['cancel'].disabled = true;
}
}
@@ -1494,7 +1496,7 @@
return true;
}
widgets[x].onkeyup = function(event) {
- if (event.keyCode ==9){return true;}
+ if (this.oldvalue == this.value){return true;}
pattern = this.getAttribute('pattern');
if (pattern && check_pattern(pattern, this.oldvalue) && !check_pattern(pattern, this.value)) {
this.value = this.oldvalue;
Modified: branches/asterisknow/config/setup/3.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/3.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/setup/3.html (original)
+++ branches/asterisknow/config/setup/3.html Mon Feb 19 12:25:22 2007
@@ -110,6 +110,7 @@
function store_extlength(){
parent.localextenlength = $('localextenlength').value ;
+ parent.userbase = $('userbase').value ;
}
function update_spae(){
@@ -149,9 +150,9 @@
<select id="devices" style="display:none"></select> <input type=button id="save" value="Submit" style="display:none">
<div class="heading">Step 2 of <script>document.write(parent.numberofsteps);</script> - Local Extension Settings</div>
<p class="subheading"> Local Extensions are <select id="localextenlength">
- <option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option></select> digits long
+ <option value="2">2</option><option value="3">3</option><option value="4" selected>4</option><option value="5">5</option></select> digits long
</p>
- <p class="subheading">Starting point of Allocation of extensions : <input type=text id="userbase" size=5> </p>
+ <p class="subheading">Starting point of Allocation of extensions : <input type=text id="userbase" size=5 dfalt="6000"> </p>
<p class="subheading"><input type=checkbox id="allow_aliasextns"> Allow analog phones to be assigned to multiple extensions</p>
<!-- this page -->
</td>
Modified: branches/asterisknow/config/setup/6.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/6.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/setup/6.html (original)
+++ branches/asterisknow/config/setup/6.html Mon Feb 19 12:25:22 2007
@@ -180,7 +180,22 @@
$('name').onkeydown = newexten;
$('name').disabled = false;
if (whichexten.length ==0 ){
- alert("Looks like a default Voicemail Extension is not yet configured \n\n Please set an \'Extension for Checking messages\'");
+ //alert("Looks like a default Voicemail Extension is not yet configured \n\n Please set an \'Extension for Checking messages\'");
+ switch (parent.localextenlength){
+ case "2":
+ $('name').value = parent.userbase.charAt(0) + "5";
+ break;
+ case "3":
+ $('name').value = parent.userbase.charAt(0) + "50";
+ break;
+ case "4":
+ $('name').value = parent.userbase.charAt(0) + "500";
+ break;
+ case "5":
+ $('name').value = parent.userbase.charAt(0) + "5000";
+ break;
+ default : $('name').value = "8500";
+ }
}else{
if( parent.localextenlength != $('name').value.length ){
if( parent.localextenlength < $('name').value.length ){
@@ -241,7 +256,7 @@
<option value='10'>10</option>
<option value='25'>25</option>
<option value='100'>100</option>
- <option value='250'>250</option>
+ <option value='250' selected>250</option>
<option value='500'>500</option>
<option value='1000'>1000</option>
</select>
@@ -252,13 +267,13 @@
<option value='60'>1 minute</option>
<option value='120'>2 minutes</option>
<option value='300'>5 minutes</option>
- <option value='900'>15 minutes</option>
+ <option value='900' selected>15 minutes</option>
<option value='1800'>30 minutes</option>
<option value='0'>Unlimited</option>
</select>
</td>
</tr>
- <tr><td>Max greeting (seconds)</td><td> <input size=4 id='maxgreet' pattern='^\d*$' class="input8"></td></tr>
+ <tr><td>Max greeting (seconds)</td><td> <input size=4 id='maxgreet' pattern='^\d*$' class="input8" dfalt=60></td></tr>
<tr><td colspan='2' align='center'><div style="height:15px" id='status'></div></td></tr>
</table>
<div style="display:none"><input type='button' id='save' value='Save'> <input type='button' id='cancel' value='Cancel'></div>
Modified: branches/asterisknow/config/stylesheets/rico.css
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/stylesheets/rico.css?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/stylesheets/rico.css (original)
+++ branches/asterisknow/config/stylesheets/rico.css Mon Feb 19 12:25:22 2007
@@ -243,28 +243,4 @@
margin: 6px 0px 6px 0px;
}
-/* for DHTML tabs */
- a.tab {
- border-bottom: 0px solid #778;
- font: bold 11px arial,Verdana, sans-serif;
- margin: 0;
- display: inline;
- padding: 2px 0.5em;
- margin-left: 3px;
- border: 0px solid #778;
- background: #DDE;
- text-decoration: none;
- color: #448;
- height: 11px;
- }
-
-a.tab:visited {
- color: #448;
-}
-
-a.tab:hover {
- color: #000;
- background: #AAE;
- border-color: #227;
- text-decoration: none;
-}
+
Modified: branches/asterisknow/config/stylesheets/schwing.css
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/stylesheets/schwing.css?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/stylesheets/schwing.css (original)
+++ branches/asterisknow/config/stylesheets/schwing.css Mon Feb 19 12:25:22 2007
@@ -226,3 +226,46 @@
color : #717171;
}
/* end of - From astman.css */
+
+
+/* for DHTML tabs */
+ a.tab {
+ border-bottom: 0px solid #778;
+ font: bold 11px arial,Verdana, sans-serif;
+ margin: 0;
+ display: inline;
+ padding: 2px 0.5em;
+ margin-left: 3px;
+ border: 0px solid #778;
+ background: #DDE;
+ text-decoration: none;
+ color: #448;
+ height: 11px;
+ }
+
+a.tab:visited {
+ color: #448;
+}
+
+a.tab:hover {
+ color: #000;
+ background: #AAE;
+ border-color: #227;
+ text-decoration: none;
+}
+
+ a.tabselected {
+ border-bottom: 4px solid #000000;
+ font: bold 13px arial,Verdana, sans-serif;
+ margin:0pt 0pt 0pt 3px;
+ padding:2px 0.5em;
+ display: inline;
+ border: 0px solid #778;
+ background: #FFF;
+ text-decoration: none;
+ color: #448;
+ height: 11px;
+ border-bottom-color:#000000;
+ border-bottom-style:solid;
+ border-bottom-width:4px;
+ }
Modified: branches/asterisknow/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/sysinfo.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/sysinfo.html (original)
+++ branches/asterisknow/config/sysinfo.html Mon Feb 19 12:25:22 2007
@@ -69,15 +69,9 @@
function show_window(x){
for(i=0; i < tabs.length ; i++){
- document.getElementById(tabs[i]).style.background = '#DDDDEE';
- document.getElementById(tabs[i]).style.borderBottom = '0px solid #777788';
- document.getElementById(tabs[0]).style.fontWeight = 'bold';
- document.getElementById(tabs[0]).style.fontSize = '11px';
+ document.getElementById(tabs[i]).className = "tab";
}
- document.getElementById(tabs[x-1]).style.background = '#FFFFFF';
- document.getElementById(tabs[x-1]).style.borderBottom = '4px solid #000000';
- document.getElementById(tabs[x-1]).style.fontWeight = 'bold';
- document.getElementById(tabs[x-1]).style.fontSize= '13px';
+ document.getElementById(tabs[x-1]).className = "tabselected";
document.getElementById(tabs[x-1]).blur();
@@ -135,10 +129,8 @@
$(divs_toshow[i]).style.display = "block";
}
- document.getElementById(tabs[0]).style.background = 'white';
- document.getElementById(tabs[0]).style.borderBottom = '4px solid #000000';
- document.getElementById(tabs[0]).style.fontWeight = 'bold';
- document.getElementById(tabs[0]).style.fontSize = '13px';
+ document.getElementById(tabs[0]).className = "tabselected";
+
load_todayslog();
},
Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Mon Feb 19 12:25:22 2007
@@ -38,10 +38,10 @@
'delete', 'status', 'new', 'save', 'cancel','secret', 'provider', 'zapchan',
'trunkstyleanalog','trunkstylevoip','trunkstylecustomvoip', 'name', 'username', 'trunkname', 'callerid',
'hasexten', 'hassip', 'hasiax','registeriax','registersip','host','dialformat','context','group',
- 'insecure', 'host', 'fromuser', 'fromdomain');
+ 'insecure', 'host', 'fromuser', 'fromdomain','contact');
var provfieldnames = new Array('providerdesc', 'providerlogo');
var focus_fields = new Array('provider','username','secret','customvoip_name','customvoip_protocol',
- 'customvoip_host','customvoip_username','customvoip_secret');
+ 'customvoip_host','customvoip_username','customvoip_secret','fromuser','contact');
var isnewtrunk;
var dids_array = [];
@@ -758,7 +758,6 @@
<input id="group" type="hidden">
<input id="insecure" type="hidden">
<input id="port" type="hidden">
- <input id="fromuser" type="hidden">
<input id="fromdomain" type="hidden">
<tr>
<td height=10></td>
@@ -783,7 +782,6 @@
<td class="field_text">Host:</td>
<td><input type="text" id="customvoip_host" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
</tr>
-
<tr>
<td class="field_text">Username:</td>
<td><input type="text" id="customvoip_username" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
@@ -791,6 +789,14 @@
<tr>
<td class="field_text">Password:</td>
<td><input type="password" id="customvoip_secret" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
+ </tr>
+ <tr>
+ <td class="field_text">From User:</td>
+ <td><input type="text" id="fromuser" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
+ </tr>
+ <tr>
+ <td class="field_text">Contact:</td>
+ <td><input type="text" id="contact" size=14 onkeyup=" $('cancel').disabled= false;$('save').disabled= false;" class="input8"></td>
</tr>
</table>
</div>
Modified: branches/asterisknow/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/users.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/users.html (original)
+++ branches/asterisknow/config/users.html Mon Feb 19 12:25:22 2007
@@ -35,8 +35,9 @@
var numcallbacks = new Object;
var fieldnames = new Array( 'delete', 'status', 'new', 'save', 'cancel','name','fullname','secret','email','cid_number','zapchan','context', 'hasvoicemail','hasdirectory','hassip','hasiax','hasmanager','callwaiting','threewaycalling','mailbox','hasagent','group','host','vmsecret');
var focus_fields = new Array( 'name','fullname','secret','email','cid_number','zapchan','context','vmsecret');
- var localextenlength;
- var allow_aliasextns;
+ var localextenlength = 4;
+ var allow_aliasextns = "no";
+ var allow_an_extns = "no" ;
var fieldnames_buynow = new Array('cust_firstName', 'cust_lastName', 'cust_company', 'cust_email', 'cust_phone', 'cust_street', 'cust_city', 'cust_state', 'cust_zip', 'cust_country');
var userinfowidgets = new Array();
var userinfo_callbacks = new Object;
@@ -88,13 +89,15 @@
if ((t.name == 'general')){
if (t.fieldbyname['localextenlength'] && t.fieldbyname['localextenlength'].length){
localextenlength = t.fieldbyname['localextenlength'] ;
- }else{
- localextenlength = 4;
+ }
+ if ( t.fieldbyname['allow_an_extns'] && t.fieldbyname['allow_an_extns'].length ){
+ allow_an_extns = t.fieldbyname['allow_an_extns'] ;
+ if(allow_an_extns == "yes"){
+ $('name').setAttribute("pattern", '^[a-zA-Z0-9]*$');
+ }
}
if (t.fieldbyname['allow_aliasextns'] && t.fieldbyname['allow_aliasextns'].length){
allow_aliasextns = t.fieldbyname['allow_aliasextns'] ;
- }else{
- allow_aliasextns = 'no' ;
}
return null;
}
@@ -160,7 +163,7 @@
return false;
}
// check whether the length of extension is valid
- if( localextenlength != $('name').value.length){
+ if( allow_an_extns == "no" && localextenlength != $('name').value.length){
alert("Sorry, User Extension must be "+ localextenlength + " digits !");
$('name').focus();
return false;
Modified: branches/asterisknow/config/voicemail.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/voicemail.html?view=diff&rev=363&r1=362&r2=363
==============================================================================
--- branches/asterisknow/config/voicemail.html (original)
+++ branches/asterisknow/config/voicemail.html Mon Feb 19 12:25:22 2007
@@ -49,11 +49,6 @@
$('name').value = $('extensions').stored_config.catbyname[tmp[0]].subfields[tmp[1]]['name'];
};
- function newexten() {
- var newname = $('name').value;
- $('save').disabled = false;
- }
-
callbacks.format = function(t, x) {
if ((t.name != specialcontext))
return null;
@@ -103,7 +98,12 @@
$('extensions').contentEditable = 'true';
$('extensions').disabled = 0;
$('extensions').current_category = specialcontext;
- $('name').onkeydown = newexten;
+ $('name').onkeydown = function(event){ this.oldvalue = this.value ; };
+ $('name').onkeyup = function(event){
+ if(this.oldvalue == this.value){return true;}
+ $('save').disabled = false;
+ $('cancel').disabled = false;
+ };
$('name').disabled = false;
if (whichexten.length ==0 ){
alert("Looks like a default Voicemail Extension is not yet configured \n\n Please set an \'Extension for Checking messages\' and \n click on 'save' button");
More information about the asterisk-gui-commits
mailing list