pari: branch asterisknow r569 - in /branches: aadk/ aadk/config/
asterisknow/...
asterisk-gui-commits at lists.digium.com
asterisk-gui-commits at lists.digium.com
Fri Mar 30 10:43:16 MST 2007
Author: pari
Date: Fri Mar 30 12:43:15 2007
New Revision: 569
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=569
Log:
merging 567
Modified:
branches/aadk/ (props changed)
branches/aadk/config/localexts.html
branches/aadk/config/trunks.html
branches/asterisknow/ (props changed)
branches/asterisknow/config/localexts.html
branches/asterisknow/config/trunks.html
Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 30 12:43:15 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563
+/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568
Modified: branches/aadk/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/localexts.html?view=diff&rev=569&r1=568&r2=569
==============================================================================
--- branches/aadk/config/localexts.html (original)
+++ branches/aadk/config/localexts.html Fri Mar 30 12:43:15 2007
@@ -135,7 +135,7 @@
<TD valign="bottom" align="left">
<a href="#" class="tab" onclick="basicadvanced();">
<script>
- if( top.window.location.href.match("advanced=yes") ){ document.write("Basic"); }else{ document.write("Avanced"); }
+ if( top.window.location.href.match("advanced=yes") ){ document.write("Basic"); }else{ document.write("Advanced"); }
</script>
</a>
</TD>
Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=569&r1=568&r2=569
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Fri Mar 30 12:43:15 2007
@@ -214,6 +214,13 @@
if ( !_cv_un.value ) { gui_alert("Please enter a Username"); _cv_un.focus(); return false; }
}
if( !_tsv.checked && !_tsa.checked && !_tscv.checked ){ gui_alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
+
+ if(_dvcs_v.length ==0 ){
+ ifnewtrunk();
+ }else{
+ ifedit_existing();
+ }
+
if(isnewtrunk ==1){
try{
var _pvdr = _$('provider');
@@ -290,8 +297,12 @@
}
}
-
-callbacks.checkparams = function(box) {
+function ifedit_existing(){
+
+}
+
+
+function ifnewtrunk(){
var needcomma = 0;
var provider;
var count = 0;
@@ -349,15 +360,15 @@
_registeriax.value = 'no';
_registersip.value = 'no';
}else{
- _registeriax.value = ( _cv_p.value == "iax") ?'yes' : 'no';
- _registersip.value = ( _cv_p.value == "sip") ?'yes' : 'no';
+ _registeriax.value = ( _cv_p == "iax") ?'yes' : 'no';
+ _registersip.value = ( _cv_p == "sip") ?'yes' : 'no';
}
_$('host').value = _$('customvoip_host').value ;
_$('dialformat').value = '${EXTEN:1}';
_$('callerid').value = '';
_$('insecure').value = '';
- _$('port').value = '';
+ _$('port').value = ( _cv_p == "iax" ) ? "4569" : "5060";
//$('context').value = 'default';
_$('fromuser').value = '';
_$('fromdomain').value = '';
@@ -365,10 +376,11 @@
_zapchan.options[x].selected = false;
_zapchan.value = '';
_$('group').value = '';
- }
-
- return false;
-}
+ _$('disallow').value= "";
+ _$('allow').value = "all";
+ }
+}
+
callbacks.newcategory = function() {
var tmp = null;
var x;
@@ -782,7 +794,7 @@
function update_div_setordercodecs(){
_$('disallowed').innerHTML=""; _$('allowed').innerHTML="";
- if( _$('disallow').value == "all" || _$('disallow').value == ""){
+ if( _$('disallow').value == "all" ){
_$('disallow_all').checked = true;
selectbox_add("disallowed", "ulaw");
selectbox_add("disallowed", "alaw");
@@ -799,10 +811,22 @@
selectbox_add("disallowed", tmp[x]);
}
}
- var tmp = _$('allow').value.split(",");
- for(var x=0; x < tmp.length; x++){
- selectbox_add("allowed", tmp[x]);
- selectbox_remove("disallowed",tmp[x]);
+ if(_$('allow').value =="all"){
+ selectbox_add("allowed", "ulaw");
+ selectbox_add("allowed", "alaw");
+ selectbox_add("allowed", "gsm");
+ selectbox_add("allowed", "ilbc");
+ selectbox_add("allowed", "speex");
+ selectbox_add("allowed", "g726");
+ selectbox_add("allowed", "adpcm");
+ selectbox_add("allowed", "lpc10");
+ selectbox_add("allowed", "g729");
+ }else{
+ var tmp = _$('allow').value.split(",");
+ for(var x=0; x < tmp.length; x++){
+ selectbox_add("allowed", tmp[x]);
+ selectbox_remove("disallowed",tmp[x]);
+ }
}
}
Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 30 12:43:15 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563
+/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568
Modified: branches/asterisknow/config/localexts.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/localexts.html?view=diff&rev=569&r1=568&r2=569
==============================================================================
--- branches/asterisknow/config/localexts.html (original)
+++ branches/asterisknow/config/localexts.html Fri Mar 30 12:43:15 2007
@@ -135,7 +135,7 @@
<TD valign="bottom" align="left">
<a href="#" class="tab" onclick="basicadvanced();">
<script>
- if( top.window.location.href.match("advanced=yes") ){ document.write("Basic"); }else{ document.write("Avanced"); }
+ if( top.window.location.href.match("advanced=yes") ){ document.write("Basic"); }else{ document.write("Advanced"); }
</script>
</a>
</TD>
Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=569&r1=568&r2=569
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Fri Mar 30 12:43:15 2007
@@ -214,6 +214,13 @@
if ( !_cv_un.value ) { gui_alert("Please enter a Username"); _cv_un.focus(); return false; }
}
if( !_tsv.checked && !_tsa.checked && !_tscv.checked ){ gui_alert("A trunk must be Analog or VoIP or Custom VOIP"); return false; }
+
+ if(_dvcs_v.length ==0 ){
+ ifnewtrunk();
+ }else{
+ ifedit_existing();
+ }
+
if(isnewtrunk ==1){
try{
var _pvdr = _$('provider');
@@ -290,8 +297,12 @@
}
}
-
-callbacks.checkparams = function(box) {
+function ifedit_existing(){
+
+}
+
+
+function ifnewtrunk(){
var needcomma = 0;
var provider;
var count = 0;
@@ -349,15 +360,15 @@
_registeriax.value = 'no';
_registersip.value = 'no';
}else{
- _registeriax.value = ( _cv_p.value == "iax") ?'yes' : 'no';
- _registersip.value = ( _cv_p.value == "sip") ?'yes' : 'no';
+ _registeriax.value = ( _cv_p == "iax") ?'yes' : 'no';
+ _registersip.value = ( _cv_p == "sip") ?'yes' : 'no';
}
_$('host').value = _$('customvoip_host').value ;
_$('dialformat').value = '${EXTEN:1}';
_$('callerid').value = '';
_$('insecure').value = '';
- _$('port').value = '';
+ _$('port').value = ( _cv_p == "iax" ) ? "4569" : "5060";
//$('context').value = 'default';
_$('fromuser').value = '';
_$('fromdomain').value = '';
@@ -365,10 +376,11 @@
_zapchan.options[x].selected = false;
_zapchan.value = '';
_$('group').value = '';
- }
-
- return false;
-}
+ _$('disallow').value= "";
+ _$('allow').value = "all";
+ }
+}
+
callbacks.newcategory = function() {
var tmp = null;
var x;
@@ -782,7 +794,7 @@
function update_div_setordercodecs(){
_$('disallowed').innerHTML=""; _$('allowed').innerHTML="";
- if( _$('disallow').value == "all" || _$('disallow').value == ""){
+ if( _$('disallow').value == "all" ){
_$('disallow_all').checked = true;
selectbox_add("disallowed", "ulaw");
selectbox_add("disallowed", "alaw");
@@ -799,10 +811,22 @@
selectbox_add("disallowed", tmp[x]);
}
}
- var tmp = _$('allow').value.split(",");
- for(var x=0; x < tmp.length; x++){
- selectbox_add("allowed", tmp[x]);
- selectbox_remove("disallowed",tmp[x]);
+ if(_$('allow').value =="all"){
+ selectbox_add("allowed", "ulaw");
+ selectbox_add("allowed", "alaw");
+ selectbox_add("allowed", "gsm");
+ selectbox_add("allowed", "ilbc");
+ selectbox_add("allowed", "speex");
+ selectbox_add("allowed", "g726");
+ selectbox_add("allowed", "adpcm");
+ selectbox_add("allowed", "lpc10");
+ selectbox_add("allowed", "g729");
+ }else{
+ var tmp = _$('allow').value.split(",");
+ for(var x=0; x < tmp.length; x++){
+ selectbox_add("allowed", tmp[x]);
+ selectbox_remove("disallowed",tmp[x]);
+ }
}
}
More information about the asterisk-gui-commits
mailing list