[Mapbender-commits] r9835 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-12-21 00:59:36 -0800 (Thu, 21 Dec 2017)
New Revision: 9835

Modified:
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
Correct rdf-a mappreview for location of layer/metadata/featuretype

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2017-12-21 08:58:27 UTC (rev 9834)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2017-12-21 08:59:36 UTC (rev 9835)
@@ -957,8 +957,6 @@
    return false;><img src='../img/osgeo_graphics/layer-wms-add.png'>".$translation['showMap']."</button>".$t_b."".$t_c;
 	
 }
-//add dynamic preview in rdfa
-$html .= $t_a.$t_b.'<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>'.$t_c;
 //new for share and discuss metadata by twitter
 if (TWITTER_METADATA) {
 	if ($resource == 'wfs' or $resource == 'wms') {
@@ -1072,7 +1070,8 @@
 		$html .= $t_a.$translation['wgs84BboxGraphic'].$t_b.$translation['graphicUnavailable'].$t_c;
 	}
 	//show preview map - dynamically
-	
+	//add dynamic preview in rdfa
+$html .= $t_a.$t_b.'<span hidden="hidden" property="contentLocation" typeof="Place"><span hidden="hidden" property="hasMap" href="'.$getMapUrl.'"></span></span>'.$t_c;
 }
 //$html .= $tableEnd;
 //$html .= $tableBegin;
@@ -1447,10 +1446,10 @@
 	$html .= "<table class='lesscsstable'>";
 	$html .= $t_a2;
 	$html .= "<img  src='../img/inspire_tr_36.png'>";
-	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&outputFormat=iso19139&Id=".$featuretypeId."' target=_blank >".$translation['showDocument']."</a><br/><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&outputFormat=iso19139&Id=".$featuretypeId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
+	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&outputFormat=iso19139&Id=".$featuretypeId."' target=_blank >".$translation['showDocument']."</a><br/><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../mod_featuretypeISOMetadata.php?SERVICE=WFS&outputFormat=iso19139&Id=".$featuretypeId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
 	$html .= $t_c;
 	$html .= $t_a2."<img style='border: none;width:34px;height:34px' src='../img/rdf_w3c_icon.48.gif' title='".$translation['inspireMetadata']." - RDF/XML (BETA)"."' style='width:34px;height:34px' alt='' />";
-	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&CN=false&outputFormat=rdf&Id=".$featuretypeId."' target=_blank >".$translation['showDocument']."</a><br /><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&CN=false&outputFormat=rdf&Id=".$featuretypeId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
+	$html .= $t_b."<img class='normalizeicon' src='../img/gnome/edit-select-all.png'><a class='linkjs' href='../php/mod_featuretypeISOMetadata.php?SERVICE=WFS&CN=false&outputFormat=rdf&Id=".$featuretypeId."' target=_blank >".$translation['showDocument']."</a><br /><img class='normalizeicon' src='../img/osgeo_graphics/geosilk/link.png'><a class='linkjs' onclick='showCapabilitiesUrl(\"".$mapbenderBaseUrl.$_SERVER['PHP_SELF']."/../mod_featuretypeISOMetadata.php?SERVICE=WFS&CN=false&outputFormat=rdf&Id=".$featuretypeId."\",\"".$translation['inspireMetadaten']."\");'>".$translation['showLink']."</a>";
     $html .= $t_c;
 	$html .= "</table>";
 	$html .= $t_c;