pari: branch 2.0 r4255 - /branches/2.0/config/gtalk.html
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Mon Dec 1 18:07:35 CST 2008
Author: pari
Date: Mon Dec 1 18:07:34 2008
New Revision: 4255
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4255
Log:
finalize 'Google talk/Jabber' page
Modified:
branches/2.0/config/gtalk.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=4255&r1=4254&r2=4255
==============================================================================
--- branches/2.0/config/gtalk.html (original)
+++ branches/2.0/config/gtalk.html Mon Dec 1 18:07:34 2008
@@ -26,7 +26,7 @@
#table_BuddiesList {
border: 1px solid #666666;
margin: 0px;
- width: 550px ;
+ width: 95% ;
text-align: center;
padding : 1px;
}
@@ -48,9 +48,11 @@
margin: 0px;
text-align: center;
padding : 1px;
- width: 300px ;
+ width: 95% ;
}
#table_AccountsList tr.heading { background: #FFFFFF;}
+ #table_AccountsList tr.frow { background: #6b79a5; color: #CED7EF; }
+ #table_AccountsList tr.frow td{ font-weight:bold; }
#table_AccountsList tr td { padding : 3px; }
#table_AccountsList tr.even { background: #DFDFDF; }
#table_AccountsList tr.odd { background: #FFFFFF; }
@@ -73,9 +75,6 @@
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 });
for( buddy in GTALK_CNF ){
if( !GTALK_CNF.hasOwnProperty(buddy) || buddy == 'general' ) continue;
@@ -98,15 +97,15 @@
addCell( newRow , { html: tmp });
}
- if( TBL.rows.length == 1 ){
+ if( TBL.rows.length == 0 ){
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 });
+ 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>" });
}else{
- var newRow = TBL.insertRow(1);
+ var newRow = TBL.insertRow(0);
newRow.className = 'frow' ;
- addCell( newRow , { html: 'UserName' });
- addCell( newRow , { html: 'Incoming Calls' });
- addCell( newRow , { html: ' Connection ' });
+ addCell( newRow , { html: 'UserName' , align: 'left' });
+ addCell( newRow , { html: 'Incoming Calls', align: 'left' });
+ addCell( newRow , { html: 'Connection' });
addCell( newRow , { html: '' });
}
},
@@ -186,27 +185,28 @@
var TBL = _$('table_AccountsList');
ASTGUI.domActions.clear_table(TBL);
- var newRow = TBL.insertRow(-1);
- newRow.className = 'heading' ;
- addCell( newRow , { html: "<span class='lite_Heading'>gtalk Accounts</span>",align:'center', colspan:2 });
-
for( account in JABBER_CNF ){
if( !JABBER_CNF.hasOwnProperty(account) || account == 'general' ) continue;
-
- ASTGUI.selectbox.append('edit_buddyConnection_select', account , account );
+ ASTGUI.selectbox.append('edit_buddyConnection_select', account , account);
var newRow = TBL.insertRow(-1);
newRow.className = ((TBL.rows.length)%2==1) ? 'odd':'even';
-
- addCell( newRow , { html:JABBER_CNF[account].username + " [" + account + "]" } );
+ addCell( newRow , { html: JABBER_CNF[account].username, align: 'left' });
+ addCell( newRow , { html: account, align: 'left' });
var tmp = "<span class='guiButton' onclick=\"MANAGE_ACCOUNTS.edit_Account_form('" + account +"')\">Edit</span> "
+ "<span class='guiButtonDelete' onclick=\"MANAGE_ACCOUNTS.deleteAccount('" + account +"')\">Delete</span>" ;
- addCell( newRow , { html: tmp });
- }
-
- if( TBL.rows.length == 1 ){
+ addCell( newRow , { html: tmp, align: 'center' });
+ }
+
+ if( TBL.rows.length == 0 ){
var newRow = TBL.insertRow(-1);
- addCell( newRow , { html: "<BR>No google talk accounts configured. <BR> Please click on 'New gtalk Account' button to send and receive calls via your google talk account.<BR><BR>", colspan:2 });
+ addCell( newRow , { html: "<BR>No google talk accounts configured. <BR> Please click on 'New gtalk Account' button to send and receive calls via your google talk account.<BR><BR>"});
+ }else{
+ var newRow = TBL.insertRow(0);
+ newRow.className = 'frow' ;
+ addCell( newRow , { html: 'UserName' , align: 'left' });
+ addCell( newRow , { html: 'Account', align: 'left' });
+ addCell( newRow , { html: '' });
}
},
@@ -272,6 +272,8 @@
};
+
+
var localajaxinit = function(){
top.document.title = 'Google Talk Preferences' ;
GTALK_CNF = config2json({ filename:'gtalk.conf', usf:1 }); // buddies
@@ -307,6 +309,26 @@
v.callActions();
window.location.reload();
}
+ })();
+
+ (function(){
+ var t = [{ url:'#',
+ desc:'Google Talk Accounts',
+ click_function: function(){
+ $('#table_BuddiesList_DIV').hide();
+ $('#table_AccountsList_DIV').show();
+ }
+ },{ url: '#',
+ desc: ' Peers ',
+ click_function: function(){
+ $('#table_BuddiesList_DIV').show();
+ $('#table_AccountsList_DIV').hide();
+ }
+ }];
+
+ ASTGUI.tabbedOptions( _$('tabbedMenu') , t );
+
+ $('#tabbedMenu').find('A:eq(0)').click();
})();
MANAGE_ACCOUNTS.listAccounts();
@@ -320,26 +342,23 @@
Google Talk Settings
<span class='refresh_icon' onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
</div>
- <div class='top_buttons'>
- <span class='guiButtonNew' onclick='MANAGE_BUDDIES.new_buddy_form();'>New Peer</span>
- <span class='guiButtonNew' onclick='MANAGE_ACCOUNTS.new_Account_form();'>New gtalk Account</span>
- <span class='lite_Heading' style='margin-left: 80px'> Google Talk Settings </span>
+
+ <center><div id="tabbedMenu" style="margin-bottom: 0px;"></div></center>
+
+ <div id='table_BuddiesList_DIV' style='margin-left:50px; margin-top: 0px; margin-right: 50px; padding: 0px'>
+ <div style="margin-bottom: 10px; margin-top:0px">
+ <span class='guiButtonNew' onclick='MANAGE_BUDDIES.new_buddy_form();'>New Peer</span>
+ <!--<span class='lite_Heading' style="margin-left: 50px">Peers</span>-->
+ </div>
+ <div><table id='table_BuddiesList' cellpadding=0 cellspacing=0 border=0 align=center></table></div>
</div>
- <!--<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'>
- send or receive calls to your buddies on Google Talk network
+ <div id='table_AccountsList_DIV' style='margin-left:50px; margin-top: 0px; margin-right: 50px; padding: 0px'>
+ <div style="margin-bottom: 10px; margin-top:0px">
+ <span class='guiButtonNew' onclick='MANAGE_ACCOUNTS.new_Account_form();'>New gtalk Account</span>
+ <!--<span class='lite_Heading' style="margin-left: 50px">gtalk Accounts</span>-->
</div>
- </center>-->
- <div>
- <div style='float:left; margin-left:20px; margin-top: 20px; margin-right: 10px; padding: 0px'>
- <table id='table_BuddiesList' cellpadding=0 cellspacing=0 border=0 align=center></table>
- </div>
- <div style='float:right; margin-left:0px; margin-top: 20px; margin-right: 10px; padding: 0px'>
- <table id='table_AccountsList' cellpadding=0 cellspacing=0 border=0 align=center></table>
- </div>
+ <table id='table_AccountsList' cellpadding=0 cellspacing=0 border=0 align=center></table>
</div>
-
-
<div id="buddy_editdiv" STYLE="width:500px; display:none;" class='dialog'>
<TABLE width="100%" cellpadding=0 cellspacing=0>
More information about the asterisk-gui-commits
mailing list