pari: branch 2.0 r4254 - in /branches/2.0/config: ./ js/
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Mon Dec 1 17:08:11 CST 2008
Author: pari
Date: Mon Dec 1 17:08:11 2008
New Revision: 4254
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4254
Log:
Add "incoming calls destination" for google talk buddies
Enable google talk panel in the main accordion
And some minor fixes for ASTGUI.parseconextline functions
Modified:
branches/2.0/config/gtalk.html
branches/2.0/config/index.html
branches/2.0/config/js/astman.js
branches/2.0/config/js/index.js
branches/2.0/config/paging.html
Modified: branches/2.0/config/gtalk.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/gtalk.html?view=diff&rev=4254&r1=4253&r2=4254
==============================================================================
--- branches/2.0/config/gtalk.html (original)
+++ branches/2.0/config/gtalk.html Mon Dec 1 17:08:11 2008
@@ -61,7 +61,7 @@
</style>
<script>
-var GTALK_CNF , JABBER_CNF;
+var GTALK_CNF , JABBER_CNF, EXTENSIONS_CNF;
var EDIT_BUDDY ;
var EDIT_ACCOUNT ;
@@ -73,35 +73,39 @@
var TBL = _$('table_BuddiesList');
ASTGUI.domActions.clear_table(TBL);
- var newRow = TBL.insertRow(-1);
- newRow.className = 'heading' ;
- addCell( newRow , { html: "<span class='lite_Heading'>Peers</span>",align:'center', colspan:4 });
-
+ var newRow = TBL.insertRow(-1);
+ newRow.className = 'heading' ;
+ addCell( newRow , { html: "<span class='lite_Heading'>Peers</span>",align:'center', colspan: 4 });
for( buddy in GTALK_CNF ){
if( !GTALK_CNF.hasOwnProperty(buddy) || buddy == 'general' ) continue;
var newRow = TBL.insertRow(-1);
newRow.className = ((TBL.rows.length)%2==1)?'odd':'even';
- addCell( newRow , { html:GTALK_CNF[buddy].username });
- addCell( newRow , { html:GTALK_CNF[buddy].context });
+ addCell( newRow , { html:GTALK_CNF[buddy].username , align:'left'});
+
+ var tmp_context = GTALK_CNF[buddy].context || '' ;
+
+ var dest_line = ( tmp_context && tmp_context.contains(ASTGUI.contexts.gtalkIncomingContext) && EXTENSIONS_CNF.hasOwnProperty(tmp_context) ) ? EXTENSIONS_CNF[tmp_context][0] : '' ;
+ var dest_args = ASTGUI.parseContextLine.getArgs(dest_line) ;
+ addCell( newRow , { html: ASTGUI.parseContextLine.toKnownContext(dest_args) , align:'left' } );
+
+
addCell( newRow , { html:GTALK_CNF[buddy].connection });
+
var tmp = "<span class='guiButton' onclick=\"MANAGE_BUDDIES.edit_buddy_form('" + buddy +"')\">Edit</span> "
+ "<span class='guiButtonDelete' onclick=\"MANAGE_BUDDIES.deleteBuddy('" + buddy +"')\">Delete</span>" ;
addCell( newRow , { html: tmp });
}
-
if( TBL.rows.length == 1 ){
- //var FR = TBL.rows[1] ;
- //FR.parentNode.removeChild(FR);
var newRow = TBL.insertRow(-1);
addCell( newRow , { html: "<BR>No peers configured. To send or receive calls from your friends on google talk, Add the peer name by clicking on the 'New peer' button.<BR><BR>", colspan:4 });
}else{
var newRow = TBL.insertRow(1);
newRow.className = 'frow' ;
addCell( newRow , { html: 'UserName' });
- addCell( newRow , { html: 'Context' });
+ addCell( newRow , { html: 'Incoming Calls' });
addCell( newRow , { html: ' Connection ' });
addCell( newRow , { html: '' });
}
@@ -122,6 +126,10 @@
var u = new listOfSynActions('gtalk.conf') ;
u.new_action('delcat', EDIT_BUDDY , '', '');
u.callActions();
+
+ u.clearActions('extensions.conf') ;
+ u.new_action('delcat', GTALK_CNF[EDIT_BUDDY].context , '', '');
+ u.callActions();
}
var v = new listOfActions('gtalk.conf');
@@ -136,9 +144,16 @@
v.new_action('append', catname , 'username', tmp_uname );
v.new_action('append', catname , 'disallow', 'all');
v.new_action('append', catname , 'allow', 'all');
- v.new_action('append', catname , 'context', 'default');
+ v.new_action('append', catname , 'context', ASTGUI.contexts.gtalkIncomingContext + catname );
+
v.new_action('append', catname , 'connection', tmp_connection );
v.callActions( function(){
+
+ var W = new listOfSynActions('extensions.conf') ;
+ W.new_action('newcat', ASTGUI.contexts.gtalkIncomingContext + catname , '', '');
+ W.new_action('append', ASTGUI.contexts.gtalkIncomingContext + catname , 'exten', 's,1,' + ASTGUI.getFieldValue('edit_buddyIncomingCalls_select') );
+ W.callActions();
+
ASTGUI.feedback( { msg:"updated peer" , showfor: 3, color:'red', bgcolor:'#FFFFFF' } );
window.location.reload();
});
@@ -146,17 +161,20 @@
new_buddy_form : function(){ // MANAGE_BUDDIES.new_buddy_form();
EDIT_BUDDY = '';
- ASTGUI.resetTheseFields([ 'edit_buddyName_text', 'edit_buddyConnection_select' ]);
+ ASTGUI.resetTheseFields([ 'edit_buddyName_text', 'edit_buddyConnection_select', 'edit_buddyIncomingCalls_select']);
$('#buddy_editdiv .dialog_title > span').html('Add Peer');
$('#buddy_editdiv').showWithBg();
},
edit_buddy_form : function(a){ // MANAGE_BUDDIES.edit_buddy_form();
if(!a) return;
-
EDIT_BUDDY = a;
ASTGUI.updateFieldToValue( 'edit_buddyName_text', GTALK_CNF[EDIT_BUDDY].username );
ASTGUI.updateFieldToValue( 'edit_buddyConnection_select', GTALK_CNF[EDIT_BUDDY].connection );
+
+ var dest_line = ( EXTENSIONS_CNF.hasOwnProperty( GTALK_CNF[EDIT_BUDDY].context ) ) ? EXTENSIONS_CNF[ GTALK_CNF[EDIT_BUDDY].context ][0] : '' ;
+ ASTGUI.selectbox.selectDestinationOption( 'edit_buddyIncomingCalls_select' , ASTGUI.parseContextLine.getAppWithArgs(dest_line) );
+
$('#buddy_editdiv .dialog_title > span').html( 'Edit Peer ' + EDIT_BUDDY);
$('#buddy_editdiv').showWithBg();
}
@@ -258,6 +276,10 @@
top.document.title = 'Google Talk Preferences' ;
GTALK_CNF = config2json({ filename:'gtalk.conf', usf:1 }); // buddies
JABBER_CNF = config2json({ filename:'jabber.conf', usf:1 }); // accounts
+ EXTENSIONS_CNF = config2json({ filename:'extensions.conf', usf:0 });
+
+ var someArray = parent.miscFunctions.getAllDestinations() ;
+ ASTGUI.selectbox.populateArray('edit_buddyIncomingCalls_select', someArray);
(function(){
// check if the general section of the config files are configured
@@ -334,6 +356,11 @@
<tr> <td align=right>Connection: </td>
<td colspan=2><select id="edit_buddyConnection_select"></select></td>
</tr>
+
+ <tr> <td align=right>Incoming Calls to : </td>
+ <td colspan=2><select id="edit_buddyIncomingCalls_select"></select></td>
+ </tr>
+
<tr> <td align="right" colspan=2 height=10></td></tr>
<tr> <td align=center colspan=3>
<span class='guiButtonCancel' onclick='ASTGUI.hideDrag(event);'>Cancel</span>
Modified: branches/2.0/config/index.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/index.html?view=diff&rev=4254&r1=4253&r2=4254
==============================================================================
--- branches/2.0/config/index.html (original)
+++ branches/2.0/config/index.html Mon Dec 1 17:08:11 2008
@@ -178,6 +178,11 @@
<div class="ui-accordion-link">Follow Me</div>
<div class="ui-accordion-desc"></div>
</div>
+ <div page='gtalk.html'>
+ <div class="ui-accordion-link">Google Talk</div>
+ <div class="ui-accordion-desc">Send or Receive calls from your buddies on Google Talk network</div>
+ </div>
+
<div page='directory.html'>
<div class="ui-accordion-link">Directory</div>
<div class="ui-accordion-desc">Preferences for 'Dialing by Name Directory'</div>
Modified: branches/2.0/config/js/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/astman.js?view=diff&rev=4254&r1=4253&r2=4254
==============================================================================
--- branches/2.0/config/js/astman.js (original)
+++ branches/2.0/config/js/astman.js Mon Dec 1 17:08:11 2008
@@ -359,6 +359,7 @@
Directory: 'directory', // ASTGUI.contexts.Directory
CallingRulePrefix : 'CallingRule_', // context for calling rules being with - ASTGUI.contexts.CallingRulePrefix
CallingPlanPrefix: 'DLPN_', // context for DialPlans -- ASTGUI.contexts.CallingPlanPrefix
+ gtalkIncomingContext: 'gtalk_incoming_', // ASTGUI.contexts.gtalkIncomingContext
mohdirPrefix : 'guimohdir_' // ASTGUI.contexts.mohdirPrefix
// music on hold directories created by gui will have this prefix
// also post_mappings definitions in http.conf will have this name
@@ -1608,7 +1609,7 @@
// expects q as 'exten=s,2,foo(ssssssss,ssdsd,assd)' OR 's,2,foo(ssssssss,ssdsd,assd)' OR 's,2,foo(ssssssss|ssdsd|assd)'
// OR 's,1,Answer' OR 's,n,Hangup'
// and returns [ssssssss,ssdsd,assd] or [] // arguments as an array
- if (typeof q != 'string') return [];
+ if (typeof q != 'string' || !q ) return [];
q = q.trim();
if ( !q.endsWith(')') || !q.contains('(') ){
ASTGUI.Log.Error( "ASTGUI.parseContextLine.getArgs() - No Argument found for \"" + q + "\" " );
@@ -1644,6 +1645,7 @@
toKnownContext: function(args){ // usage ASTGUI.parseContextLine.toKnownContext(y)
// converts args to a readable format - ex: default|6000|1 to 'user 6000'
+ if(!args.length){ return ''; }
try{
if(typeof args == 'string'){
args = this.getArgsArrayFromArgsString(args);
Modified: branches/2.0/config/js/index.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/index.js?view=diff&rev=4254&r1=4253&r2=4254
==============================================================================
--- branches/2.0/config/js/index.js (original)
+++ branches/2.0/config/js/index.js Mon Dec 1 17:08:11 2008
@@ -253,8 +253,6 @@
sessionData.directories.scripts = sessionData.directories.astvarlibdir + 'scripts/';/* Directory for gui scripts (listfiles, for example) */
sessionData.directories.output_SysInfo = './sysinfo_output.html' ;
sessionData.directories.voicemails_dir = sessionData.directories.astspooldir + 'voicemail/default/' ;
-
-
sessionData.directories.script_takeBackup = 'sh ' + sessionData.directories.scripts + 'takebackup';
sessionData.directories.script_restoreBackup = 'sh ' + sessionData.directories.scripts + 'restorebackup';
sessionData.directories.script_ListFiles = 'sh ' + sessionData.directories.scripts + 'listfiles';
Modified: branches/2.0/config/paging.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/paging.html?view=diff&rev=4254&r1=4253&r2=4254
==============================================================================
--- branches/2.0/config/paging.html (original)
+++ branches/2.0/config/paging.html Mon Dec 1 17:08:11 2008
@@ -58,7 +58,7 @@
<span style="cursor: pointer; cursor: hand;" onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
</div>
-<div id="tabbedMenu"></div>
+<center><div id="tabbedMenu"></div></center>
<div class='hideall' id='TAB_group_Paging'>
More information about the asterisk-gui-commits
mailing list