pari: branch pari/dahdi_support r4392 - in /team/pari/dahdi_support: ./ confi...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Mon Jan 5 18:50:34 CST 2009
Author: pari
Date: Mon Jan 5 18:50:31 2009
New Revision: 4392
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4392
Log:
Merged revisions 4077-4079,4081,4083,4085,4089-4090,4101,4104,4106,4111-4113,4115-4121,4123,4129-4130,4132,4134-4137,4148-4149,4151,4153,4155,4159-4160,4162,4164-4187,4195,4197-4201,4205,4211-4212,4215-4217,4219,4221-4224,4229-4230,4233-4240,4242,4244,4251-4252,4268,4270,4273,4276-4278,4281-4291,4293-4296,4301,4303-4305,4307-4308,4310,4313-4321,4334-4335,4337,4339-4344,4346-4350,4354-4358,4362,4365-4391 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/branches/2.0
........
r4370 | pari | 2008-12-18 14:45:39 -0600 (Thu, 18 Dec 2008) | 5 lines
Files no longer in use
........
r4371 | pari | 2008-12-18 14:47:24 -0600 (Thu, 18 Dec 2008) | 4 lines
renaming welcome2.js
........
r4372 | pari | 2008-12-18 14:49:09 -0600 (Thu, 18 Dec 2008) | 3 lines
Renaming welcome2.html
........
r4375 | pari | 2008-12-18 16:14:08 -0600 (Thu, 18 Dec 2008) | 4 lines
ASTGUI-57 : Change intro text on Outgoing Calling Rules page
........
r4376 | pari | 2008-12-18 16:18:05 -0600 (Thu, 18 Dec 2008) | 4 lines
add some debug messages
........
r4378 | rbrindley | 2008-12-19 09:31:50 -0600 (Fri, 19 Dec 2008) | 1 line
- disambiguated user config CallerID fields by renaming: Name -> CallerID Name, CallerID -> Internal CallerID, OutBound CallerID -> CallerID Number
........
r4379 | rbrindley | 2008-12-19 10:54:07 -0600 (Fri, 19 Dec 2008) | 1 line
- changed the way tabs are styled in ui-tabs and removed the now unecessary div.clear
........
r4381 | pari | 2008-12-19 14:45:10 -0600 (Fri, 19 Dec 2008) | 6 lines
Save the gui version when applying changes.
Could come in handy if there are any configuration updates in future.
........
r4389 | pari | 2008-12-22 16:50:58 -0600 (Mon, 22 Dec 2008) | 5 lines
fixing tooltip for line keys
........
r4391 | pari | 2009-01-05 10:31:25 -0600 (Mon, 05 Jan 2009) | 5 lines
Bugfix: 'Apply Changes' button is being displayed again after cliking 'Apply Changes'
........
Added:
team/pari/dahdi_support/config/js/welcome.js
- copied unchanged from r4391, branches/2.0/config/js/welcome.js
team/pari/dahdi_support/config/welcome.html
- copied unchanged from r4391, branches/2.0/config/welcome.html
Removed:
team/pari/dahdi_support/config/js/welcome2.js
team/pari/dahdi_support/config/welcome2.html
Modified:
team/pari/dahdi_support/ (props changed)
team/pari/dahdi_support/config/callingrules.html
team/pari/dahdi_support/config/home.html
team/pari/dahdi_support/config/js/index.js
team/pari/dahdi_support/config/js/pbx.js
team/pari/dahdi_support/config/js/tooltip.js
team/pari/dahdi_support/config/stylesheets/ui-tabs.css
team/pari/dahdi_support/config/users.html
Propchange: team/pari/dahdi_support/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: team/pari/dahdi_support/config/callingrules.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/callingrules.html?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/callingrules.html (original)
+++ team/pari/dahdi_support/config/callingrules.html Mon Jan 5 18:50:31 2009
@@ -63,7 +63,7 @@
<center>
<div style='text-align:center; background-color : #FFFFFF; width: 95%; padding: 5px; margin-left: 1px; margin-top:14px; margin-bottom:20px; border:1px solid #CDCDCD; color: #575757 ' class='lite'>
- An outgoing calling rule pairs an extension pattern with a trunk used to dial the pattern. This allows different patterns to be dialed through different trunks (e.g. "local" 7-digit dials through a PRI but "long distance" 10-digit dials through a low-cost SIP trunk). You can optionally set a failover trunk to use when the primary trunk fails. Note that this panel manages only individual outgoing call rules. See the Dial Plans <hyperlink> section to associate multiple outgoing calling rules to be used for User outbound dialing.
+ An outgoing calling rule pairs an extension pattern with a trunk used to dial the pattern. This allows different patterns to be dialed through different trunks (e.g. "local" 7-digit dials through an FXO but "long distance" 10-digit dials through a low-cost SIP trunk). You can optionally set a failover trunk to use when the primary trunk fails. Note that this panel manages only individual outgoing call rules. See the Dial Plans <hyperlink> section to associate multiple outgoing calling rules to be used for User outbound dialing.
</div>
</center>
Modified: team/pari/dahdi_support/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/home.html?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/home.html (original)
+++ team/pari/dahdi_support/config/home.html Mon Jan 5 18:50:31 2009
@@ -27,7 +27,7 @@
parent.ASTGUI.dialog.hide();
DOM_username.disabled = true;
DOM_secret.disabled = true ;
- try{ if (a.welcome_redirect == true){ window.location.href = 'welcome2.html'; } }catch(err){ }
+ try{ if (a.welcome_redirect == true){ window.location.href = 'welcome.html'; } }catch(err){ }
};
var localajaxinit = function(){
Modified: team/pari/dahdi_support/config/js/index.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/index.js?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/js/index.js (original)
+++ team/pari/dahdi_support/config/js/index.js Mon Jan 5 18:50:31 2009
@@ -608,6 +608,9 @@
},
applyChanges : function(cb){
+ if( sessionData.hasOwnProperty('gui_version') && sessionData.gui_version.trim() ){
+ ASTGUI.updateaValue({ file: ASTGUI.globals.configfile , context :'general', variable :'config_gui_version', value : sessionData.gui_version });
+ }
var u = _$('applyChanges_Button');
if (sessionData.PLATFORM.isAST_1_4) {
var t = ASTGUI.cliCommand('reload') ;
Modified: team/pari/dahdi_support/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/pbx.js?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/js/pbx.js (original)
+++ team/pari/dahdi_support/config/js/pbx.js Mon Jan 5 18:50:31 2009
@@ -1885,6 +1885,9 @@
var n_Lower = n.toLowerCase();
if( n_Lower.contains('response: error') && n_Lower.contains('message: config file not found') ){
parent.ASTGUI.systemCmd( 'touch ' + top.sessionData.directories.asteriskConfig + ASTGUI.globals.configfile , function(){
+ if( top.sessionData.DEBUG_MODE ){
+ alert('Creating' + ASTGUI.globals.configfile + ' :: astgui_updateConfigFromOldGui() \n Click OK to Reload');
+ }
top.window.location.reload();
});
return false;
@@ -2241,6 +2244,9 @@
sa.callActions( function(){
SU.callActions( function(){
var u = ASTGUI.updateaValue({ file: ASTGUI.globals.configfile, context: 'general', variable: 'config_upgraded', value: 'yes' }) ;
+ if( top.sessionData.DEBUG_MODE ){
+ alert('Upgraded Configuration :: astgui_updateConfigFromOldGui() \n Click OK to Reload');
+ }
top.window.location.reload();
});
});
Modified: team/pari/dahdi_support/config/js/tooltip.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/tooltip.js?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/js/tooltip.js (original)
+++ team/pari/dahdi_support/config/js/tooltip.js Mon Jan 5 18:50:31 2009
@@ -66,6 +66,8 @@
tooltips['users'] .en[30] = "<B>Flash</B> sets the amount of time, in milliseconds, that must have passed since the last hook-flash event received by asterisk before it will recognize a second event. If a second event occurs in less time than defined for Flash, then asterisk will ignore the event. The default value of Flash is 750 ms, and it can be configured in 1ms increments." ;
tooltips['users'] .en[31] = "<B>RXFlash</B> sets the amount of time, in milliseconds, that the hook-flash must remain depressed in order for asterisk to consider such an event a valid flash event. The default value of RXFlash is 1250ms and it can be configured in 1ms increments." ;
+
+ tooltips['users'] .en[94] = "Line Keys is the number of lines that are tied to this SIP registration.";
tooltips['users'] .en[95] = "<B>Codecs</B> A codec is a compression or decompression algorithm run against voice as it is moved between analog (speaking) and digital (VoIP). <B>u-law</B> A PSTN standard codec, used in North America, that provides very good voice quality and consumes 64kbit/s for each direction (receiving and transmitting) of a VoIP call. u-law should be supported by all VoIP phones. <B>a-law</B> A PSTN standard codec, used outside of North America, that provides very good voice quality and consumes 64kbit/s for each direction (receiving and transmitting) of a VoIP call. a-law should be supported by all VoIP phones. <B>GSM</B> A wireless standard codec, used worldwide, that provides okay voice quality and consumes 13.3kbit/s for each direction (receiving and transmitting) of a VoIP call. GSM is supported by many VoIP phones. <B>G.726</B> A PSTN codec, used worldwide, that provides good voice quality and consumes 32kbit/s for each direction (receiving and
transmitting) of a VoIP call. G.726 is supported by some VoIP phones. <B>G.722</B> A high-fidelity codec for VoIP calls that provides excellent voice quality and consumes 64kbit/s for each direction (receiving and transmitting) of a VoIP call. At present, G.722 is only supported by a limited number of VoIP phones.";
Modified: team/pari/dahdi_support/config/stylesheets/ui-tabs.css
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/stylesheets/ui-tabs.css?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/stylesheets/ui-tabs.css (original)
+++ team/pari/dahdi_support/config/stylesheets/ui-tabs.css Mon Jan 5 18:50:31 2009
@@ -6,7 +6,6 @@
ul.ui-tabs-nav li {
display: inline;
- float: left;
font-weight: bold;
margin: 0px;
margin-left: 3px;
@@ -65,11 +64,12 @@
}
div.ui-tabs-panel {
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
background-color: #FFFFFF;
border: 1px solid #6b79a5;
margin: 0px;
+ margin-top: 22px;
min-height: 100px;
padding: 4px;
}
Modified: team/pari/dahdi_support/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/users.html?view=diff&rev=4392&r1=4391&r2=4392
==============================================================================
--- team/pari/dahdi_support/config/users.html (original)
+++ team/pari/dahdi_support/config/users.html Mon Jan 5 18:50:31 2009
@@ -88,7 +88,7 @@
<TD> <input id="new_ext" size=5 field_name='Extension' validation='numeric' required='yes'>
<img src="images/tooltip_info.gif" tip="en,users,0" class='tooltipinfo'>
</TD>
- <TD align="left">Name: <input id="edit_fullname" size=14>
+ <TD align="left">CallerID Name: <input id="edit_fullname" size=14>
<img src="images/tooltip_info.gif" tip="en,users,1" class='tooltipinfo'>
</TD>
<TD align="right">DialPlan: <select id='edit_user_dialplan'></select>
@@ -96,13 +96,13 @@
</TD>
</TR>
<TR>
- <TD align='right'>CallerID:</TD>
+ <TD align='right'>Internal CallerID:</TD>
<TD> <span id='edit_callerid_span'></span>
<img src="images/tooltip_info.gif" tip="en,users,4" class='tooltipinfo'>
</TD>
<TD align='left'>
- OutBound CallerID: <input id='edit_OutBoundCallerid' size=12>
+ CallerID Number: <input id='edit_OutBoundCallerid' size=12>
<img src="images/tooltip_info.gif" tip="en,users,27" class='tooltipinfo'>
</TD>
<TD align='left'></TD>
@@ -184,7 +184,7 @@
<option value='5'>5</option>
<option value='6'>6</option>
</select>
- <img src="images/tooltip_info.gif" tip="en,users,2" class='tooltipinfo'>
+ <img src="images/tooltip_info.gif" tip="en,users,94" class='tooltipinfo'>
SIP/IAX Password: <input id="edit_secret" size=6>
<img src="images/tooltip_info.gif" tip="en,users,2" class='tooltipinfo'>
More information about the asterisk-gui-commits
mailing list