rbrindley: branch rbrindley/astman_revamp r4567 - /team/rbrindley/astman_reva...
SVN commits to the Asterisk-GUI project
asterisk-gui-commits at lists.digium.com
Thu Mar 5 08:05:12 CST 2009
Author: rbrindley
Date: Thu Mar 5 08:05:09 2009
New Revision: 4567
URL: http://svn.digium.com/svn-view/asterisk-gui?view=rev&rev=4567
Log:
- transitioned all js files alphabetically from astman.js to index.js to use top.log instead of ASTGUI.Log
Modified:
team/rbrindley/astman_revamp/config/js/backup.js
team/rbrindley/astman_revamp/config/js/bulkadd.js
team/rbrindley/astman_revamp/config/js/dialplans.js
team/rbrindley/astman_revamp/config/js/flashupdate.js
team/rbrindley/astman_revamp/config/js/hardware.js
team/rbrindley/astman_revamp/config/js/hardware_aa50.js
team/rbrindley/astman_revamp/config/js/hardware_dahdi.js
team/rbrindley/astman_revamp/config/js/incoming.js
Modified: team/rbrindley/astman_revamp/config/js/backup.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/backup.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/backup.js (original)
+++ team/rbrindley/astman_revamp/config/js/backup.js Thu Mar 5 08:05:09 2009
@@ -40,7 +40,7 @@
return;
}
if(!top.sessionData.httpConf.postmappings_defined || !top.sessionData.httpConf.uploadPaths['backups'] ){
- ASTGUI.Log.Error('AG102');
+ top.log.error('AG102');
$('#uploadForm_container').hide();
return ;
}
Modified: team/rbrindley/astman_revamp/config/js/bulkadd.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/bulkadd.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/bulkadd.js (original)
+++ team/rbrindley/astman_revamp/config/js/bulkadd.js Thu Mar 5 08:05:09 2009
@@ -121,7 +121,7 @@
}
newusers_list.push(tmp_nu);
- ASTGUI.Log.Debug( 'adding user ' + tmp_nu);
+ top.log.debug( 'adding user ' + tmp_nu);
NEW_USERS[ tmp_nu ] = {} ;
NEW_USERS[ tmp_nu ]['fullname'] = 'User ' + tmp_nu;
NEW_USERS[ tmp_nu ]['cid_number'] = tmp_nu;
Modified: team/rbrindley/astman_revamp/config/js/dialplans.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/dialplans.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/dialplans.js (original)
+++ team/rbrindley/astman_revamp/config/js/dialplans.js Thu Mar 5 08:05:09 2009
@@ -168,7 +168,7 @@
}
}
}catch(err){
- ASTGUI.Log.Error(err.description);
+ top.log.error(err.description);
}
addCell( newRow , { html: dr_woPfx.join(', ') } );
Modified: team/rbrindley/astman_revamp/config/js/flashupdate.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/flashupdate.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/flashupdate.js (original)
+++ team/rbrindley/astman_revamp/config/js/flashupdate.js Thu Mar 5 08:05:09 2009
@@ -229,7 +229,7 @@
var onUploadForm_load = function(){
if(!top.sessionData.httpConf.postmappings_defined || !top.sessionData.httpConf.uploadPaths['backups'] ){
- ASTGUI.Log.Error('AG102');
+ top.log.error('AG102');
$('#uploadForm_container').hide();
return ;
}
Modified: team/rbrindley/astman_revamp/config/js/hardware.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/hardware.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/hardware.js (original)
+++ team/rbrindley/astman_revamp/config/js/hardware.js Thu Mar 5 08:05:09 2009
@@ -130,14 +130,14 @@
if(configured_devices.length == detected_devices.length){
for(var l=0; l < configured_devices.length; l++){
if(configured_devices[l] != detected_devices[l]){ // devices does not match - but the number of devices match
- ASTGUI.Log.Debug("DEVICES or basechans does not MATCHED");
+ top.log.debug("DEVICES or basechans does not MATCHED");
return true;
}
}
- ASTGUI.Log.Debug("DEVICES and basechans MATCH");
+ top.log.debug("DEVICES and basechans MATCH");
return false;
}else{
- ASTGUI.Log.Debug("DEVICES or basechans does not MATCHED");
+ top.log.debug("DEVICES or basechans does not MATCHED");
return true;
}
}
@@ -343,7 +343,7 @@
// check if the channels in zapchan are within max and min
// if yes then set the current range values
load_hwcfgfile: function(){ // read hwcfgfile (if exists) into CONFIGUREDHARDWARE
- ASTGUI.Log.Debug("load last configured hardware information, start function: loadConfigFiles.load_hwcfgfile()");
+ top.log.debug("load last configured hardware information, start function: loadConfigFiles.load_hwcfgfile()");
var n = config2json({filename:hwcfgfile, usf:1});
if( n.getOwnProperties().length == 0 ){ // if file not found or no previous hardware detected
hwchanged = -1;
@@ -359,22 +359,22 @@
}}
loadConfigFiles.runZtscan();
}
- ASTGUI.Log.Debug("end of function: loadConfigFiles.load_hwcfgfile()");
+ top.log.debug("end of function: loadConfigFiles.load_hwcfgfile()");
},
runZtscan: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.runZtscan()");
+ top.log.debug("start function: loadConfigFiles.runZtscan()");
ASTGUI.miscFunctions.createConfig( 'applyzap.conf', function(){
parent.ASTGUI.systemCmd( top.sessionData.directories.app_Ztscan , function(){ // run ztscan and then try loading ztscan.conf
window.setTimeout( loadConfigFiles.readZtscanConf , 700 ); // leave some time for ztscan to generate ztscan.conf
});
- ASTGUI.Log.Debug("end of function: loadConfigFiles.runZtscan()");
+ top.log.debug("end of function: loadConfigFiles.runZtscan()");
});
},
readZtscanConf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.readZtscanConf()");
+ top.log.debug("start function: loadConfigFiles.readZtscanConf()");
var ztsc = $.ajax({ url: ASTGUI.paths.rawman+'?action=getconfig&filename=ztscan.conf', async: false }).responseText;
var ztsc_Lower = ztsc.toLowerCase();
if( ztsc_Lower.contains('response: error') && ztsc_Lower.contains('message: config file not found') ){
@@ -439,12 +439,12 @@
}}
}}
if(hwchanged != -1){ hwchanged = detectHwChanges(); }
- ASTGUI.Log.Debug("end of function: loadConfigFiles.readZtscanConf()");
+ top.log.debug("end of function: loadConfigFiles.readZtscanConf()");
loadConfigFiles.readUsersConf(); // read span_x (where T1/E1 trunks are defined)
},
readUsersConf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.readUsersConf()");
+ top.log.debug("start function: loadConfigFiles.readUsersConf()");
var usrs = $.ajax({ url: ASTGUI.paths.rawman+'?action=getconfig&filename=users.conf', async: false }).responseText;
var usrs_Lower = usrs.toLowerCase();
@@ -513,12 +513,12 @@
}
}}
})();
- ASTGUI.Log.Debug("end of function: loadConfigFiles.readUsersConf()");
+ top.log.debug("end of function: loadConfigFiles.readUsersConf()");
showtable();
},
load_zaptel_conf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.load_zaptel_conf()");
+ top.log.debug("start function: loadConfigFiles.load_zaptel_conf()");
// we parse zaptel.conf to get the loadzone and syncsrc for each span
var tmp_file = ASTGUI.globals.zaptelIncludeFile;
var parseZaptelconf = function(zp){
@@ -572,7 +572,7 @@
parseZaptelconf(q);
}
}
- ASTGUI.Log.Debug("end of function: loadConfigFiles.load_zaptel_conf()");
+ top.log.debug("end of function: loadConfigFiles.load_zaptel_conf()");
}
};
@@ -1031,7 +1031,7 @@
var localajaxinit = function(){
- ASTGUI.Log.Debug("Starting Loading Page digital.html .. start function: window.onload()");
+ top.log.debug("Starting Loading Page digital.html .. start function: window.onload()");
portsSignalling = ASTGUI.cloneObject(parent.sessionData.PORTS_SIGNALLING);
ASTGUI.domActions.enableDisableByCheckBox ('enable_disable_checkbox_opermode', 'opermode') ;
@@ -1119,7 +1119,7 @@
ASTGUI.events.add( _$('edit_DefinedChans'), "change", edit_DefinedChans_changed );
- ASTGUI.Log.Debug("end of function: window.onload()");
+ top.log.debug("end of function: window.onload()");
(function(){ // load modprobe settings
var c = context2json ({ filename: ASTGUI.globals.configfile , context: 'general', usf: 1 });
Modified: team/rbrindley/astman_revamp/config/js/hardware_aa50.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/hardware_aa50.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/hardware_aa50.js (original)
+++ team/rbrindley/astman_revamp/config/js/hardware_aa50.js Thu Mar 5 08:05:09 2009
@@ -198,11 +198,11 @@
var localajaxinit = function(){
- ASTGUI.Log.Debug("Starting Loading Page hardware_aa50.html .. start function: window.onload()");
+ top.log.debug("Starting Loading Page hardware_aa50.html .. start function: window.onload()");
ASTGUI.dialog.waitWhile('Detecting Hardware ...');
top.document.title = "Analog Hardware Setup & Configuration";
load_currentAnalogSettings();
- ASTGUI.Log.Debug("end of function: window.onload()");
+ top.log.debug("end of function: window.onload()");
};
@@ -326,7 +326,7 @@
parseZaptelconf(q);
}
}
- ASTGUI.Log.Debug("end of function: loadConfigFiles.load_zaptel_conf()");
+ top.log.debug("end of function: loadConfigFiles.load_zaptel_conf()");
})();
(function(){ // load modprobe settings
Modified: team/rbrindley/astman_revamp/config/js/hardware_dahdi.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/hardware_dahdi.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/hardware_dahdi.js (original)
+++ team/rbrindley/astman_revamp/config/js/hardware_dahdi.js Thu Mar 5 08:05:09 2009
@@ -130,14 +130,14 @@
if(configured_devices.length == detected_devices.length){
for(var l=0; l < configured_devices.length; l++){
if(configured_devices[l] != detected_devices[l]){ // devices does not match - but the number of devices match
- ASTGUI.Log.Debug("DEVICES or basechans does not MATCHED");
+ top.log.debug("DEVICES or basechans does not MATCHED");
return true;
}
}
- ASTGUI.Log.Debug("DEVICES and basechans MATCH");
+ top.log.debug("DEVICES and basechans MATCH");
return false;
}else{
- ASTGUI.Log.Debug("DEVICES or basechans does not MATCHED");
+ top.log.debug("DEVICES or basechans does not MATCHED");
return true;
}
};
@@ -374,7 +374,7 @@
// check if the channels in zapchan are within max and min
// if yes then set the current range values
load_hwcfgfile: function(){ // read hwcfgfile (if exists) into CONFIGUREDHARDWARE
- ASTGUI.Log.Debug("load last configured hardware information, start function: loadConfigFiles.load_hwcfgfile()");
+ top.log.debug("load last configured hardware information, start function: loadConfigFiles.load_hwcfgfile()");
var n = config2json({filename:hwcfgfile, usf:1});
if( n.getOwnProperties().length == 0 ){ // if file not found or no previous hardware detected
hwchanged = -1;
@@ -390,23 +390,23 @@
}}
loadConfigFiles.run_detectdahdi();
}
- ASTGUI.Log.Debug("end of function: loadConfigFiles.load_hwcfgfile()");
+ top.log.debug("end of function: loadConfigFiles.load_hwcfgfile()");
},
run_detectdahdi: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.run_detectdahdi()");
+ top.log.debug("start function: loadConfigFiles.run_detectdahdi()");
ASTGUI.miscFunctions.createConfig( 'applyzap.conf', function(){
parent.ASTGUI.systemCmd( top.sessionData.directories.app_DahdiScan , function(){ // run ztscan and then try loading ztscan.conf
window.setTimeout( loadConfigFiles.read_DahdiScanConf , 700 ); // leave some time for ztscan to generate ztscan.conf
});
- ASTGUI.Log.Debug("end of function: loadConfigFiles.run_detectdahdi()");
+ top.log.debug("end of function: loadConfigFiles.run_detectdahdi()");
});
},
//readZtscanConf: function(){
read_DahdiScanConf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.read_DahdiScanConf()");
+ top.log.debug("start function: loadConfigFiles.read_DahdiScanConf()");
var ztsc = $.ajax({ url: ASTGUI.paths.rawman+'?action=getconfig&filename=' + ASTGUI.globals.dahdiScanOutput , async: false }).responseText;
var ztsc_Lower = ztsc.toLowerCase();
if( ztsc_Lower.contains('response: error') && ztsc_Lower.contains('message: config file not found') ){
@@ -486,12 +486,12 @@
}}
}}
if(hwchanged != -1){ hwchanged = detectHwChanges(); }
- ASTGUI.Log.Debug("end of function: loadConfigFiles.read_DahdiScanConf()");
+ top.log.debug("end of function: loadConfigFiles.read_DahdiScanConf()");
loadConfigFiles.readUsersConf(); // read span_x (where T1/E1 trunks are defined)
},
readUsersConf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.readUsersConf()");
+ top.log.debug("start function: loadConfigFiles.readUsersConf()");
var usrs = $.ajax({ url: ASTGUI.paths.rawman+'?action=getconfig&filename=users.conf', async: false }).responseText;
var usrs_Lower = usrs.toLowerCase();
@@ -564,12 +564,12 @@
}
}}
})();
- ASTGUI.Log.Debug("end of function: loadConfigFiles.readUsersConf()");
+ top.log.debug("end of function: loadConfigFiles.readUsersConf()");
showtable();
},
load_zaptel_conf: function(){
- ASTGUI.Log.Debug("start function: loadConfigFiles.load_zaptel_conf()");
+ top.log.debug("start function: loadConfigFiles.load_zaptel_conf()");
// we parse zaptel.conf to get the loadzone and syncsrc for each span
var tmp_file = ASTGUI.globals.dahdiIncludeFile ;
var parseZaptelconf = function(zp){
@@ -616,7 +616,7 @@
parseZaptelconf(q);
}
}
- ASTGUI.Log.Debug("end of function: loadConfigFiles.load_zaptel_conf()");
+ top.log.debug("end of function: loadConfigFiles.load_zaptel_conf()");
}
};
@@ -959,7 +959,7 @@
var localajaxinit = function(){
- ASTGUI.Log.Debug("Starting Loading Page digital.html .. start function: window.onload()");
+ top.log.debug("Starting Loading Page digital.html .. start function: window.onload()");
portsSignalling = ASTGUI.cloneObject(parent.sessionData.PORTS_SIGNALLING);
ASTGUI.dialog.waitWhile('Detecting Analog/Digital Hardware ...');
@@ -1008,7 +1008,7 @@
}
ASTGUI.events.add( _$('edit_DefinedChans'), "change", edit_DefinedChans_changed );
- ASTGUI.Log.Debug("end of function: window.onload()");
+ top.log.debug("end of function: window.onload()");
loadConfigFiles.load_hwcfgfile(); // try to load last detected/configured hardware information
};
Modified: team/rbrindley/astman_revamp/config/js/incoming.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/astman_revamp/config/js/incoming.js?view=diff&rev=4567&r1=4566&r2=4567
==============================================================================
--- team/rbrindley/astman_revamp/config/js/incoming.js (original)
+++ team/rbrindley/astman_revamp/config/js/incoming.js Thu Mar 5 08:05:09 2009
@@ -358,7 +358,7 @@
}
if( isNewIR == true ){ // create new Incoming Rule
- ASTGUI.Log.Debug("create New Incoming Rule");
+ top.log.debug("create New Incoming Rule");
parent.ASTGUI.dialog.waitWhile('Creating Incoming Rule ...');
if( ASTGUI.getFieldValue('edit_itrl_dest') == 'ByDID' ){
@@ -383,7 +383,7 @@
var TMP_MYCALLBACK = function(){
if( !EX_CF.hasOwnProperty( thisRule_context ) ){
- ASTGUI.Log.Debug("creating [time interval did context]");
+ top.log.debug("creating [time interval did context]");
x.new_action ( 'newcat', thisRule_context , '' , '' );
}
@@ -394,7 +394,7 @@
x.new_action( 'append', thisRule_context, 'exten', ASTGUI.globals.sbcid_2 );
x.new_action( 'append', thisRule_context, 'exten', this_ActualRule );
}else{
- ASTGUI.Log.Debug("NewRule is exten=" + this_ActualRule + 'in context [' + thisRule_context + ']');
+ top.log.debug("NewRule is exten=" + this_ActualRule + 'in context [' + thisRule_context + ']');
x.new_action( 'append', thisRule_context, 'exten', this_ActualRule );
}
@@ -406,10 +406,10 @@
};
if( PREVIOUS.contains(NEWTF_INCLUDE_STR) ){
- ASTGUI.Log.Debug("No need to include time interval did context in DID_trunk_x");
+ top.log.debug("No need to include time interval did context in DID_trunk_x");
TMP_MYCALLBACK();
}else{
- ASTGUI.Log.Debug("adding 'include = time interval did context' in [DID_trunk_x]");
+ top.log.debug("adding 'include = time interval did context' in [DID_trunk_x]");
PREVIOUS.splice(0,0,NEWTF_INCLUDE_STR);
ASTGUI.miscFunctions.empty_context({ filename: 'extensions.conf', context : ASTGUI.contexts.TrunkDIDPrefix + this_trunk, cb : function(){
PREVIOUS.each( function( this_newPreviousLine ){
More information about the asterisk-gui-commits
mailing list