pari: trunk r111 - in /trunk/config: ./ scripts/

asterisk-gui-commits at lists.digium.com asterisk-gui-commits at lists.digium.com
Fri Nov 3 13:57:42 MST 2006 

Author: pari
Date: Fri Nov  3 14:57:42 2006
New Revision: 111

URL: http://svn.digium.com/view/asterisk-gui?rev=111&view=rev
Log:
WaitExten in Voicemenus

Modified:
    trunk/config/home.html
    trunk/config/homeapp.html
    trunk/config/meetme.html
    trunk/config/menus.html
    trunk/config/scripts/astman.js

Modified: trunk/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/home.html?rev=111&r1=110&r2=111&view=diff
==============================================================================
--- trunk/config/home.html (original)
+++ trunk/config/home.html Fri Nov  3 14:57:42 2006
@@ -141,7 +141,7 @@
 			<table align="center">
 				<tr><td colspan="2"><h2>Asterisk&trade; Configuration Engine</h2></td>
 				<tr><td>Username:</td><td><input disabled=1 id="username"  class="input9" size=12></td></tr>
-				<tr><td>Secret:</td><td><input disabled=1 type="password" id="secret" class="input9" size=12 onKeyPress="submitOnEnter(event)"></td></tr>
+				<tr><td>Password:</td><td><input disabled=1 type="password" id="secret" class="input9" size=12 onKeyPress="submitOnEnter(event)"></td></tr>
 				<tr><td colspan=2 align="center">
 				  <div id="statusbar">
 					<span style="margin-left: 4px;font-weight:bold">&nbsp;</span>

Modified: trunk/config/homeapp.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/homeapp.html?rev=111&r1=110&r2=111&view=diff
==============================================================================
--- trunk/config/homeapp.html (original)
+++ trunk/config/homeapp.html Fri Nov  3 14:57:42 2006
@@ -165,7 +165,7 @@
 			<table align="center">
 				<tr><td colspan="2"><h2>Asterisk&trade; Configuration Engine</h2></td>
 				<tr><td>Username:</td><td><input disabled=1 id="username" class="input9" size=12></td></tr>
-				<tr><td>Secret:</td><td><input disabled=1 type="password" id="secret" class="input9" size=12  onKeyPress="submitOnEnter(event)"></td></tr>
+				<tr><td>Password:</td><td><input disabled=1 type="password" id="secret" class="input9" size=12  onKeyPress="submitOnEnter(event)"></td></tr>
 				<tr><td colspan=2 align="center">
 				  <div id="statusbar">
 					<span style="margin-left: 4px;font-weight:bold">&nbsp;</span>

Modified: trunk/config/meetme.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/meetme.html?rev=111&r1=110&r2=111&view=diff
==============================================================================
--- trunk/config/meetme.html (original)
+++ trunk/config/meetme.html Fri Nov  3 14:57:42 2006
@@ -206,7 +206,7 @@
 <body id="foo" onload="localajaxinit()"  bgcolor="EFEFEF">
 
 <div class="mainscreenTitleBar">
-	<span style="margin-left: 4px;font-weight:bold">MeetMe Extension Configuration</span>
+	<span style="margin-left: 4px;font-weight:bold">Conference Bridge Extensions Configuration</span>
 </div>
 <div class="mainscreenContentBox" id="mailboxcontent">
 <table class="mainscreenTable" align="center">

Modified: trunk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/menus.html?rev=111&r1=110&r2=111&view=diff
==============================================================================
--- trunk/config/menus.html (original)
+++ trunk/config/menus.html Fri Nov  3 14:57:42 2006
@@ -73,7 +73,11 @@
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Play '" + temp[2] + "' & Donot Listen for KeyPress";
 	}
-	if( temp[2].match("Wait") ){
+	if( temp[2].match("WaitExten") ){
+		temp[2] = temp[2].replace(/WaitExten\(/, "");
+		temp[2] = temp[2].replace(/\)/, "");
+		return "WaitExten '"+ temp[2] + "' sec";
+	}else if( temp[2].match("Wait") ){
 		temp[2] = temp[2].replace(/Wait\(/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] + "' sec";
@@ -238,10 +242,15 @@
 				// empty this textbox & disable this button, select the newly added item to the steps options box
 				$('newstep_action').selectedIndex = 0;
 					$('deletestep').disabled = false;
-				$('newstep_var').value= "";
 				$('steps').selectedIndex = $('steps').length - 1 ;
 				$('status').innerHTML = "<i>New step added !</i>";
 				update_updown();
+				$('newstep_var').value= "";
+				$('newstep_var').style.display = "none" ;
+				$('combodiv_sounds').value= "";
+				$('combodiv_sounds').style.display = "none" ;
+				$('newstep_var_digit').value= "";
+				$('newstep_var_digit').style.display= "none" ;
 			},
 			onFailure: function(t) {
 				$('status_message').style.display='none';
@@ -278,6 +287,8 @@
 		action_string = "s,"+ newpriority+ ",Playback(" + $('newstep_var').value + ")";
 	}else if ( $('newstep_action').value == 'Wait'  ){
 		action_string = "s,"+ newpriority+ ",Wait(" + $('newstep_var').value + ")";
+	}else if ( $('newstep_action').value == 'WaitExten'  ){
+		action_string = "s,"+ newpriority+ ",WaitExten(" + $('newstep_var').value + ")";
 	}else if ( $('newstep_action').value == 'Hangup'  ){
 		action_string = "s,"+ newpriority+ ",Hangup";
 	}
@@ -567,20 +578,19 @@
 		$('newstep_var').style.display = "none";
 		$('newstep_var_digit').style.display= "none" ;
 		$('combodiv_sounds').style.display = "none" ;
-	}
-
-	if( $('newstep_action').value== "Background"  || $('newstep_action').value== "SetMusicOnHold" || $('newstep_action').value== "Playback" ){
+	}else if( $('newstep_action').value== "Background"  || $('newstep_action').value== "SetMusicOnHold" || $('newstep_action').value== "Playback" ){
 		$('newstep_var').style.display = "";
 		$('newstep_var').size= 12;
 		$('newstep_var_digit').style.display= "none" ;
-	}
-
-	if( $('newstep_action').value== "DigitTimeout"  || $('newstep_action').value== "ResponseTimeout" ||  $('newstep_action').value== "Wait" ){
+	}else if( $('newstep_action').value== "DigitTimeout"  || $('newstep_action').value== "ResponseTimeout" ||  $('newstep_action').value== "Wait"  ||  $('newstep_action').value== "WaitExten" ){
 		$('newstep_var').style.display = "none" ;
 		$('combodiv_sounds').style.display = "none" ;
 		$('newstep_var_digit').style.display= "" ;
-	}
-
+	}else if  ($('newstep_action').value== ""){
+		$('newstep_var').style.display = "none" ;
+		$('combodiv_sounds').style.display = "none" ;
+		$('newstep_var_digit').style.display= "none" ;
+	}
 }
 
 
@@ -919,6 +929,7 @@
 									<option value="ResponseTimeout">ResponseTimeout</option>
 									<option value="Playback">Playback</option>
 									<option value="Wait">Wait</option>
+									<option value="WaitExten">WaitExten</option>
 									<option value="Hangup">Hangup</option>
 								</select>&nbsp;
 								<input type=text id="newstep_var" style="display:none" size=4 disabled>

Modified: trunk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/scripts/astman.js?rev=111&r1=110&r2=111&view=diff
==============================================================================
--- trunk/config/scripts/astman.js (original)
+++ trunk/config/scripts/astman.js Fri Nov  3 14:57:42 2006
@@ -1598,7 +1598,7 @@
 	specials = new Array;
 	specials.push(
 		new Special("VoiceMailMain", null, "Check Voicemail"),
-		new Special("MeetMe", null, "Conference Room"),
+		new Special("MeetMe", null, "Conference Bridge"),
 		new Special("Queue", null, "Call Queue")
 	);

More information about the asterisk-gui-commits mailing list