pari: branch 2.0 r3814 - /branches/2.0/config/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Thu Sep 11 22:50:22 2008
New Revision: 3814

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3814
Log:
 Reverting a couple of files that got accidentally updated during the previous merge.


Modified:
    branches/2.0/config/networking.html
    branches/2.0/config/sip.html
    branches/2.0/config/voicemail.html

Modified: branches/2.0/config/networking.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/networking.html?view=diff&rev=3814&r1=3813&r2=3814
==============================================================================
--- branches/2.0/config/networking.html (original)
+++ branches/2.0/config/networking.html Thu Sep 11 22:50:22 2008
@@ -78,12 +78,13 @@
 				var tmp = u.callActions();
 			})();
 
+			ASTGUI.dialog.waitWhile('Applying Changes');
 			parent.ASTGUI.systemCmd( cmd1, function(){ 
 				parent.ASTGUI.systemCmd( cmd2, function(){ 
 					parent.ASTGUI.systemCmd( cmd3, function(){ 
-						parent.ASTGUI.systemCmd( cmd4, function(){ 
-							setTimeout( function(){ window.location.reload(); }, 3000 );
-							parent.ASTGUI.systemCmd( cmd5, function(){ });
+						parent.ASTGUI.systemCmd( cmd4, function(){
+							setTimeout( function(){top.window.location.reload();}, 4000 );
+							parent.ASTGUI.systemCmd( cmd5 + ' &', function(){ });
 						});
 					});
 				});

Modified: branches/2.0/config/sip.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/sip.html?view=diff&rev=3814&r1=3813&r2=3814
==============================================================================
--- branches/2.0/config/sip.html (original)
+++ branches/2.0/config/sip.html Thu Sep 11 22:50:22 2008
@@ -29,7 +29,7 @@
 <script>
 // Realtime options - 'rtautoclear','rtcachefriends','rtsavesysname','rtupdate','ignoreregexpire'
 
-var fieldnames = ['allowexternaldomains' ,'allowexternalinvites' ,'allowguest' ,'allowoverlap' ,'allowsubscribe' ,'allowtransfer' ,'alwaysauthreject' ,'autodomain' ,'bindaddr' ,'bindport' ,'callevents' ,'canreinvite' ,'checkmwi' ,'compactheaders' ,'context' ,'defaultexpiry', 'domain' ,'dtmfmode' ,'dumphistory' ,'externhost' ,'externip' ,'externrefresh' ,'fromdomain' ,'g726nonstandard','jbenable' ,'jbforce' ,'jbimpl' ,'jblog' ,'jbmaxsize' ,'jbresyncthreshold' ,'language' ,'localnet' ,'maxcallbitrate' ,'maxexpiry' ,'minexpiry' ,'mohinterpret' ,'mohsuggest' ,'nat' ,'notifymimetype' ,'notifyringing' ,'pedantic' ,'progressinband' ,'promiscredir' ,'realm' ,'recordhistory' ,'register' ,'registerattempts' ,'registertimeout' ,'relaxdtmf' , 'rtpholdtimeout' ,'rtptimeout' ,'sendrpid' ,'sipdebug' ,'srvlookup' ,'subscribecontext' ,'t1min' ,'t38pt_udptl' ,'tos_audio' ,'tos_sip' ,'tos_video' ,'trustrpid' ,'useragent' ,'usereqphone' ,'videosupport'] ;
+var fieldnames = ['allowexternaldomains' ,'allowexternalinvites' ,'allowguest' ,'allowoverlap' ,'allowsubscribe' ,'allowtransfer' ,'alwaysauthreject' ,'autodomain' ,'bindaddr' ,'bindport' ,'callevents' ,'canreinvite' ,'checkmwi' ,'compactheaders' ,'context' ,'defaultexpiry', 'domain' ,'dtmfmode' ,'dumphistory' ,'externhost' ,'externip' ,'externrefresh' ,'fromdomain' ,'g726nonstandard','jbenable' ,'jbforce' ,'jbimpl' ,'jblog' ,'jbmaxsize' ,'jbresyncthreshold' ,'language' ,'localnet' ,'maxcallbitrate' ,'maxexpiry' ,'minexpiry' ,'mohinterpret' ,'mohsuggest' ,'nat' ,'notifyringing' ,'pedantic' ,'progressinband' ,'promiscredir' ,'realm' ,'recordhistory' ,'register' ,'registerattempts' ,'registertimeout' ,'relaxdtmf' , 'rtpholdtimeout' ,'rtptimeout' ,'sendrpid' ,'sipdebug' ,'srvlookup' ,'subscribecontext' ,'t1min' ,'t38pt_udptl' ,'tos_audio' ,'tos_sip' ,'tos_video' ,'trustrpid' ,'useragent' ,'usereqphone' ,'videosupport'] ;
 
 
 var localajaxinit = function(){
@@ -366,11 +366,11 @@
 			<img src="images/tooltip_info.gif" tip="en,sip_general,19" class='tooltipinfo'>
 		</td>
 	</tr>
-	<tr>	<td align=right>Override Notify MIME Type:</td>
+<!--	<tr>	<td align=right>Override Notify MIME Type:</td>
 		<td colspan=3>&nbsp;<input type='text'  size=16 id='notifymimetype' class="input8">
 			<img src="images/tooltip_info.gif" tip="en,sip_general,18" class='tooltipinfo'>
 		</td>
-	</tr>
+	</tr>-->
 	</table>
 </div>
 

Modified: branches/2.0/config/voicemail.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/voicemail.html?view=diff&rev=3814&r1=3813&r2=3814
==============================================================================
--- branches/2.0/config/voicemail.html (original)
+++ branches/2.0/config/voicemail.html Thu Sep 11 22:50:22 2008
@@ -29,7 +29,8 @@
 </style>
 <script>
 var TODELETE = '';
-var DVD = ',1,VoiceMail(${EXTEN:1}@default)' ; // direct voicemail dial
+var OLD_DVD = '1,VoiceMail(${EXTEN:1}@default' ;
+var DVD = ',1,VoiceMail(${EXTEN:1}@default,s)' ; // direct voicemail dial
 
 var localajaxinit = function( ){
 	(function (){
@@ -110,7 +111,7 @@
 			{ context_name : 'default' ,
 				beginsWithArr: ['exten=_*','exten=_#'] ,
 				filename: 'extensions.conf',
-				hasThisString: DVD,
+				hasThisString: OLD_DVD,
 				cb:function(){}
 			}
 		);