[Mapbender-commits] r9072 - trunk/mapbender/http/html

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2014-09-11 04:46:56 -0700 (Thu, 11 Sep 2014)
New Revision: 9072

Modified:
   trunk/mapbender/http/html/mod_treefolderPlain.php
Log:
Bugfix for showing metadata and download windows

Modified: trunk/mapbender/http/html/mod_treefolderPlain.php
===================================================================
--- trunk/mapbender/http/html/mod_treefolderPlain.php	2014-09-11 09:51:04 UTC (rev 9071)
+++ trunk/mapbender/http/html/mod_treefolderPlain.php	2014-09-11 11:46:56 UTC (rev 9072)
@@ -821,8 +821,9 @@
 								c_menu+="]";
 								controls='';
 								if(switchwms=='true')controls='<INPUT type="checkbox" title="' + msgObj.tooltipHandleWms + '"  onclick="handleSelectedWMS(\''+parentNode+'|wms_'+ mb_mapObj[i].wms[ii].wms_id+'\');" />';
-								if(wmsbuttons == 'true'&&metadatalink == 'true')controls+='<a href="'+'javascript:openwindow(\''+ defaultMetadataUrl + '&id='+temp.layer_uid+'\');'+'"><img alt="'+msgObj.tooltipMetadata+'" title="'+msgObj.tooltipMetadata+'" src="'+imagedir+'/info.png" /></a>';
-								/*if(datalink == 'true' && mb_mapObj[i].wms[ii].objLayer[iii].layer_dataurl != '')controls+='<a href="'+'javascript:openwindow(\''+ mb_mapObj[i].wms[ii].objLayer[iii].layer_dataurl +'"><img alt="'+msgObj.tooltipDownload+'" title="'+msgObj.tooltipDownload+'" src="'+imagedir+'/gnome/document-save.png" /></a>';*/
+								if(wmsbuttons == 'true'&&metadatalink == 'true'){
+									controls+='<a href="'+defaultMetadataUrl + '&id='+temp.layer_uid+'"'+' target=\'_blank\' onclick="metadata_window = window.open(this.href,\'Metadata\',\'Width=700, Height=550,scrollbars=yes,menubar=yes,toolbar=yes\'); metadata_window.focus(); return false;"><img alt="'+msgObj.tooltipMetadata+'" title="'+msgObj.tooltipMetadata+'" src="'+imagedir+'/info.png" /></a>';
+								}
 								addNode(parentNode,["wms_"+ mb_mapObj[i].wms[ii].wms_id,[temp.layer_currentTitle,((metadatalink=='true'&&wmsbuttons != 'true')?('javascript:openwindow(\"'+ defaultMetadataUrl + '&id='+temp.layer_uid+'\");'):"javascript:select("+i+","+ii+","+iii+");"),,,temp.layer_currentTitle,eval(c_menu),controls,[i,ii,iii]]],false,false,reverse=="true");
 								parentObj = parentNode+"|wms_"+ mb_mapObj[i].wms[ii].wms_id;
 							}
@@ -882,10 +883,10 @@
 										controls.push("handleSelection('"+parentObj+parentLayer+"|"+temp.layer_id+"', 1);\" />");
 									}
 									if(wmsbuttons == 'true'&&metadatalink == 'true'){
-										controls.push('<a href="javascript:openwindow(\''+ defaultMetadataUrl + '&id='+temp.layer_uid+'\');"><img alt="'+msgObj.tooltipMetadata+'" title="'+msgObj.tooltipMetadata+'" src="'+imagedir+'/info.png" /></a>');
+										controls.push('<a href="'+defaultMetadataUrl + '&id='+temp.layer_uid+'"'+' target=\'_blank\' onclick="metadata_window = window.open(this.href,\'Metadata\',\'Width=700, Height=550,scrollbars=yes,menubar=yes,toolbar=yes\');metadata_window.focus(); return false;"><img alt="'+msgObj.tooltipMetadata+'" title="'+msgObj.tooltipMetadata+'" src="'+imagedir+'/info.png" /></a>');
 									}
 									if(datalink == 'true' && mb_mapObj[i].wms[ii].objLayer[iii].layer_dataurl != ''){
-										controls.push('<a href="'+'javascript:openwindow(\''+ mb_mapObj[i].wms[ii].objLayer[iii].layer_dataurl +'\');"><img width="18" height="18" alt="'+msgObj.tooltipDownload+'" title="'+msgObj.tooltipDownload+'" src="'+imagedir+'/../gnome/document-save.png" /></a>');	
+										controls.push('<a href="'+mb_mapObj[i].wms[ii].objLayer[iii].layer_dataurl+'"'+' target=\'_blank\' onclick="download_window = window.open(this.href,\'Download Data\',\'Width=450, Height=350,scrollbars=yes,menubar=yes,toolbar=yes\'); download_window.focus(); return false;"><img width="18" height="18" alt="'+msgObj.tooltipDownload+'" title="'+msgObj.tooltipDownload+'" src="'+imagedir+'/../gnome/document-save.png" /></a>');	
 									}
 									var groupedImageStyle ='';
 									if (temp.has_childs == true){