pari: branch 2.0 r4300 - in /branches/2.0/config: ./ js/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Fri Dec  5 13:54:48 2008
New Revision: 4300

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4300
Log:

 Getting rid out the paging time out,
 this is absolute timeout which is not we want.



Modified:
    branches/2.0/config/js/paging.js
    branches/2.0/config/js/pbx.js
    branches/2.0/config/paging.html

Modified: branches/2.0/config/js/paging.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/paging.js?view=diff&rev=4300&r1=4299&r2=4300
==============================================================================
--- branches/2.0/config/js/paging.js (original)
+++ branches/2.0/config/js/paging.js Fri Dec  5 13:54:48 2008
@@ -399,7 +399,6 @@
 
 		var c = context2json ({ filename: 'extensions.conf' , context: 'globals', usf: 1 });
 		ASTGUI.updateFieldToValue( 'text_Alert_Info_Header' , c.getProperty('PAGING_HEADER') );
-		ASTGUI.updateFieldToValue( 'select_Timeout' , c.getProperty('PAGING_TIMEOUT') );
 
 		var d = context2json ({ filename: 'extensions.conf' , context: ASTGUI.contexts.PageAnExtension , usf: 0 });
 		var i = d.length;
@@ -421,7 +420,6 @@
 
 var save_TAB_paging_settings = function(){
 	ASTGUI.updateaValue({ file:'extensions.conf', context :'globals', variable :'PAGING_HEADER', value : ASTGUI.getFieldValue('text_Alert_Info_Header') });
-	ASTGUI.updateaValue({ file:'extensions.conf', context :'globals', variable :'PAGING_TIMEOUT', value : ASTGUI.getFieldValue('select_Timeout') });
 	ASTGUI.feedback({msg:' Saved !!', showfor: 3 , color: '#5D7CBA', bgcolor: '#FFFFFF'}) ;
 };
 

Modified: branches/2.0/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=4300&r1=4299&r2=4300
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Fri Dec  5 13:54:48 2008
@@ -29,7 +29,7 @@
 		// check whether the config files are in proper format and have every thing needed for the gui to function properly
 				var check_For_Contexts = {
 					general : { static : 'yes', writeprotect : 'no', clearglobalvars : 'yes' },
-					globals : { FEATURES : '' , DIALOPTIONS : '' , RINGTIME: '20', FOLLOWMEOPTIONS : '', PAGING_HEADER : 'Intercom', PAGING_TIMEOUT : '60' },
+					globals : { FEATURES : '' , DIALOPTIONS : '' , RINGTIME: '20', FOLLOWMEOPTIONS : '', PAGING_HEADER : 'Intercom' },
 					'default' : {},
 					'macro-stdexten' : [
 						'exten=s,1,Set(__DYNAMIC_FEATURES=${FEATURES})',
@@ -59,9 +59,8 @@
 					],
 					'macro-pagingintercom' : [
 						'exten=s,1,SIPAddHeader(Alert-Info: ${PAGING_HEADER})',
-						'exten=s,2,Set(TIMEOUT(absolute)=${PAGING_TIMEOUT})',
-						'exten=s,3,Page(${ARG1}|${ARG2})',
-						'exten=s,4,Hangup'
+						'exten=s,2,Page(${ARG1}|${ARG2})',
+						'exten=s,3,Hangup'
 					]
 				};
 		

Modified: branches/2.0/config/paging.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/paging.html?view=diff&rev=4300&r1=4299&r2=4300
==============================================================================
--- branches/2.0/config/paging.html (original)
+++ branches/2.0/config/paging.html Fri Dec  5 13:54:48 2008
@@ -111,18 +111,6 @@
 				<input type=text id="text_Alert_Info_Header" size=16 required='yes'>
 			</td>
 		</TR>
-		<TR>	<td align="right">Timeout :&nbsp;</td>
-			<td>
-				<select id="select_Timeout" dfalt='60' required='yes'>
-				<option value="15">15 Seconds</option>
-				<option value="30">30 Seconds</option>
-				<option value="45">45 Seconds</option>
-				<option value="60">60 Seconds</option>
-				<option value="90">90 Seconds</option>
-				<option value="120">120 Seconds</option>
-				</select>
-			</td>
-		</TR>
 		<tr>	<td align="right" colspan=2 height=10></td></tr>
 		<tr>	<td align=right>
 				<span class='guiButtonCancel' onclick='ASTGUI.hideDrag(event);'>Cancel</span>&nbsp;&nbsp;