rbrindley: branch 2.0 r4842 - in /branches/2.0/config: ./ js/

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Jun  8 11:03:36 2009
New Revision: 4842

URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4842
Log:

- changed 'echo canceller' to 'software echo canceller'
- moved software echo canceller to under tone region
- changed echo canceller tooltip to note that hardware echo can would be used
  if it was installed


Modified:
    branches/2.0/config/hardware_dahdi.html
    branches/2.0/config/js/tooltip.js

Modified: branches/2.0/config/hardware_dahdi.html
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/hardware_dahdi.html?view=diff&rev=4842&r1=4841&r2=4842
==============================================================================
--- branches/2.0/config/hardware_dahdi.html (original)
+++ branches/2.0/config/hardware_dahdi.html Mon Jun  8 11:03:36 2009
@@ -181,6 +181,19 @@
 						<option value="ve">Venezuela</option>
 						<option value="ph">Philippines</option>
 						<option value="ru">Russian Federation</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<td align="center">
+					<span>software echo canceller <img src="images/tooltip_info.gif" tip="en,opermode_settings,11" class='tooltipinfo'>:</span>
+					<input type='checkbox' id='enable_disable_checkbox_echocan'>
+					<select id="echocan" dfalt='0'>
+						<option value="0">mg2</option>
+						<option value="1">kb1</option>
+						<option value="2">sec</option>
+						<option value="3">sec2</option>
+						<option value="4">hpec</option>
 					</select>
 				</td>
 			</tr>
@@ -278,17 +291,6 @@
 			</select>
 		</div>
 		<div>
-			<span>echo canceller <img src="images/tooltip_info.gif" tip="en,opermode_settings,11" class='tooltipinfo'>:</span>
-			<input type='checkbox' id='enable_disable_checkbox_echocan'>
-			<select id="echocan" dfalt='0'>
-				<option value="0">mg2</option>
-				<option value="1">kb1</option>
-				<option value="2">sec</option>
-				<option value="3">sec2</option>
-				<option value="4">hpec</option>
-			</select>
-		</div>
-		<div>
 			<span>a-law override <img src="images/tooltip_info.gif" tip="en,opermode_settings,1" class='tooltipinfo'>:</span>
 			<input type='checkbox' id='enable_disable_checkbox_alawoverride'>
 			<select id="alawoverride" dfalt='0'>

Modified: branches/2.0/config/js/tooltip.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/tooltip.js?view=diff&rev=4842&r1=4841&r2=4842
==============================================================================
--- branches/2.0/config/js/tooltip.js (original)
+++ branches/2.0/config/js/tooltip.js Mon Jun  8 11:03:36 2009
@@ -477,7 +477,7 @@
 
 	tooltips['opermode_settings'].en[10] = "Echo Cancellation NLP Max Suppression: This option, only usable when the Echo Cancellation NLP Type is set to Suppression, specifies the maximum amount of dB that the NLP should attenuate the residual echo. Lower numbers mean that the NLP will provide less suppression, meaning the residual echo will sound louder. Higher numbers, especially those approaching or equaling the Echo Cancellation NLP Threshold option, will nearly mute the residual echo. If no user choice is specified, the default is 24 db.";
 
-	tooltips['opermode_settings'].en[11] = "Echo Cancellation Type: DAHDI uses modular echo cancellers that are configured per channel. However, echo cancellation via the GUI is currently a global setting. The echo cancellers are compiled and installed as part of the dahdi-linux package. You can specify which echo canceller to be used. The default behavior is for there to be NO echo canceller on any channel. If restore this default, simply disable the echo canceller. Hpec is only a valid echo canceller if it is compiled and installed.";
+	tooltips['opermode_settings'].en[11] = "Echo Cancellation Type: DAHDI uses modular echo cancellers that are configured per channel. However, echo cancellation via the GUI is currently a global setting. The echo cancellers are compiled and installed as part of the dahdi-linux package. You can specify which echo canceller to be used. The default behavior is for there to be NO echo canceller on any channel. If restore this default, simply disable the echo canceller. Hpec is only a valid echo canceller if it is compiled and installed. Hardware echo cancellation will be performed instead of software echo cancellation for any channel that has a hardware echo cancellation module installed.";
 
 // Tooltips for "Configuring Hardware" in english
 	tooltips['confighw'] = { en: [] };