rbrindley: branch rbrindley/vmenus_revamp r4382 - in /team/rbrindley/vmenus_r...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Mon Dec 22 14:35:04 CST 2008
Author: rbrindley
Date: Mon Dec 22 14:35:03 2008
New Revision: 4382
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4382
Log:
- merged latest from branches/2.0, r4379
Added:
team/rbrindley/vmenus_revamp/config/js/welcome.js
- copied, changed from r4380, branches/2.0/config/js/welcome.js
team/rbrindley/vmenus_revamp/config/welcome.html
- copied unchanged from r4380, branches/2.0/config/welcome.html
Removed:
team/rbrindley/vmenus_revamp/config/js/welcome2.js
Modified:
team/rbrindley/vmenus_revamp/config/callingrules.html
team/rbrindley/vmenus_revamp/config/home.html
team/rbrindley/vmenus_revamp/config/js/index.js
team/rbrindley/vmenus_revamp/config/js/pbx.js
team/rbrindley/vmenus_revamp/config/stylesheets/ui-tabs.css
team/rbrindley/vmenus_revamp/config/users.html
team/rbrindley/vmenus_revamp/config/welcome2.html
Modified: team/rbrindley/vmenus_revamp/config/callingrules.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/callingrules.html?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/callingrules.html (original)
+++ team/rbrindley/vmenus_revamp/config/callingrules.html Mon Dec 22 14:35:03 2008
@@ -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/rbrindley/vmenus_revamp/config/home.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/home.html?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/home.html (original)
+++ team/rbrindley/vmenus_revamp/config/home.html Mon Dec 22 14:35:03 2008
@@ -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/rbrindley/vmenus_revamp/config/js/index.js
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/js/index.js?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/js/index.js (original)
+++ team/rbrindley/vmenus_revamp/config/js/index.js Mon Dec 22 14:35:03 2008
@@ -607,6 +607,10 @@
ASTGUI.cookies.removeCookie('configFilesChanged');
ASTGUI.feedback({msg:'Asterisk Reloaded !!', showfor: 3 , color: '#5D7CBA', bgcolor: '#FFFFFF'}) ;
+ 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 });
+ }
+
if(sessionData.PLATFORM.isAA50 ){
//TODO - Save Changes
parent.ASTGUI.systemCmd( 'save_config', function(){ if(cb){cb();} } );
Modified: team/rbrindley/vmenus_revamp/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/js/pbx.js?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/js/pbx.js (original)
+++ team/rbrindley/vmenus_revamp/config/js/pbx.js Mon Dec 22 14:35:03 2008
@@ -1864,6 +1864,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;
@@ -2220,6 +2223,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();
});
});
Copied: team/rbrindley/vmenus_revamp/config/js/welcome.js (from r4380, branches/2.0/config/js/welcome.js)
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/js/welcome.js?view=diff&rev=4382&p1=branches/2.0/config/js/welcome.js&r1=4380&p2=team/rbrindley/vmenus_revamp/config/js/welcome.js&r2=4382
==============================================================================
--- branches/2.0/config/js/welcome.js (original)
+++ team/rbrindley/vmenus_revamp/config/js/welcome.js Mon Dec 22 14:35:03 2008
@@ -958,7 +958,7 @@
};
//abstracted out because its called in manager_events.meetmeJoin & loadConferences
-addMeetmeMember = function(meetme, user_num, duration) {
+var addMeetmeMember = function(meetme, user_num, duration) {
//set duration's default value
duration = typeof(duration) != 'undefined' ? duration : 0;
Modified: team/rbrindley/vmenus_revamp/config/stylesheets/ui-tabs.css
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/stylesheets/ui-tabs.css?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/stylesheets/ui-tabs.css (original)
+++ team/rbrindley/vmenus_revamp/config/stylesheets/ui-tabs.css Mon Dec 22 14:35:03 2008
@@ -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/rbrindley/vmenus_revamp/config/users.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/users.html?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/users.html (original)
+++ team/rbrindley/vmenus_revamp/config/users.html Mon Dec 22 14:35:03 2008
@@ -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>
Modified: team/rbrindley/vmenus_revamp/config/welcome2.html
URL: http://svn.digium.com/view/asterisk-gui/team/rbrindley/vmenus_revamp/config/welcome2.html?view=diff&rev=4382&r1=4381&r2=4382
==============================================================================
--- team/rbrindley/vmenus_revamp/config/welcome2.html (original)
+++ team/rbrindley/vmenus_revamp/config/welcome2.html Mon Dec 22 14:35:03 2008
@@ -714,7 +714,6 @@
<li><a href="#info_memory"><span>Memory</span></a></li>
<li><a href="#info_disk"><span>Disk</span></a></li>
</ul>
- <div class="clear"></div>
<div id="info_general" class="ui-tabs-panel">
<B>Hostname:</B> <div id="hostname" style="font-family:courier; font-size:10pt;"></div><BR>
<B>OS Version:</B> <div id="osversion" style="font-family:courier; font-size:10pt;"></div><BR>
More information about the asterisk-gui-commits
mailing list