pari: branch asterisknow r849 - in /branches: aadk/config/setup/ asterisknow/...

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

Author: pari
Date: Wed May  2 13:02:31 2007
New Revision: 849

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=849
Log:
merging 848

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

Modified: branches/aadk/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/4.html?view=diff&rev=849&r1=848&r2=849
==============================================================================
--- branches/aadk/config/setup/4.html (original)
+++ branches/aadk/config/setup/4.html Wed May  2 13:02:31 2007
@@ -94,8 +94,16 @@
 
 providercallbacks.postselect = function() {
 	var _pl = _$('providerlink') ;
+	var f = _$('provider');
+
 	try{
-		var f = _$('provider');
+		_$('providerlogo').style.display = "";
+		_$('providerlogo').setAttribute( "src" , "../" + f.stored_config.catbyname[f.value].fieldbyname['providerlogo'] );
+	}catch(err){
+		_$('providerlogo').style.display = "none";
+	}
+
+	try{
 		var g = f.stored_config.catbyname[f.value].fieldbyname['regurl'] ;
 		_pl.href= ( g ) ? g :'#' ;
 		_pl.target = ( g ) ? '_blank' : '';
@@ -1032,7 +1040,7 @@
 	<tr>	<td style='width:80px' valign='top' class="field_text">Provider:</td>
 		<td><select id='provider' class="input9"></select></td>
 	</tr>
-	<tr><td colspan='2' align='center'><A href="#" id="providerlink"><img id='providerlogo' style='visibility:hidden;' border=0></A></td></tr>
+	<tr><td colspan='2' align='center'><A href="#" id="providerlink"><img id='providerlogo' style='display:none' border=0></A></td></tr>
 	<tr><td colspan='2' align='center'><div id='providerdesc' align='left' style='width:230px; font-size:10px'></div></td></tr>
 	<tr>
 		<td class="field_text">Username:</td>

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May  2 13:02:31 2007
@@ -1,1 +1,1 @@
-/trunk:1-449,489-540,542-557,559,561-577,580-586,588-841
+/trunk:1-449,489-540,542-557,559,561-577,580-586,588-848

Modified: branches/asterisknow/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/config/setup/4.html?view=diff&rev=849&r1=848&r2=849
==============================================================================
--- branches/asterisknow/config/setup/4.html (original)
+++ branches/asterisknow/config/setup/4.html Wed May  2 13:02:31 2007
@@ -94,8 +94,16 @@
 
 providercallbacks.postselect = function() {
 	var _pl = _$('providerlink') ;
+	var f = _$('provider');
+
 	try{
-		var f = _$('provider');
+		_$('providerlogo').style.display = "";
+		_$('providerlogo').setAttribute( "src" , "../" + f.stored_config.catbyname[f.value].fieldbyname['providerlogo'] );
+	}catch(err){
+		_$('providerlogo').style.display = "none";
+	}
+
+	try{
 		var g = f.stored_config.catbyname[f.value].fieldbyname['regurl'] ;
 		_pl.href= ( g ) ? g :'#' ;
 		_pl.target = ( g ) ? '_blank' : '';
@@ -1032,7 +1040,7 @@
 	<tr>	<td style='width:80px' valign='top' class="field_text">Provider:</td>
 		<td><select id='provider' class="input9"></select></td>
 	</tr>
-	<tr><td colspan='2' align='center'><A href="#" id="providerlink"><img id='providerlogo' style='visibility:hidden;' border=0></A></td></tr>
+	<tr><td colspan='2' align='center'><A href="#" id="providerlink"><img id='providerlogo' style='display:none' border=0></A></td></tr>
 	<tr><td colspan='2' align='center'><div id='providerdesc' align='left' style='width:230px; font-size:10px'></div></td></tr>
 	<tr>
 		<td class="field_text">Username:</td>