pari: branch 2.0 r3834 - in /branches/2.0/config: ./ js/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Thu Sep 18 14:45:16 2008
New Revision: 3834

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3834
Log:

 Allow adding some delay before dialing (for analog trunks)
 make 'w' a valid character in dial-prepend string 



Modified:
    branches/2.0/config/callingrules.html
    branches/2.0/config/js/astman.js
    branches/2.0/config/js/tooltip.js

Modified: branches/2.0/config/callingrules.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/callingrules.html?view=diff&rev=3834&r1=3833&r2=3834
==============================================================================
--- branches/2.0/config/callingrules.html (original)
+++ branches/2.0/config/callingrules.html Thu Sep 18 14:45:16 2008
@@ -432,7 +432,7 @@
 					<TR>	<TD align=right> and Prepend these digits 
 							<img src="images/tooltip_info.gif" tip="en,callingrules,3" class='tooltipinfo'> 
 						</TD>
-						<TD> <input id="new_crl_tr_prepend" size=3  validation='numeric_plus'> before dialing</TD>
+						<TD> <input id="new_crl_tr_prepend" size=3  validation='numeric_plus_w'> before dialing</TD>
 					</TR>
 					</table>
 				</fieldset>
@@ -452,7 +452,7 @@
 					<TR>	<TD align=right> and Prepend these digits 
 							<img src="images/tooltip_info.gif" tip="en,callingrules,3" class='tooltipinfo'> 
 						</TD>
-							<TD> <input id="new_crl_fotr_prepend" size=3 validation='numeric_plus'> before dialing</TD>
+							<TD> <input id="new_crl_fotr_prepend" size=3 validation='numeric_plus_w'> before dialing</TD>
 						</TR>
 					</table>
 				</fieldset>

Modified: branches/2.0/config/js/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=3834&r1=3833&r2=3834
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Thu Sep 18 14:45:16 2008
@@ -2523,6 +2523,14 @@
 					// check if field's value is numeric - otherwise highlight field and return false
 					var fb_msg = (this_field_name) ? this_field_name + ' is a numeric field.<BR> Letters and Punctuation are not allowed in this field.' : 'This is a numeric field.<BR> Letters and Punctuation are not allowed in this field.';
 					if ( /[^0-9\+]/.test(x) ){
+						ASTGUI.highlightField( field, fb_msg );
+						return false;
+					}
+					break;
+				case 'numeric_plus_w':
+					// check if field's value is numeric - otherwise highlight field and return false
+					var fb_msg = (this_field_name) ? this_field_name + ' is a numeric field.<BR> Letters and Punctuation are not allowed in this field.' : 'This is a numeric field.<BR> Letters and Punctuation are not allowed in this field.';
+					if ( /[^0-9w\+]/.test(x) ){
 						ASTGUI.highlightField( field, fb_msg );
 						return false;
 					}

Modified: branches/2.0/config/js/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/tooltip.js?view=diff&rev=3834&r1=3833&r2=3834
==============================================================================
--- branches/2.0/config/js/tooltip.js (original)
+++ branches/2.0/config/js/tooltip.js Thu Sep 18 14:45:16 2008
@@ -354,7 +354,8 @@
 		"For example, the extension _NXXXXXX would match normal 7 digit dialings, while _1NXXNXXXXX would represent a three digit area code plus phone number, proceeded by a one.";
 
 	tooltips['callingrules'].en[2] = "<B>Strip:</B> Allows the user to specify the number of digits that will be stripped from  the front of the dialing string before the call is placed via the trunk selected in \"Use Trunk.\"  One might; for example, want users to dial 9 before their long distance calls; however one does not dial 9 before those calls are placed onto analog lines and the PSTN, so one should strip 1 digit from the front before the call is placed.";
-	tooltips['callingrules'].en[3] = "<B>Prepend these digits:</B> Allows the user to specify digits that are prepended before the call is placed via the trunk.  If a user’s trunk required 10 digit dialing, but users were more comfortable performing 7 digit dialing, this field could be used to prepend a 3 digit area code to all 7 digit strings before they are placed to the trunk.";
+	tooltips['callingrules'].en[3] = "<B>Prepend these digits:</B> Allows the user to specify digits that are prepended before the call is placed via the trunk.  If a user's trunk required 10 digit dialing, but users were more comfortable performing 7 digit dialing, this field could be used to prepend a 3 digit area code to all 7 digit strings before they are placed to the trunk. User may also prepend a 'w' character for analog trunks to provide a slight delay before dialing";
+
 	tooltips['callingrules'].en[4] = "<B>FailOver Trunk:</B> Failover trunks can be used to make sure that a call goes through an alternate route, when the primary trunk is busy or down If \"Use Failover Trunk\" is checked and \"Failover trunk\" is defined, then calls that cannot be placed via the regular trunk may have a secondary trunk defined.  If a user’s primary trunk is a VoIP trunk, but one wants calls to use the PSTN when the VoIP trunk isn’t available, this option is a good idea.";
 	tooltips['callingrules'].en[5] = "<B>Send To Local Destination:</B> If this option is checked and Destination is defined, calls matching the specified pattern may be sent to a local extension.";
 	tooltips['callingrules'].en[6] = "Defines the Trunk that calls, matching the specified pattern, will be placed through.";