pari: branch pari/dahdi_support r4341 - in /team/pari/dahdi_support: ./ confi...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Wed Dec 10 18:09:33 CST 2008
Author: pari
Date: Wed Dec 10 18:09:33 2008
New Revision: 4341
URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=4341
Log:
Merged revisions 4072,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-4340 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/branches/2.0
........
r4322 | rbrindley | 2008-12-09 14:39:41 -0600 (Tue, 09 Dec 2008) | 1 line
merged HEAD of team/rbrindley/welcome_revamp/ to HEAD of branches/2.0
........
r4323 | rbrindley | 2008-12-09 15:40:02 -0600 (Tue, 09 Dec 2008) | 5 lines
- if extension section 'all' is clicked then other sections are set to false to 'clear' previous settings
- fixed issue where 'all' was searching for '.features.' instead of '.feature'
........
r4324 | rbrindley | 2008-12-09 16:39:17 -0600 (Tue, 09 Dec 2008) | 4 lines
- added cid to addQueueCall func for display purposes
........
r4325 | rbrindley | 2008-12-09 17:21:54 -0600 (Tue, 09 Dec 2008) | 1 line
typo: sessionDate => sessionData
........
r4326 | pari | 2008-12-09 18:47:57 -0600 (Tue, 09 Dec 2008) | 8 lines
Set Title for the main page
Do not load home.html when logged-in
........
r4327 | pari | 2008-12-10 11:26:54 -0600 (Wed, 10 Dec 2008) | 6 lines
Trying some changes in systemCmdWithOutput(),
to see if this is the cause for the errors reported by tiny on #asterisk-gui
........
r4328 | pari | 2008-12-10 11:41:47 -0600 (Wed, 10 Dec 2008) | 5 lines
passing a function to setTimeout() instead of string
........
r4329 | rbrindley | 2008-12-10 11:49:35 -0600 (Wed, 10 Dec 2008) | 1 line
added parkedcalltimeout case to parseOutput's event switchcase
........
r4330 | pari | 2008-12-10 11:53:49 -0600 (Wed, 10 Dec 2008) | 5 lines
moving #legend inside the extensions DIV
........
r4331 | pari | 2008-12-10 11:59:39 -0600 (Wed, 10 Dec 2008) | 4 lines
passing function to setTimeout instead of string
........
r4332 | pari | 2008-12-10 12:18:05 -0600 (Wed, 10 Dec 2008) | 5 lines
=> if context 'directories' is not found in asterisk.conf
........
r4333 | pari | 2008-12-10 12:49:21 -0600 (Wed, 10 Dec 2008) | 5 lines
Log error instead of alert()
........
r4336 | bkruse | 2008-12-10 16:01:55 -0600 (Wed, 10 Dec 2008) | 2 lines
Adding a patch for the ADA product.
........
r4338 | rbrindley | 2008-12-10 17:11:24 -0600 (Wed, 10 Dec 2008) | 4 lines
- fixed issue where legend span was break sections
........
Added:
team/pari/dahdi_support/config/images/agent_busy.png
- copied unchanged from r4338, branches/2.0/config/images/agent_busy.png
team/pari/dahdi_support/config/images/agent_ringing.png
- copied unchanged from r4338, branches/2.0/config/images/agent_ringing.png
team/pari/dahdi_support/config/js/jquery.tablesorter.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.tablesorter.js
team/pari/dahdi_support/config/js/jquery.tablesorter.pager.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.tablesorter.pager.js
team/pari/dahdi_support/config/js/jquery.ui.core.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.ui.core.js
team/pari/dahdi_support/config/js/jquery.ui.draggable.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.ui.draggable.js
team/pari/dahdi_support/config/js/jquery.ui.sortable.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.ui.sortable.js
team/pari/dahdi_support/config/js/jquery.ui.tabs.js
- copied unchanged from r4338, branches/2.0/config/js/jquery.ui.tabs.js
team/pari/dahdi_support/config/js/welcome2.js
- copied unchanged from r4338, branches/2.0/config/js/welcome2.js
team/pari/dahdi_support/config/stylesheets/tables.css
- copied unchanged from r4338, branches/2.0/config/stylesheets/tables.css
team/pari/dahdi_support/config/stylesheets/ui-tabs.css
- copied unchanged from r4338, branches/2.0/config/stylesheets/ui-tabs.css
team/pari/dahdi_support/config/welcome2.html
- copied unchanged from r4338, branches/2.0/config/welcome2.html
Modified:
team/pari/dahdi_support/ (props changed)
team/pari/dahdi_support/config/home.html
team/pari/dahdi_support/config/js/astman.js
team/pari/dahdi_support/config/js/index.js
team/pari/dahdi_support/config/js/pbx.js
team/pari/dahdi_support/config/js/sysinfo.js
team/pari/dahdi_support/config/js/tooltip.js
team/pari/dahdi_support/config/js/welcome.js
team/pari/dahdi_support/config/sysinfo.html
team/pari/dahdi_support/config/users.html
team/pari/dahdi_support/config/welcome.html
Propchange: team/pari/dahdi_support/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/home.html (original)
+++ team/pari/dahdi_support/config/home.html Wed Dec 10 18:09:33 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 = 'welcome.html'; } }catch(err){ }
+ try{ if (a.welcome_redirect == true){ window.location.href = 'welcome2.html'; } }catch(err){ }
};
var localajaxinit = function(){
Modified: team/pari/dahdi_support/config/js/astman.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/astman.js?view=diff&rev=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/astman.js (original)
+++ team/pari/dahdi_support/config/js/astman.js Wed Dec 10 18:09:33 2008
@@ -705,7 +705,7 @@
},
Error: function( msg ){ // ASTGUI.Log.Error();
- if( !top.sessionData || !top.sessionData.DEBUG_WHICH.Error ) return;
+ if( !msg || !top.sessionData || !top.sessionData.DEBUG_WHICH.Error ) return;
if( msg.length <=5 && ASTGUI.errorCodes[msg] ){
this.doLog( '<B>' + ASTGUI.errorCodes[msg] + '</B>' , '#992b23' );
}else{
@@ -1174,10 +1174,8 @@
for(var i = 0; i < lines.length; i++) {
var line = lines[i].trim().toLowerCase();
if (!line || line.beginsWith('host') ){ continue; }
- if( ( line.contains(host) || (this_IP && line.contains(this_IP)) ) && line.contains(uname_lc) ){
- if( line.contains('unregistered') ){
- return '<font color=red>Unregistered</font>';
- }else if( line.contains('registered') ){
+ if( ( line.beginsWith(host+':') || ( this_IP && line.beginsWith(this_IP + ' ') ) ) && line.contains( ' ' + uname_lc + ' ' ) ){
+ if( line.contains(' registered') ){
return '<font color=green>Registered</font>' ;
}else if( line.contains('auth. sent') ){
return '<font color=red>Waiting for Authentication</font>';
@@ -1185,6 +1183,8 @@
return '<font color=red>Request Sent</font>';
}else if( line.contains('rejected') ){
return '<font color=red>Rejected</font>';
+ }else if( line.contains('unregistered') ){
+ return '<font color=red>Unregistered</font>';
}else{
return '<font color=red>Unregistered</font>';
}
@@ -2318,8 +2318,9 @@
var after = function(){
parent.document.getElementById('ajaxstatus').style.display = 'none';
- ASTGUI.loadHTML( tmp_opf , cb );
- ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.guiInstall + tmp_opf, function(){});
+ ASTGUI.loadHTML( tmp_opf , function(cmd_output){
+ ASTGUI.systemCmd( 'rm ' + top.sessionData.directories.guiInstall + tmp_opf, function(){cb(cmd_output);} );
+ });
};
var delay_cb = function(){ setTimeout(after,500); };
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=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/index.js (original)
+++ team/pari/dahdi_support/config/js/index.js Wed Dec 10 18:09:33 2008
@@ -71,7 +71,7 @@
onLogInFunctions.makePings.stop();
top.window.location.replace(top.window.location.href); return true;
}else{
- ASTGUI.Log.Debug('PING Request: Success');
+ ASTGUI.Log.Ajax('PING Request: Success');
}
};
$.ajax({
@@ -231,11 +231,12 @@
setGUI_Paths: function(){
// onLogInFunctions.setGUI_Paths()
- var ASTERISK_CONF = context2json({ filename:'asterisk.conf' , context : 'directories' , usf:1 }) ;
- sessionData.directories.asteriskConfig = ( ASTERISK_CONF.hasOwnProperty('astetcdir') ) ? ASTERISK_CONF.astetcdir : '/etc/asterisk/' ;
- sessionData.directories.astvarlibdir = ( ASTERISK_CONF.hasOwnProperty('astvarlibdir') ) ? ASTERISK_CONF.astvarlibdir : '/var/lib/asterisk/' ;
- sessionData.directories.AGIBIN = ( ASTERISK_CONF.hasOwnProperty('astagidir') ) ? ASTERISK_CONF.astagidir : '/var/lib/asterisk/agi-bin/' ;
- sessionData.directories.astspooldir = ( ASTERISK_CONF.hasOwnProperty('astspooldir') ) ? ASTERISK_CONF.astspooldir : '/var/spool/asterisk/' ;
+ var ASTERISK_CONF = context2json({ filename:'asterisk.conf' , context : 'directories' , usf:1 });
+ if( ASTERISK_CONF === null ){ ASTERISK_CONF = new ASTGUI.customObject ; } // if context 'directories' not found in asterisk.conf
+ sessionData.directories.asteriskConfig = ASTERISK_CONF.getProperty('astetcdir') || '/etc/asterisk/' ;
+ sessionData.directories.astvarlibdir = ASTERISK_CONF.getProperty('astvarlibdir') || '/var/lib/asterisk/' ;
+ sessionData.directories.AGIBIN = ASTERISK_CONF.getProperty('astagidir') || '/var/lib/asterisk/agi-bin/' ;
+ sessionData.directories.astspooldir = ASTERISK_CONF.getProperty('astspooldir') || '/var/spool/asterisk/' ;
if( !sessionData.directories.asteriskConfig.endsWith('/') ){ sessionData.directories.asteriskConfig = sessionData.directories.asteriskConfig + '/' ; }
if( !sessionData.directories.astvarlibdir.endsWith('/') ){ sessionData.directories.astvarlibdir = sessionData.directories.astvarlibdir + '/' ; }
@@ -297,7 +298,7 @@
} , 1000 );
return ; // about to reload
}
- DOM_mainscreen.src = 'home.html';
+ DOM_mainscreen.src = 'blank.html';
setTimeout ( miscFunctions.resizeMainIframe, 1000 );
onLogInFunctions.makePings.start();
@@ -656,7 +657,7 @@
doLogout: function(){
var f = makeSyncRequest({ action :'logoff'});
- top.window.location.reload();
+ top.window.location.replace(top.window.location.href);
}
},
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=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/pbx.js (original)
+++ team/pari/dahdi_support/config/js/pbx.js Wed Dec 10 18:09:33 2008
@@ -2266,6 +2266,7 @@
var localajaxinit = function(){
+ top.document.title = 'Asterisk Configuration' ;
$.getScript( 'js/guiversion.js', function(){
try{
sessionData.gui_version = gui_version ;
Modified: team/pari/dahdi_support/config/js/sysinfo.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/sysinfo.js?view=diff&rev=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/sysinfo.js (original)
+++ team/pari/dahdi_support/config/js/sysinfo.js Wed Dec 10 18:09:33 2008
@@ -48,101 +48,25 @@
};
function getsysinfohtml(){
- ASTGUI.systemCmdWithOutput( 'uname -a' , function(output){ _$('osversion').innerHTML = output; });
- ASTGUI.systemCmdWithOutput( 'uptime' , function(output){ _$('uptime').innerHTML = output.replace(/load average/, "<BR>Load Average"); });
- ASTGUI.systemCmdWithOutput( 'date' , function(output){
- _$('today').innerHTML = (parent.sessionData.PLATFORM.isAA50) ? ASTGUI.toLocalTime(output).camelize() : output ;
- if(parent.sessionData.PLATFORM.isAA50) {
- _$('today').innerHTML += " <A href='date.html' class='splbutton' title='Click to update Date and Time'><B>Edit</B></A>";
- }
- });
- ASTGUI.systemCmdWithOutput( 'hostname' , function(output){
- _$('hostname').innerHTML = output ;
+ ASTGUI.systemCmdWithOutput( 'uname -a' , function(uname){
+ _$('osversion').innerHTML = uname;
+
+ ASTGUI.systemCmdWithOutput( 'uptime' , function(uptime){
+ _$('uptime').innerHTML = uptime.replace(/load average/, "<BR>Load Average");
+
+ ASTGUI.systemCmdWithOutput( 'date' , function(DATE_OUTPUT){
+ _$('today').innerHTML = (parent.sessionData.PLATFORM.isAA50) ? ASTGUI.toLocalTime(DATE_OUTPUT).camelize() : DATE_OUTPUT ;
+ if(parent.sessionData.PLATFORM.isAA50) {
+ _$('today').innerHTML += " <A href='date.html' class='splbutton' title='Click to update Date and Time'><B>Edit</B></A>";
+ }
+
+ ASTGUI.systemCmdWithOutput( 'hostname' , function(HOSTNAME){
+ _$('hostname').innerHTML = HOSTNAME ;
+ });
+ });
+ });
});
_$('asterisk').innerHTML = parent.sessionData.AsteriskVersionString + "<BR>" + "Asterisk GUI-version : " + ( parent.sessionData.gui_version || ASTGUI.globals.version ) ;
$('#tabbedMenu').find('A:eq(0)').click();
}
-
-var localajaxinit = function(){
- top.document.title = 'System Information' ;
- parent.ASTGUI.dialog.waitWhile('Loading system Information ...');
-
- (function(){
- var t = [{ url:'#',
- desc:'General',
- click_function: function(){
- $('.hideall').hide();
- $('#osversion_div').show();
- $('#uptime_div').show();
- $('#asterisk_div').show();
- $('#today_div').show();
- $('#hostname_div').show();
- }
- },{ url: '#',
- desc: 'Network',
- click_function: function(){
- $('.hideall').hide();
- ASTGUI.systemCmdWithOutput( 'ifconfig' , function(output){
- _$('ifconfig').innerHTML = '<pre>' + output +'</pre>' ;
- $('.hideall').hide();
- $('#ifconfig_div').show();
- });
- }
- },{ url: '#',
- desc: 'Disk Usage',
- click_function: function(){
- $('.hideall').hide();
- ASTGUI.systemCmdWithOutput( 'df -k' , function(output){
- _$('diskusage').innerHTML = '<pre>' + output +'</pre>';
- if(parent.sessionData.PLATFORM.isAA50) {
- try{
- percentage_usage(output);
- }catch(err){
- ASTGUI.Log.Debug( '<B>Error Trying to calculate CF usage %');
- }
- }
- $('.hideall').hide();
- $('#df_div').show();
- });
- }
- },{ url: '#',
- desc: 'Memory Usage',
- click_function: function(){
- $('.hideall').hide();
- ASTGUI.systemCmdWithOutput( 'free' , function(free){
- _$('memoryusage').innerHTML = '<pre>' + free +'</pre>';
- $('.hideall').hide();
- $('#memory_div').show();
- });
- }
- }];
- if( parent.sessionData.PLATFORM.isAA50 ) {
- t.push({ url:'#',
- desc:'S800i Config',
- click_function: function(){
- $('.hideall').hide();
- ASTGUI.systemCmdWithOutput( 's800iconfig' , function(output){
- _$('s800i_config').innerHTML = '<PRE>' + output.replace(/S800i Product Configuration/, '') + '</PRE>';
- $('.hideall').hide();
- $('#s800i_div').show();
- });
- }
- });
- t.push({ url:'#',
- desc:'DHCP Leases',
- click_function: function(){
- $('.hideall').hide();
- ASTGUI.systemCmdWithOutput( 'dhcp_dump' , function(output){
- $('#s800i_dhcpClients_output').html('<PRE>' + output + '</PRE>');
- $('.hideall').hide();
- $('#s800i_dhcpClients_div').show();
- });
- }
- });
- }
- ASTGUI.tabbedOptions( _$('tabbedMenu') , t );
- })();
- parent.ASTGUI.dialog.hide();
- getsysinfohtml();
-}
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=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/tooltip.js (original)
+++ team/pari/dahdi_support/config/js/tooltip.js Wed Dec 10 18:09:33 2008
@@ -41,7 +41,7 @@
tooltips['users'] .en[11] = "<B>InterAsterisk eXchange Protocol:</B> Check this option if the User or Phone is using IAX or is an IAX device.";
- tooltips['users'] .en[12] = "<B>Computer Telephony Integration:</B> Check this option if this user is to be permitted Asterisk Manager Interface (AMI) interface access for AMI client applications."; //CTI:
+ tooltips['users'] .en[12] = "<B>ADA/Manager:</B> Check this option if this user is to be permitted Asterisk Manager Interface (AMI) interface access for AMI client applications, or use the Asterisk Desktop Assistant.";
tooltips['users'] .en[13] = "<B>Call Waiting:</B> Check this option if the User or Phone should have Call-Waiting capability.";
Modified: team/pari/dahdi_support/config/js/welcome.js
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/js/welcome.js?view=diff&rev=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/js/welcome.js (original)
+++ team/pari/dahdi_support/config/js/welcome.js Wed Dec 10 18:09:33 2008
@@ -623,11 +623,11 @@
(function(){
if( parent.sessionData.PLATFORM.isAA50 ) {
ASTGUI.systemCmdWithOutput( 'firmware_version' , function(a){
- _$('firmware_div').innerHTML = 'Firmware : v' + a.trim() ;
+ _$('sys_uptime_div').innerHTML = 'Firmware : v' + a.trim() ;
});
}else{
ASTGUI.systemCmdWithOutput( 'uptime' , function(a){
- _$('firmware_div').innerHTML = 'Uptime : ' + a.trim() ;
+ _$('sys_uptime_div').innerHTML = 'Uptime : ' + a.trim() ;
});
}
})();
Modified: team/pari/dahdi_support/config/sysinfo.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/sysinfo.html?view=diff&rev=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/sysinfo.html (original)
+++ team/pari/dahdi_support/config/sysinfo.html Wed Dec 10 18:09:33 2008
@@ -22,6 +22,92 @@
<script src="js/jquery.js"></script>
<script src="js/astman.js"></script>
<script src="js/sysinfo.js"></script>
+<script type="text/javascript">
+var localajaxinit = function(){
+ top.document.title = 'System Information' ;
+ parent.ASTGUI.dialog.waitWhile('Loading system Information ...');
+
+ (function(){
+ var t = [{ url:'#',
+ desc:'General',
+ click_function: function(){
+ $('.hideall').hide();
+ $('#osversion_div').show();
+ $('#uptime_div').show();
+ $('#asterisk_div').show();
+ $('#today_div').show();
+ $('#hostname_div').show();
+ }
+ },{ url: '#',
+ desc: 'Network',
+ click_function: function(){
+ $('.hideall').hide();
+ ASTGUI.systemCmdWithOutput( 'ifconfig' , function(output){
+ _$('ifconfig').innerHTML = '<pre>' + output +'</pre>' ;
+ $('.hideall').hide();
+ $('#ifconfig_div').show();
+ });
+ }
+ },{ url: '#',
+ desc: 'Disk Usage',
+ click_function: function(){
+ $('.hideall').hide();
+ ASTGUI.systemCmdWithOutput( 'df -k' , function(output){
+ _$('diskusage').innerHTML = '<pre>' + output +'</pre>';
+ if(parent.sessionData.PLATFORM.isAA50) {
+ try{
+ percentage_usage(output);
+ }catch(err){
+ ASTGUI.Log.Debug( '<B>Error Trying to calculate CF usage %');
+ }
+ }
+ $('.hideall').hide();
+ $('#df_div').show();
+ });
+ }
+ },{ url: '#',
+ desc: 'Memory Usage',
+ click_function: function(){
+ $('.hideall').hide();
+ ASTGUI.systemCmdWithOutput( 'free' , function(free){
+ _$('memoryusage').innerHTML = '<pre>' + free +'</pre>';
+ $('.hideall').hide();
+ $('#memory_div').show();
+ });
+ }
+ }];
+ if( parent.sessionData.PLATFORM.isAA50 ) {
+ t.push({ url:'#',
+ desc:'S800i Config',
+ click_function: function(){
+ $('.hideall').hide();
+ ASTGUI.systemCmdWithOutput( 's800iconfig' , function(output){
+ _$('s800i_config').innerHTML = '<PRE>' + output.replace(/S800i Product Configuration/, '') + '</PRE>';
+ $('.hideall').hide();
+ $('#s800i_div').show();
+ });
+ }
+ });
+ t.push({ url:'#',
+ desc:'DHCP Leases',
+ click_function: function(){
+ $('.hideall').hide();
+ ASTGUI.systemCmdWithOutput( 'dhcp_dump' , function(output){
+ $('#s800i_dhcpClients_output').html('<PRE>' + output + '</PRE>');
+ $('.hideall').hide();
+ $('#s800i_dhcpClients_div').show();
+ });
+ }
+ });
+ }
+ ASTGUI.tabbedOptions( _$('tabbedMenu') , t );
+ })();
+ parent.ASTGUI.systemCmd( top.sessionData.directories.script_SysInfo, function(){ parent.ASTGUI.dialog.hide(); getsysinfohtml(); } );
+ parent.ASTGUI.dialog.hide();
+ getsysinfohtml();
+}
+</script>
+
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
<style type="text/css">
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=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/users.html (original)
+++ team/pari/dahdi_support/config/users.html Wed Dec 10 18:09:33 2008
@@ -212,23 +212,30 @@
<input type='checkbox' id='edit_3wayCalling'>
<label for='edit_3wayCalling'>3-Way Calling</label>
<img src="images/tooltip_info.gif" tip="en,users,14" class='tooltipinfo'>
-
+
+
<input type='checkbox' id='edit_inDirectory'>
<label for='edit_inDirectory'>In Directory</label>
<img src="images/tooltip_info.gif" tip="en,users,9" class='tooltipinfo'>
-
+
+
<input type='checkbox' id='edit_callWaiting'>
<label for='edit_callWaiting'>Call Waiting</label>
<img src="images/tooltip_info.gif" tip="en,users,13" class='tooltipinfo'>
-
+ <br>
<input type='checkbox' id='edit_cti'>
- <label for='edit_cti'>CTI</label>
+ <label for='edit_cti'>ADA User</label>
<img src="images/tooltip_info.gif" tip="en,users,12" class='tooltipinfo'>
-
+
+
+
<input type='checkbox' id='edit_isagent'>
<label for='edit_isagent'>Is Agent</label>
<img src="images/tooltip_info.gif" tip="en,users,15" class='tooltipinfo'>
-
+
+
+
+
Pickup Group: <select id='edit_pickupgroup'></select>
</TD>
Modified: team/pari/dahdi_support/config/welcome.html
URL: http://svn.digium.com/view/asterisk-gui/team/pari/dahdi_support/config/welcome.html?view=diff&rev=4341&r1=4340&r2=4341
==============================================================================
--- team/pari/dahdi_support/config/welcome.html (original)
+++ team/pari/dahdi_support/config/welcome.html Wed Dec 10 18:09:33 2008
@@ -1,7 +1,7 @@
<!--
* Asterisk-GUI - an Asterisk configuration interface
*
- * System overview
+ * System status
*
* Copyright (C) 2008, Digium, Inc.
*
@@ -18,131 +18,330 @@
* at the top of the source tree.
*
-->
-<script src="js/jquery.js"></script>
-<script src="js/astman.js"></script>
-<script src="js/welcome.js"></script>
+
+<!-- Initial CSS -->
<link href="stylesheets/schwing.css" media="all" rel="Stylesheet" type="text/css" />
<style type="text/css">
- #table_Ext_list {
- border: 1px solid #666666;
- margin-top: 5px;
- margin-bottom:10px;
- width: 96%;
- text-align: left;
- padding : 1px;
- }
-
- #table_Ext_list tr.frow { background: #6b79a5; color: #CED7EF; }
- #table_Ext_list tr.frow td{ font-weight:bold; }
- #table_Ext_list tr td{ padding : 3px; }
- #table_Ext_list tr.even { background: #EFEFEF; }
- #table_Ext_list tr.odd{ background: #FFFFFF; }
- #table_Ext_list tr.even:hover, #table_Ext_list tr.odd:hover {
- background: #a8b6e5;
- cursor: default;
- }
-
-
- #table_Trunks_list {
- border: 1px solid #666666;
- margin-top: 5px;
- margin-bottom:10px;
- width: 96%;
- text-align: left;
- padding : 1px;
- }
- #table_Trunks_list tr.frow { background: #6b79a5; color: #CED7EF; }
- #table_Trunks_list tr.frow td { font-weight:bold; }
- #table_Trunks_list tr td { padding : 3px; }
- #table_Trunks_list tr.even { background: #DFDFDF; }
- #table_Trunks_list tr.odd{ background: #FFFFFF; }
- #table_Trunks_list tr.even:hover, #table_Trunks_list tr.odd:hover { background: #a8b6e5; cursor: default; }
-
-
-
-
-
- #table_NeedConfiguration_list { border: 1px solid #666666; margin-top: 5px; margin-bottom:10px; width: 96%; text-align: left; padding : 1px; }
- #table_NeedConfiguration_list tr.frow { background: #6b79a5; color: #CED7EF; }
- #table_NeedConfiguration_list tr.frow td { font-weight:bold; }
- #table_NeedConfiguration_list tr td { padding : 3px; }
- #table_NeedConfiguration_list tr.even { background: #DFDFDF; }
- #table_NeedConfiguration_list tr.odd{ background: #FFFFFF; }
- #table_NeedConfiguration_list tr.even:hover, #table_NeedConfiguration_list tr.odd:hover { background: #a8b6e5; cursor: default; }
+body {
+ background-color: #EFEFEF;
+}
+
+#sys_uptime_div, #ast_uptime_div {
+ width: 100%;
+ text-align:center;
+}
+
+div.section_title {
+ width: 100%;
+ text-align: center;
+ margin-top: 10px;
+ font-weight: bold;
+}
+
+#table_Ext_list {
+ border: 1px solid #666666;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ width: 96%;
+ text-align: left;
+ padding : 1px;
+}
+
+#table_Ext_list tr.frow {
+ background: #6b79a5;
+ color: #CED7EF;
+}
+
+#table_Ext_list tr.frow td {
+ font-weight: bold;
+}
+
+#table_Ext_list tr td {
+ padding: 3px;
+}
+
+#table_Ext_list tr.even {
+ background: #EFEFEF;
+}
+
+#table_Ext_list tr.odd {
+ background: #FFFFFF;
+}
+
+#table_Ext_list tr.even:hover, #table_Ext_list tr.odd:hover {
+ background: #a8b6e5;
+ cursor: default;
+}
+
+#trunks_list_container {
+ overflow: auto;
+ width: 95%;
+ max-height: 500px;
+}
+
+#table_Trunks_list {
+ border: 1px solid #666666;
+ margin-top: 5px;
+ margin-bottom:10px;
+ width: 96%;
+ text-align: left;
+ padding : 1px;
+}
+
+#table_Trunks_list tr.frow {
+ background: #6b79a5;
+ color: #CED7EF;
+}
+
+#table_Trunks_list tr.frow td {
+ font-weight:bold;
+}
+
+#table_Trunks_list tr td {
+ padding: 3px;
+}
+
+#table_Trunks_list tr.even {
+ background: #DFDFDF;
+}
+
+#table_Trunks_list tr.odd {
+ background: #FFFFFF;
+}
+
+#table_Trunks_list tr.even:hover, #table_Trunks_list tr.odd:hover {
+ background: #a8b6e5;
+ cursor: default;
+}
+
+#table_Agents_list_container {
+ overflow: auto;
+ width: 95%;
+ max-height: 500px;
+ margin-top: 10px;
+ display: none;
+}
+
+table.agents_list_container {
+ margin-left: auto;
+ margin-right: auto;
+ border-width: 1px;
+ border-spacing: 2px;
+ border-style: solid;
+ border-color: #6b79a5;
+ border-collapse: separate;
+ background-color: white;
+}
+
+table.agents_list_container td.agent_title {
+ text-align: center;
+ vertical-align: top;
+ width: 70px;
+ font-weight: bold;
+}
+
+#table_Meetmes_list_container {
+ overflow: auto;
+ width: 95%;
+ max-height: 500px;
+ margin-top: 10px;
+}
+
+#table_Meetmes_list_container table.meetme_list_table {
+ border-width: 1px;
+ border-spacing: 2px;
+ border-style: solid;
+ border-color: #6b79a5;
+ border-collapse: separate;
+ background-color: #FFFFFF;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#table_Meetmes_list_container table tr td {
+ text-align: center;
+}
+
+#table_Meetmes_list_container table tr.titles td {
+ vertical-align: top;
+ font-weight: bold;
+}
+
+#table_Meetmes_list_container table tr td.mid_spacing {
+ width: 150px;
+}
+
+#table_Meetmes_list_container table tr td.end_spacing {
+ width: 50px;
+}
+
+#extensions_container {
+ width: 100%;
+ text-align: center;
+ margin-top: 15px;
+}
+
+#extensions_legend {
+ margin-left: auto;
+ margin-right: auto;
+ text-align: center;
+ width: 500px;
+}
+
+#extensions_legend tr td {
+}
+
+#table_Ext_list_container {
+ overflow: auto;
+ width: 95%;
+ max-height: 500px;
+}
+
+#table_Ext_list {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+#table_Meetmes_list, #table_ParkedCalls_list {
+ text-align: center;
+}
+
+#ittnc {
+ display: none;
+}
+
+#ittnc_title {
+ width: 100%;
+ text-align: center;
+ margin-top: 10px;
+ font-weight: bold;
+}
+
+#table_NeedConfiguation_list_container {
+ overflow: auto;
+ width: 95%;
+ max-height: 500px;
+}
+
+#table_NeedConfiguration_list {
+ border: 1px solid #666666;
+ margin-top: 5px;
+ margin-bottom: 10px;
+ width: 96%;
+ text-align: center;
+ padding: 1px;
+}
+
+#table_NeedConfiguration_list tr.frow {
+ background: #6b79a5;
+ color: #CED7EF;
+}
+
+#table_NeedConfiguration_list tr.frow td {
+ font-weight:bold;
+}
+
+#table_NeedConfiguration_list tr td {
+ padding: 3px;
+}
+
+#table_NeedConfiguration_list tr.even {
+ background: #DFDFDF;
+}
+
+#table_NeedConfiguration_list tr.odd {
+ background: #FFFFFF;
+}
+
+#table_NeedConfiguration_list tr.even:hover, #table_NeedConfiguration_list tr.odd:hover {
+ background: #a8b6e5;
+ cursor: default;
+}
</style>
-
-<body bgcolor="EFEFEF">
-<div class="iframeTitleBar">
- System Status
- <span class='refresh_icon' onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
-</div>
-
- <div class='lite_Heading'>System Status</div>
- <div style='width: 100%; text-align:center;' id='firmware_div'></div>
-
-
- <div style='width:100%; text-align:center; margin-top:10px;'><B>Trunks</B></div>
- <div style='overflow:auto; width:95%; max-height: 500px; '>
- <table id='table_Trunks_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
- </div>
-
-
- <div style='overflow:auto; width:95%; max-height: 500px;margin-top:10px; display:none;' id='table_Agents_list_container'>
- <table cellpadding=1 cellspacing=2 border=0 align=center style="border-width: 1px ; border-spacing: 2px; border-style: solid; border-color: #6b79a5; border-collapse: separate; background-color: white;">
- <td valign='top' align=center width='70'><B>Agents</B></td>
- <td align=center>
- <table id='table_Agents_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
+<!-- End Initial CSS -->
+
+<!-- Initial Javascript -->
+<script type="text/javascript" src="js/jquery.js"></script>
+<script type="text/javascript" src="js/astman.js"></script>
+<script type="text/javascript" src="js/welcome.js"></script>
+<!-- End Initial Javascript -->
+
+<body>
+ <div class="iframeTitleBar">
+ System Status
+ <span class='refresh_icon' onclick="window.location.reload();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span>
+ </div>
+
+ <div class="lite_Heading">System Status</div>
+
+ <div id="sys_uptime_div"></div>
+ <div id="ast_uptime_div"></div>
+
+ <div class="section_title"> Trunks </div>
+
+ <div id="trunks_list_container">
+ <table id="table_Trunks_list" cellpadding="0" cellspacing="0" border="0" align="center"></table>
+ </div>
+
+ <div id="table_Agents_list_container">
+ <table class="agents_list_container" cellpadding="1" cellspacing="2" border="0">
+ <td class="agent_title">Agents</td>
+ <td align="center">
+ <table id="table_Agents_list" cellpadding="0" cellspacing="0" border="0" align="center"></table>
</td>
</table>
-
- </div>
-
- <div style='overflow:auto; width:95%; max-height: 500px;margin-top:10px;' id='table_Meetmes_list_container'>
- <table cellpadding=1 cellspacing=2 border=0 align=center style="border-width: 1px ; border-spacing: 2px; border-style: solid; border-color: #6b79a5; border-collapse: separate; background-color: white;">
- <tr>
- <td valign='top' align=center><B>Conference Rooms</B> <span class='refresh_icon' onclick="update_Conferences_Table();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span></td>
- <td width=150></td>
- <td valign='top' align=center><B>Parked Calls</B> <span class='refresh_icon' onclick="update_parkedCalls_Table();" > <img src="images/refresh.png" title=" Refresh " border=0 > </span></td>
- <td width=50></td>
+ </div>
+
+ <div id="table_Meetmes_list_container">
+ <table class="meetme_list_table" cellpadding="1" cellspacing="2" border="0">
+ <tr class="titles">
+ <td>
+ Conference Rooms <span class="refresh_icon" onclick="update_Conferences_Table();" > <img src="images/refresh.png" title=" Refresh " border="0" > </span>
+ </td>
+ <td class="mid_spacing"></td>
+ <td>
+ Parked Calls <span class="refresh_icon" onclick="update_parkedCalls_Table();" > <img src="images/refresh.png" title=" Refresh " border="0" > </span>
+ </td>
+ <td class="end_spacing"></td>
</tr>
<tr>
- <td align=center>
- <table id='table_Meetmes_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
+ <td>
+ <table id="table_Meetmes_list" cellpadding="0" cellspacing="0" border="0"></table>
</td>
- <td width=150></td>
- <td align=center>
- <table id='table_ParkedCalls_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
+ <td></td>
+ <td>
+ <table id="table_ParkedCalls_list" cellpadding="0" cellspacing="0" border="0"></table>
</td>
- <td width=50></td>
+ <td></td>
</tr>
</table>
</div>
- <div style='width:100%; text-align:center; margin-top:15px;'>
+ <div id="extensions_container">
<B>Extensions</B>
<BR>
- <table cellpadding=0 cellspacing=0 border=0 align=center width=500 align=center>
+ <table id="extensions_legend" cellpadding="0" cellspacing="0" border="0">
<tr>
- <td align=center><img src='images/status_green.png' border=0> Free</td>
- <td align=center><img src='images/status_red.png' border=0> Busy</td>
- <td align=center><img src='images/status_gray.png' border=0> UnAvailable</td>
- <td align=center><img src='images/status_orange.png' border=0> Ringing</td>
+ <td><img src="images/status_green.png" border="0"> Free</td>
+ <td><img src="images/status_red.png" border="0"> Busy</td>
+ <td><img src="images/status_gray.png" border="0"> UnAvailable</td>
+ <td><img src="images/status_orange.png" border="0"> Ringing</td>
</tr>
</table>
</div>
- <div style='overflow:auto; width:95%; max-height: 500px;'>
- <table id='table_Ext_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
- </div>
-
-
- <div id='ittnc' style='display:none;'>
- <div style='width:100%; text-align:center; margin-top:10px;'><B>Items that need configuration</B></div>
- <div style='overflow:auto; width:95%; max-height: 500px;'>
- <table id='table_NeedConfiguration_list' cellpadding=0 cellspacing=0 border=0 align=center></table>
+
+ <div id="table_Ext_list_container">
+ <table id="table_Ext_list" cellpadding="0" cellspacing="0" border="0"></table>
+ </div>
+
+ <div id="ittnc">
+ <div id="ittnc_title">Items that need configuration</div>
+ <div id="table_NeedConfiguration_list_container">
+ <table id="table_NeedConfiguration_list" cellpadding="0" cellspacing="0" border="0"></table>
</div>
</div>
- <div id='waitevent_Log'></div>
+ <div id="waitevent_Log"></div>
</body>
More information about the asterisk-gui-commits
mailing list