bkruse: trunk r1565 - in /trunk: ./ config/scripts/tooltip.js config/users.html

Mon Sep 10 14:25:19 CDT 2007

Author: bkruse
Date: Mon Sep 10 14:25:18 2007
New Revision: 1565

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1565
Log:
Merged revisions 1564 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1564 | bkruse | 2007-09-10 14:24:54 -0500 (Mon, 10 Sep 2007) | 4 lines

Fix and some logic for voicemail and user specific
VM options.
(closes issue #10664)

........

Modified:
    trunk/   (props changed)
    trunk/config/scripts/tooltip.js
    trunk/config/users.html

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/config/scripts/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/tooltip.js?view=diff&rev=1565&r1=1564&r2=1565
==============================================================================

--- trunk/config/scripts/tooltip.js (original)
+++ trunk/config/scripts/tooltip.js Mon Sep 10 14:25:18 2007
@@ -42,6 +42,7 @@
 	tooltips['users'] .en[22] = "<B>NAT:</B> Try this setting when Asterisk is on a public IP, communicating with devices hidden behind a NAT device (broadband router). If you have one-way audio problems, you usually have problems with your NAT configuration or your firewall's support of SIP+RTP ports.";
 	tooltips['users'] .en[23] = "<B>DTMFMode:</B> Set default dtmfmode for sending DTMF. Default: rfc2833 <BR><B>Other options:</B><BR>info : SIP INFO messages<BR>inband : Inband audio (requires 64 kbit codec -alaw, ulaw)<BR>auto : Use rfc2833 if offered, inband otherwise";
 	tooltips['users'] .en[24] = "<B>Codecs:</B> Click to select the codecs that asterisk has to offer, for the particular user.";
+	tooltips['users'] .en[25] = "<B>Email Only:</B> Send Voicemail to email only, do not store in the mailbox.";
 	tooltips['users'] .en[99] = "<B>Phone Serial:</B> Enter the serial number of a Polycom phone to enable phone provisioning." ;
 
 // Tooltips for Conferencing (meetme)

Modified: trunk/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/users.html?view=diff&rev=1565&r1=1564&r2=1565
==============================================================================
--- trunk/config/users.html (original)
+++ trunk/config/users.html Mon Sep 10 14:25:18 2007
@@ -30,7 +30,7 @@
 var callbacks = new Object;
 var extencallbacks = new Object;
 var allcodecs = new Array;
-var fieldnames = ['callwaiting' ,'cancel' ,'cid_number' ,'context' ,'delete' ,'email' ,'fullname' ,'group' ,'hasagent' ,'hasdirectory' ,'hasiax' ,'hasmanager' ,'hassip' ,'hasvoicemail' ,'host' ,'mailbox' ,'name' ,'new' ,'save' ,'secret' ,'threewaycalling' ,'vmsecret' ,'zapchan', 'registeriax', 'registersip','canreinvite','nat','dtmfmode', 'disallow','allow'];
+var fieldnames = ['callwaiting' ,'cancel' ,'cid_number' ,'context' ,'delete' ,'email' ,'fullname' ,'group' ,'hasagent' ,'hasdirectory' ,'hasiax' ,'hasmanager' ,'hassip' ,'hasvoicemail' ,'deletevoicemail' ,'host' ,'mailbox' ,'name' ,'new' ,'save' ,'secret' ,'threewaycalling' ,'vmsecret' ,'zapchan', 'registeriax', 'registersip','canreinvite','nat','dtmfmode', 'disallow','allow'];
 
 var localextenlength = 4;
 var allow_aliasextns = "no";
@@ -190,6 +190,8 @@
 			return true;
 		}
 	}
+	showhide();
+	/* check to see if we need to display out email/voicemail settings. */
 	_$('codecs_text').innerHTML = 'disallow: '+ _$('disallow').value + ' <BR> allow:' + _$('allow').value ;
 }
 
@@ -432,7 +434,20 @@
 	}
 }
 
-
+function showhide() {
+	var t = _$('hasvoicemail');
+	var fields_z = ['deletevoicemail', 'deletevoicemail_2', 'deletevoicemail_3']
+	if(t.checked) {
+		for(var x=0; x < fields_z.length; x++) {
+			_$(fields_z[x]).style.display="";
+		}
+	} else {
+		for(var x=0; x < fields_z.length; x++) {
+			_$(fields_z[x]).style.display="none";
+		}
+	}
+	return true;	
+}
 </script>
 <body id="foo" onload="localajaxinit()"  bgcolor="#EFEFEF" onunload="free_mem()">
 <div class="mainscreenTitleBar">
@@ -470,11 +485,15 @@
 					<legend>&nbsp;Extension Options:&nbsp;</legend>
 				<table align='center' width=270 cellpadding=1 cellspacing=1>
 				<tr>
-					<td width=40 align=right><input type='checkbox' id='hasvoicemail'></td>
+					<td width=40 align=right><input onClick="showhide();" type='checkbox' id='hasvoicemail'></td>
 					<td class="field_text" tip="en,users,8">Voicemail</td>
 
 					<td align=right><input type='checkbox' id='hasdirectory'></td>
 					<td class="field_text" tip="en,users,9">In Directory</td>
+				</tr>
+				<tr id='deletevoicemail_3' style="display:none">
+					<td width=40 align=right><input style="display:none" type='checkbox' id='deletevoicemail'></td>
+					<td style="display:none" id='deletevoicemail_2' class="field_text" tip="en,users,25">Email Only</td>
 				</tr>
 				<tr>
 					<td align=right><input type='checkbox' id='hassip'></td>


