pari: branch 2.0 r3704 - in /branches/2.0/config: js/tooltip.js voicemail.html

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Mon Aug 25 11:49:28 2008
New Revision: 3704

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

  As *EXTEN might get in the way of implementing feature codes,
  Use #EXTEN instead of *EXTEN for 'Direct Voicemail Dial'



Modified:
    branches/2.0/config/js/tooltip.js
    branches/2.0/config/voicemail.html

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=3704&r1=3703&r2=3704
==============================================================================
--- branches/2.0/config/js/tooltip.js (original)
+++ branches/2.0/config/js/tooltip.js Mon Aug 25 11:49:28 2008
@@ -117,7 +117,7 @@
 	tooltips['voicemail'] .en[11] = "<B>Allow callers to Review:</B> Checking this option allows the caller to review their message before it is submitted as a new voicemail message.";
 	tooltips['voicemail'] .en[12] = "<B>Play Envelope:</B> Turn on/off playing introductions about each message when accessing them from the voicemail application.";
 	tooltips['voicemail'] .en[13] = "<B> Max Greeting:</B> Set the maximum number of seconds for a User's voicemail greeting.";
-	tooltips['voicemail'] .en[15] = "<B> Direct VoiceMail Dial:</B> Check this to enable direct voicemail dial. For instance, if John's extension is 6001, you would be able to directly dial into John's voicemailbox by dialing *6001 to leave him a message.";
+	tooltips['voicemail'] .en[15] = "<B> Direct VoiceMail Dial:</B> Check this to enable direct voicemail dial. For instance, if John's extension is 6001, you would be able to directly dial into John's voicemailbox by dialing #6001 to leave him a message.";
 
 
 

Modified: branches/2.0/config/voicemail.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/voicemail.html?view=diff&rev=3704&r1=3703&r2=3704
==============================================================================
--- branches/2.0/config/voicemail.html (original)
+++ branches/2.0/config/voicemail.html Mon Aug 25 11:49:28 2008
@@ -46,7 +46,7 @@
 		_$('directVoiceMailDial').checked = false;
 		var r = context2json({ filename:'extensions.conf' , context : 'default' , usf:0 });
 		for( var ri = 0; ri < r.length ; ri ++ ){
-			if( r[ri].beginsWith('exten=_*') && r[ri].contains(DVD) ){
+			if( (r[ri].beginsWith('exten=_*') || r[ri].beginsWith('exten=_#') )&& r[ri].contains(DVD) ){
 				_$('directVoiceMailDial').checked = true;
 				break;
 			}
@@ -99,7 +99,7 @@
 	(function(){
 		ASTGUI.miscFunctions.delete_LinesLike(
 			{ context_name : 'default' ,
-				beginsWithArr: ['exten=_*'] ,
+				beginsWithArr: ['exten=_*','exten=_#'] ,
 				filename: 'extensions.conf',
 				hasThisString: DVD,
 				cb:function(){}
@@ -107,7 +107,7 @@
 		);
 
 		if( _$('directVoiceMailDial').checked && parent.sessionData.GUI_PREFERENCES.ue_start ){
-			var s = '_*' + parent.sessionData.GUI_PREFERENCES.ue_start.charAt(0) + 'X'.times( String(parent.sessionData.GUI_PREFERENCES.ue_start).length -1 ) + DVD ;
+			var s = '_#' + parent.sessionData.GUI_PREFERENCES.ue_start.charAt(0) + 'X'.times( String(parent.sessionData.GUI_PREFERENCES.ue_start).length -1 ) + DVD ;
 			var u = new listOfSynActions('extensions.conf');
 			u.new_action('append', 'default', 'exten', s);
 			u.callActions();