pari: branch asterisknow r794 - in /branches: aadk/ aadk/config/ asterisknow/...

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

Author: pari
Date: Thu Apr 26 18:46:04 2007
New Revision: 794

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=794
Log:
Merged revisions 793 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r793 | pari | 2007-04-26 18:44:45 -0500 (Thu, 26 Apr 2007) | 1 line

reverting commit [2] in 781 
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/trunks.html
    branches/asterisknow/   (props changed)
    branches/asterisknow/config/trunks.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 18:46:04 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-790
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-793

Modified: branches/aadk/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/trunks.html?view=diff&rev=794&r1=793&r2=794
==============================================================================
--- branches/aadk/config/trunks.html (original)
+++ branches/aadk/config/trunks.html Thu Apr 26 18:46:04 2007
@@ -423,8 +423,7 @@
 	_$('customvoip_protocol').selectedIndex = 0;
 	_$('customvoip_host').value ="";
 	_$('analog').style.display="none";
-	_$('voip').style.display="";
-	_$('voip').style.height =350;
+	_$('voip').style.display="none";
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 26 18:46:04 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-790
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-793

Modified: branches/asterisknow/config/trunks.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/trunks.html?view=diff&rev=794&r1=793&r2=794
==============================================================================
--- branches/asterisknow/config/trunks.html (original)
+++ branches/asterisknow/config/trunks.html Thu Apr 26 18:46:04 2007
@@ -423,8 +423,7 @@
 	_$('customvoip_protocol').selectedIndex = 0;
 	_$('customvoip_host').value ="";
 	_$('analog').style.display="none";
-	_$('voip').style.display="";
-	_$('voip').style.height =350;
+	_$('voip').style.display="none";
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;