pari: branch asterisknow r606 - in /branches: aadk/ aadk/config/scripts/ aste...

[asterisk-gui-commits at lists.digium.com]

Author: pari
Date: Wed Apr  4 09:56:07 2007
New Revision: 606

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=606
Log:
Merging 605 into aadk, asteriskNow

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/scripts/astman.js
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/scripts/astman.js

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr  4 09:56:07 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588
+/trunk:1-430,433-448,501,505,512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588,605

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=606&r1=605&r2=606
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Wed Apr  4 09:56:07 2007
@@ -32,6 +32,8 @@
 var asterisk_guiNetworkSettings = "sh /etc/asterisk/scripts/networking.sh";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_rawmanPath = "../../rawman" ;
+var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
+var asterisk_configfolder = "/etc/asterisk/";
 
 var sortbynames = false;
 var dragdata = new Object;

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr  4 09:56:07 2007
@@ -1,1 +1,1 @@
-/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588
+/trunk:1-448,501-505,507,511-512,519,532,536,538,543,545,547,549,551,553,555,561,563,567-568,570,572,588,591-605

Modified: branches/asterisknow/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/scripts/astman.js?view=diff&rev=606&r1=605&r2=606
==============================================================================
--- branches/asterisknow/config/scripts/astman.js (original)
+++ branches/asterisknow/config/scripts/astman.js Wed Apr  4 09:56:07 2007
@@ -31,6 +31,8 @@
 var asterisk_guiSysInfo_output = "./sysinfo_output.html";
 var asterisk_guiZapscan = "/sbin/zapscan.bin" ;
 var asterisk_rawmanPath = "../../rawman" ;
+var asterisk_guiConfigFile = "guipreferences.conf"; // will be created in asterisk_configfolder, if the file does not exist 
+var asterisk_configfolder = "/etc/asterisk/";
 
 var sortbynames = false;
 var dragdata = new Object;