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

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2017-12-08 05:31:33 -0800 (Fri, 08 Dec 2017)
New Revision: 9830

Modified:
   trunk/mapbender/http/php/mod_showMetadata.php
Log:
more rdf-a

Modified: trunk/mapbender/http/php/mod_showMetadata.php
===================================================================
--- trunk/mapbender/http/php/mod_showMetadata.php	2017-12-08 08:38:00 UTC (rev 9829)
+++ trunk/mapbender/http/php/mod_showMetadata.php	2017-12-08 13:31:33 UTC (rev 9830)
@@ -886,9 +886,9 @@
 }
 $html .= displayText($metadataContactGroup['metadatacontactorganization']).$t_c;
 if ($resourceMetadata['contentabstract'] != '') {
-	$html .= $t_a.$translation['resourceAbstract'].$t_b.'<span property="name"><em>'.displayText($resourceMetadata['contentabstract']).'</em></span>'.$t_c;
+	$html .= $t_a.$translation['resourceAbstract'].$t_b.'<span property="description"><em>'.displayText($resourceMetadata['contentabstract']).'</em></span>'.$t_c;
 } else {
-	$html .= $t_a.$translation['resourceAbstract'].$t_b.'<span property="name"><em>'.displayText($resourceMetadata['serviceabstract']).'</em></span>'.$t_c;
+	$html .= $t_a.$translation['resourceAbstract'].$t_b.'<span property="description"><em>'.displayText($resourceMetadata['serviceabstract']).'</em></span>'.$t_c;
 }
 
 $user = new User();
@@ -933,8 +933,7 @@
 	}
 	//add hidden element for show map url
 	$html .= $t_a.$t_b.'<span hidden="hidden" property="url">'.$showMapUrl.'</span>'.$t_c;
-	$html .= $t_a.$t_b.'<span hidden="hidden" property="identifier">'.$mapbenderBaseUrl.$resource.'/'.$resourceMetadata['contentid'].'</span>'.$t_c;
-	//$html .= $t_a.$translation['addLayerToMap'].$t_b."<a href='".$showMapUrl."' target='_blank'><img src='../img/osgeo_graphics/layer-wms-add.png'></a>".$t_c;
+	$html .= $t_a.$t_b.'<span hidden="hidden" property="identifier" href="'.$mapbenderBaseUrl.'/'.$resource.'/'.$resourceMetadata['contentid'].'"></span>'.$t_c;
 	$html .= $t_a."<button onclick='window.open(\"".$showMapUrl."\", 
   \"windowname1\", 
   \"width=1024, height=768, scrollbars=yes, resizable=yes\");'
@@ -1207,6 +1206,7 @@
 //**************************properties  part end******************************
 
 //**************************contact part begin******************************
+
 if ($layout == 'accordion') {
 	$html .= '<h3><a href="#">'.$translation["contact"].'</a></h3>';
 	$html .= '<div style="height:300px">';
@@ -1218,32 +1218,37 @@
 	$html .= '<h3>'.$translation["contact"].'</h3>';
 	$html .= '<div>';
 }
+
 //$html .= '<p>';
 if ($resource == 'wmc') {
 	$html .= '<h4>'.$translation['wmcProvider'].'</h4>';
 } else {
 	$html .= '<h4>'.$translation['metadataProvider'].'</h4>';
 }
+$html .= '<span '.$publisherOrganizationCategory.'>';
 $html .= $tableBegin;
 if ($metadataContactGroup['mb_group_logo_path'] != '') {
-	$html .= $t_a.$translation['logo'].$t_b."<img src='".$metadataContactGroup['mb_group_logo_path']."'  height='30'>".$t_c;
+	$html .= $t_a.$translation['logo'].$t_b.'<span hidden="hidden" property="logo" typeof="URL">'.$metadataContactGroup['mb_group_logo_path'].'</span>'."<img src='".$metadataContactGroup['mb_group_logo_path']."'  height='30'>".$t_c;
+	//$html .= $t_a.$translation['logo'].$t_b."<img src='".$metadataContactGroup['mb_group_logo_path']."'  height='30'>".$t_c;
 }
-
-$html .= $t_a.$translation['contactOrganization'].$t_b.displayText($metadataContactGroup['mb_group_title']).$t_c;
+$html .= $t_a.$translation['contactOrganization'].$t_b.'<span property="legalName">'.displayText($metadataContactGroup['mb_group_title']).'</span>'.$t_c;
 $html .= $t_a.$translation['contactAddress'].$t_b.displayText($metadataContactGroup['mb_group_address']).$t_c;
 $html .= $t_a.$translation['city'].$t_b.displayText($metadataContactGroup['mb_group_postcode'].' '.$metadataContactGroup['mb_group_city']).$t_c;
-$html .= $t_a.$translation['email'].$t_b.displayText($metadataContactGroup['mb_group_email']).$t_c;
+$html .= $t_a.$translation['email'].$t_b.'<span property="email">'.displayText($metadataContactGroup['mb_group_email']).'</span>'.$t_c;
 $html .= $tableEnd;
+$html .= '</span>';
 if ($resource !== 'wmc') {
 	$html .= '<h4>'.$translation['serviceProvider'].'</h4>';
+	$html .= '<span '.$providerOrganizationCategory.'>';
 	$html .= $tableBegin;
-	$html .= $t_a.$translation['contactOrganization'].$t_b.displayText($resourceMetadata['contactorganization']).$t_c;
+	$html .= $t_a.$translation['contactOrganization'].$t_b.'<span property="legalName">'.displayText($resourceMetadata['contactorganization']).'</span>'.$t_c;
 	$html .= $t_a.$translation['contactPerson'].$t_b.displayText($resourceMetadata['contactperson']).$t_c;
 	$html .= $t_a.$translation['contactAddress'].$t_b.displayText($resourceMetadata['address']).$t_c;
 	$html .= $t_a.$translation['contactCity'].$t_b.displayText($resourceMetadata['postcode'].' '.$resourceMetadata['city']).$t_c;
 	$html .= $t_a.$translation['contactTelephone'].$t_b.displayText($resourceMetadata['contactvoicetelephone']).$t_c;
-	$html .= $t_a.$translation['email'].$t_b.displayText($resourceMetadata['contactelectronicmailaddress']).$t_c;
+	$html .= $t_a.$translation['email'].$t_b.'<span property="email">'.displayText($resourceMetadata['contactelectronicmailaddress']).'</span>'.$t_c;
 	$html .= $tableEnd;
+	$html .= '</span>';
 }
 //$html .= '</p>';
 
@@ -1251,18 +1256,22 @@
 //**************************contact part end******************************
 
 //**************************termsOfUse part begin******************************
-if ($layout == 'accordion') {
-	$html .= '<h3><a href="#">'.$translation["termsOfUse"].'</a></h3>';
-	$html .= '<div style="height:300px">';
+switch ($layout) {
+	case "accordion":
+		$html .= '<h3><a href="#">'.$translation["termsOfUse"].'</a></h3>';
+		$html .= '<div style="height:300px">';
+		break;
+	case "tabs":
+		$html .= '<div id="tabs-4">';
+		break;
+	case "plain":
+		$html .= '<h3>'.$translation["termsOfUse"].'</h3>';
+		$html .= '<div>';
+		break;
+	default:
+		$html .= '<div>';
+		break;
 }
-if ($layout == 'tabs') {
-	$html .= '<div id="tabs-4">';
-}
-if ($layout == 'plain') {
-	$html .= '<h3>'.$translation["termsOfUse"].'</h3>';
-	$html .= '<div>';
-}
-//$html .= '<p>';
 
 if ($resource == 'wms' or $resource == 'layer') {
 	$constraints = new OwsConstraints();