bkruse: branch asterisknow r1477 - in /branches/asterisknow: ./ config/ confi...

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Wed Aug 29 14:43:53 2007
New Revision: 1477

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1477
Log:
Merged revisions 1475 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1475 | bkruse | 2007-08-29 14:39:32 -0500 (Wed, 29 Aug 2007) | 5 lines

Fixed the Voice menus page, only show the sound
files IF the option is playback or background.
Never any other time. I enjoyed fixing this bug :]
(closes issue #10525)

........

Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/menus.html
    branches/asterisknow/config/scripts/astman.js

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 29 14:43:53 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465
+/branches/1.4:1-1296,1316,1326,1332,1336-1338,1342,1346,1356,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439,1442,1455,1465,1475

Modified: branches/asterisknow/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/menus.html?view=diff&rev=1477&r1=1476&r2=1477
==============================================================================
--- branches/asterisknow/config/menus.html (original)
+++ branches/asterisknow/config/menus.html Wed Aug 29 14:43:53 2007
@@ -290,7 +290,7 @@
 		return;
 	}
 
-	if( _nsa.value != "Answer" && _nsa.value != "GotoDirecotry" && _nsa.value != "Busy" && _nsa.value != "Hangup" && _nsa.value != "Congestion" && !_nsv .value ){
+	if( _nsa.value != "Answer" && _nsa.value != "GotoDirecotry" && _nsa.value != "Busy" && _nsa.value != "Hangup" && _nsa.value != "Congestion" && !_nsv.value ){
 		
 		if( _nsa.value.toLowerCase() == "dialringgroup" ){
 			if(!_$('rgrp').options.length ){
@@ -702,21 +702,21 @@
 	var _nsa = _$('newstep_action');
 	var _ane = _$('add_newstep_extensions') ;
 	var _anm = _$('add_newstep_menus') ;
-
+	var _cmb = _$('combodiv_sounds') ;
 	_nsv.value = "";
 	_nsv.style.display = "none";
 	_$('newstep_var_digit').style.display= "none" ;
-	_$('combodiv_sounds').style.display = "none" ;
 	_ane.style.display = "none";
 	_anm.style.display = "none";
+	_cmb.style.display = "none";
 	_$('tbr').style.display = "none";
 	_$('rgrp').style.display = "none";
 
         if( _nsa.value== "" || _nsa.value== "Answer"  || _nsa.value== "Hangup" || _nsa.value== "GotoDirecotry" || _nsa.value== "Busy" || _nsa.value== "Congestion" ){
 
         }else if( _nsa.value== "Background"  || _nsa.value== "Playback" ){
-                _nsv.style.display = "";
-                _nsv.size= 12;
+                _nsv.style.display = "none";
+		_cmb.style.display = "";
         }else if( _nsa.value== "Authenticate"  || _nsa.value== "DigitTimeout"  || _nsa.value== "ResponseTimeout" ||  _nsa.value== "Wait"  ||  _nsa.value== "WaitExten"  || _nsa.value== "DISA"){
                 _$('newstep_var_digit').style.display= "" ;
         }else if(_nsa.value== "GotoMenu"  ){
@@ -911,6 +911,7 @@
 	_$('savevmenu').disabled = true;
 	_$('steps').options.length =0;
 	_$('newstep_action').disabled = true;
+	_$('combodiv_sounds').style.display = "none";
 	_$('newstep_var').disabled = true;
 	_$('addstep').disabled = true;
 	_$('steps').disabled = true;
@@ -956,6 +957,7 @@
 	_allowexten.checked = false;
 	_allowexten.disabled = false;
 	_$('newstep_action').disabled = true;
+	_$('combodiv_sounds').style.display = "none";
 	_$('newstep_var').disabled = true;
 	_$('addstep').disabled = true;
 	_steps.disabled = true;
@@ -1229,13 +1231,13 @@
 				<input type=text id="newstep_var" style="display:none" size=4 disabled class="input8">
 				<select id='add_newstep_extensions' style="display:none"   onChange=" $('newstep_var').value = $('add_newstep_extensions').value;"   class="input8"></select>
 				<select id='add_newstep_menus' style="display:none"    onChange=" $('newstep_var').value = $('add_newstep_menus').value;"   class="input8"></select>
-				<div id="combodiv_sounds">
+				<div id="combodiv_sounds" style="display:none">
 					<select size=5 id="combosel_sounds" style="font-family: Verdana, Arial, Helvetica, Sans-Serif;font-size: 11px;" class="input8"></select>
 				</div>
 				<select style="display:none" id="tbr" class="input8" onChange=" $('newstep_var').value = $('tbr').value;"></select>
 				<select style="display:none" id="rgrp" class="input8" onChange=" $('newstep_var').value = $('rgrp').value;"></select>
 				<input type=text id="newstep_var_digit" size=3 style="display:none;" onChange=" $('newstep_var').value = $('newstep_var_digit').value;"  pattern='^\d*$' class="input8">&nbsp;
-				<SCRIPT LANGUAGE="JavaScript">ASTGUI.COMBOBOX.call('newstep_var', "combodiv_sounds","combosel_sounds"); </SCRIPT>
+				<SCRIPT LANGUAGE="JavaScript">ASTGUI.COMBOBOX.call(_$('combosel_sounds'));</SCRIPT>
 				<input type=button style='width:45' id='addstep' onclick="add_newstep()"  value="Add" disabled  class="buttonbold">
 				&nbsp;<input type=button style='width:50' id='deletestep' onclick="delete_step()"  value="Delete" disabled  class="buttonbold">
 				</NOBR>

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=1477&r1=1476&r2=1477
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Wed Aug 29 14:43:53 2007
@@ -268,6 +268,7 @@
 		}
 	},
 		COMBOBOX: function (a,w){		// Usage - ASTGUI.COMBOBOX.call( element , OptionsArray, width(Optional)  );
+		// a is the element, not the element ID. eg: _$('element_name') not 'element_name'
 		// this.comboDiv - the div element created
 		// this.comboOptions - the array of options
 		var k = document.createElement('DIV');