pari: branch aadk r1070 - in /branches/aadk: ./ config/ringgroups.html

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

Author: pari
Date: Thu Jun  7 17:58:07 2007
New Revision: 1070

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

........
r1068 | pari | 2007-06-07 17:41:32 -0500 (Thu, 07 Jun 2007) | 1 line

Option to specify number of seconds to ring (all/each) extensions in ringgroups
........

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

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  7 17:58:07 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-1065
+/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-1069

Modified: branches/aadk/config/ringgroups.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/ringgroups.html?view=diff&rev=1070&r1=1069&r2=1070
==============================================================================
--- branches/aadk/config/ringgroups.html (original)
+++ branches/aadk/config/ringgroups.html Thu Jun  7 17:58:07 2007
@@ -128,7 +128,9 @@
 	}
 
 	_$('text_rgExten').value = (this_ringgroup.rgExten)?this_ringgroup.rgExten:"" ;
+	_$('text_ringTime').value = this_ringgroup.ringTime ;
 	_$('ringgroup_editdiv').style.display = '';
+
 }
 
 
@@ -175,6 +177,7 @@
 function create_newRG(v){
 	var uri="", p=0, context = 'ringroups-custom-' + v ;
 	var rcs = _$('select_ringthesechannels') ;
+	var ringtime = _$('text_ringTime').value;
 	var s,t,u;
 
 	ringgroups[v] = {};
@@ -198,7 +201,7 @@
 
 	if( _$('select_strategy').value =='ringinorder'){
 		for( s=0; s< rcs.options.length; s++  ){
-			t = 's,n,Dial(' + rcs.options[s].value + ',10)' ;
+			t = 's,n,Dial(' + rcs.options[s].value + ',' + ringtime + ')' ;
 			this_ringgroup.rgchannels.push(rcs.options[s].value);
 			uri += build_action('append', p, context ,"exten", t); p = p+1;
 		}
@@ -208,7 +211,7 @@
 		for( s=0; s< rcs.options.length; s++  ){ 
 			this_ringgroup.rgchannels.push(rcs.options[s].value);
 		}
-		t = 's,n,Dial(' + this_ringgroup.rgchannels.join("&") + ',10)' ;
+		t = 's,n,Dial(' + this_ringgroup.rgchannels.join("&") + ',' + ringtime + ')' ;
 		uri += build_action('append', p, context ,"exten", t); p = p+1;
 	}
 	
@@ -402,6 +405,7 @@
 	if(nd==1){ 
 		this_ringgroup.ringstyle = 'ringall';
 		rc = v[indexes[0]].split('Dial(')[1].split(',')[0].split('&') ;
+		this_ringgroup.ringTime = v[indexes[0]].split('Dial(')[1].split(',')[1].split(')')[0] ;
 		for(a=0; a < rc.length; a++){ this_ringgroup.rgchannels.push(rc[a]); }
 	}
 
@@ -409,6 +413,7 @@
 		this_ringgroup.ringstyle = 'ringinorder';
 		for(a=0; a < indexes.length; a++){
 			rc = v[indexes[a]].split('Dial(')[1].split(',')[0];
+			this_ringgroup.ringTime = v[indexes[a]].split('Dial(')[1].split(',')[1].split(')')[0] ;
 			this_ringgroup.rgchannels.push(rc);
 		}
 	}
@@ -432,6 +437,7 @@
 	_$('radio_fbhgp').checked = true;
 
 	_$('ringgroup_editdiv').style.display = '';
+	_$('text_ringTime').value = "20"; 
 
 	var r = _$('select_ringthesechannels');
 	var y = _$('select_listofchannels');
@@ -483,17 +489,17 @@
 				Strategy: <select id="select_strategy" class="input8"><option value="ringall">Ring all</option><option  value="ringinorder">Ring in Order</option></select>
 			</td>
 		</tr>
-		<tr>	<td width=200 align=center valign=top height=200>
-				<select id="select_ringthesechannels" style="width:175px; height: 200px" class="input10" size=10></select>
-			</td>
-			<td width=80 align=center>
+		<tr>	<td width=200 align=center valign=top>
+				<select id="select_ringthesechannels" style="width: 175px" class="input10" size=8></select>
+			</td>
+			<td width=80 align=center valign=top>
 				<input type="button" id="button_add_toringlist" value="&#8592;"><BR><BR>
 				<input type="button" id="button_remove_fromringlist" value="&#8594;">
 				<BR><BR>
 				<input type="button" id="button_removeall_fromringlist" value="&#187;&#187;">
 			</td>
 			<td width=200 align=center valign=top>
-				<select id="select_listofchannels" style="width:175px; height: 200px" class="input10" size=10></select>
+				<select id="select_listofchannels" style="width: 175px" class="input10" size=8></select>
 			</td>
 		</tr>
 		<tr>	<td align=center valign=top>
@@ -508,6 +514,10 @@
 		</tr>
 		<tr>	<td align=center valign=top colspan=3>
 			Extension for this ring group (optional) : <input type=text id="text_rgExten" size=5 class="input9">
+			</td>
+		</tr>
+		<tr>	<td align=center valign=top colspan=3>
+			Ring (each/all) for these many seconds : <input type=text id="text_ringTime" size=2 class="input9">
 			</td>
 		</tr>
 		<tr>	<td colspan=2 align="left" class="field_text">