pari: branch asterisknow r782 - in /branches: aadk/ aadk/config/ asterisknow/...

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Thu Apr 26 15:46:56 2007
New Revision: 782

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=782
Log:
Merged revisions 781 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r781 | pari | 2007-04-26 15:45:59 -0500 (Thu, 26 Apr 2007) | 1 line

[1] for voip trunks, default -> allow = all [2] Show VOIP when adding new trunk [3] For analog trunks -> disable codecs and advanced 
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/trunks.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 15:46:56 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-774
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-781

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=782&r1=781&r2=782
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Thu Apr 26 15:46:56 2007
@@ -346,6 +346,8 @@
 		for (var x=0;x<_zapchan.options.length;x++){  _zapchan.options[x].selected = false; }
 		_zapchan.value = '';
 		_$('group').value = '';
+		_$('disallow').value= "";
+		_$('allow').value = "all";
 	} else if (_$('trunkstyleanalog').checked) {
 		// Analog
 		_provider.selectedIndex  = -1;
@@ -423,7 +425,8 @@
 	_$('customvoip_protocol').selectedIndex = 0;
 	_$('customvoip_host').value ="";
 	_$('analog').style.display="none";
-	_$('voip').style.display="none";
+	_$('voip').style.display="";
+	_$('voip').style.height =350;
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;
@@ -630,7 +633,13 @@
 
 	var menuitem2 = document.createElement('div');
 	menuitem2.innerHTML = "Codecs" ;
+
 	menuitem2.onclick =  function(){
+		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
+			hide_mymenu();
+			gui_feedback("You can not edit codecs for an analog trunk ");
+			return true;
+		}
 		var _devices = _$('devices');
 		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
@@ -654,9 +663,12 @@
 	menuitem4.innerHTML = "Advanced" ;
 	menuitem4.onclick =  function(){  
 		hide_mymenu( );
+		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
+			gui_feedback("No Advanced settings for analog trunks ");
+			return true;
+		}
 		var _devices = _$('devices');
- 
-		for(var i=0; i< _devices.length; i++){
+ 		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
 				_devices.selectitem(i);
 				_$('bg_transparent').style.display = "";

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 15:46:56 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-773
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-781

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=782&r1=781&r2=782
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Thu Apr 26 15:46:56 2007
@@ -346,6 +346,8 @@
 		for (var x=0;x<_zapchan.options.length;x++){  _zapchan.options[x].selected = false; }
 		_zapchan.value = '';
 		_$('group').value = '';
+		_$('disallow').value= "";
+		_$('allow').value = "all";
 	} else if (_$('trunkstyleanalog').checked) {
 		// Analog
 		_provider.selectedIndex  = -1;
@@ -423,7 +425,8 @@
 	_$('customvoip_protocol').selectedIndex = 0;
 	_$('customvoip_host').value ="";
 	_$('analog').style.display="none";
-	_$('voip').style.display="none";
+	_$('voip').style.display="";
+	_$('voip').style.height =350;
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;
@@ -630,7 +633,13 @@
 
 	var menuitem2 = document.createElement('div');
 	menuitem2.innerHTML = "Codecs" ;
+
 	menuitem2.onclick =  function(){
+		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
+			hide_mymenu();
+			gui_feedback("You can not edit codecs for an analog trunk ");
+			return true;
+		}
 		var _devices = _$('devices');
 		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
@@ -654,9 +663,12 @@
 	menuitem4.innerHTML = "Advanced" ;
 	menuitem4.onclick =  function(){  
 		hide_mymenu( );
+		if( _$('devices').stored_config.catbyname[this.parentNode.sp_value].fieldbyname['trunkstyle'] == 'analog'){
+			gui_feedback("No Advanced settings for analog trunks ");
+			return true;
+		}
 		var _devices = _$('devices');
- 
-		for(var i=0; i< _devices.length; i++){
+ 		for(var i=0; i< _devices.length; i++){
 			if( this.parentNode.sp_value == _devices.options[i].value ){
 				_devices.selectitem(i);
 				_$('bg_transparent').style.display = "";