Commit d38ed06b authored by Matija Obreza's avatar Matija Obreza

RDFa annotations, other minor HTML changes

parent cb384bb1
......@@ -7,8 +7,8 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="" />
<meta name="author" content="" />
<meta name="description" content="Genesys, global database on plant genetic resources, accession database, order seeds, request for genebank material" />
<meta name="author" content="Global Crop Diversity Trust" />
<!-- CSRF protection-->
<meta name="_csrf" content="${_csrf.token}"/>
......
......@@ -142,7 +142,7 @@
</ul>
</li>
</security:authorize>
</li>
<li class="dropdown" id="lang">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><c:out value="${pageContext.response.locale.displayLanguage}" /> <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu">
......
......@@ -2,13 +2,17 @@
<!DOCTYPE html>
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}">
<head>
<html lang="${pageContext.response.locale.language}" dir="${pageContext.response.locale.language=='fa' || pageContext.response.locale.language=='ar' ? 'rtl' : 'ltr'}"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:schema="http://schema.org/"
xmlns:dwc="http://rs.tdwg.org/dwc/terms/"
xmlns:germplasm="http://purl.org/germplasm/germplasmTerm#"
xmlns:germplasmType="http://purl.org/germplasm/germplasmType#"
>
<head >
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="" />
<meta name="author" content="" />
<!-- CSRF protection-->
<meta name="_csrf" content="${_csrf.token}"/>
......@@ -43,7 +47,7 @@
<div id="content" class="clearfix">
<div class="container">
<div id="dialog"></div>
<div class="main-col clearfix">
<div class="main-col clearfix" typeof="<sitemesh:write property="body.typeof" />">
<sitemesh:write property="body" />
</div>
</div>
......
......@@ -6,15 +6,15 @@
<head>
<title><spring:message code="accession.page.profile.title" arguments="${accession.accessionName}" argumentSeparator="|" /></title>
</head>
<body>
<body typeof="germplasm:GermplasmAccession">
<h1>
<c:out value="${accession.accessionName}" />
<small><c:out value="${accession.instituteCode}" /></small>
<span property="germplasm:germplasmIdentifier"><c:out value="${accession.accessionName}" /></span>
<small property="germplasmType:wiewsInstituteID"><c:out value="${accession.instituteCode}" /></small>
</h1>
<div class="main-col-header acn">
<div class="sel" x-aid="${accession.id}">
<a class="add" href=""><spring:message code="selection.add" arguments="${accession.accessionName}" /></a> <a class="remove" href="<c:url value="/sel/remove/${accession.id}" />"><spring:message code="selection.remove"
<a class="add" href=""><spring:message code="selection.add" arguments="${accession.accessionName}" /></a> <a class="remove" href=""><spring:message code="selection.remove"
arguments="${accession.accessionName}" /></a>
</div>
</div>
......@@ -51,7 +51,8 @@
<div class="pseudo-right-col col-md-3">
<c:if test="${accessionGeo.latitude ne null and accessionGeo.longitude ne null}">
<div class="crop-location">
<div class="crop-location" itemscope itemtype="http://schema.org/GeoCoordinates">
<h3><spring:message code="accession.collecting.site" /></h3>
<div id="map" class="map-container"></div>
......@@ -75,7 +76,7 @@
<tbody>
<tr>
<td><spring:message code="accession.holdingInstitute" /></td>
<td><a href="<c:url value="/wiews/${accession.instituteCode.toLowerCase()}" />"> <c:out value="${accession.institute.fullName}" />
<td><a property="dwc:instituteId" href="<c:url value="/wiews/${accession.instituteCode.toLowerCase()}" />"> <c:out value="${accession.institute.fullName}" />
</a></td>
</tr>
<tr>
......@@ -112,7 +113,7 @@
<tr>
<td><spring:message code="taxonomy.genus" /></td>
<td><c:out value="${accession.taxonomy.genus}" /></td>
<td property="dwc:genus"><c:out value="${accession.taxonomy.genus}" /></td>
</tr>
<tr>
<td><spring:message code="taxonomy.species" /></td>
......@@ -128,7 +129,7 @@
<tr>
<td><spring:message code="accession.sampleStatus" /></td>
<td><spring:message code="accession.sampleStatus.${accession.sampleStatus}" /></td>
<td property="germplasm:biologicalStatus"><spring:message code="accession.sampleStatus.${accession.sampleStatus}" /></td>
</tr>
<tr>
......
......@@ -6,10 +6,10 @@
<head>
<title><spring:message code="faoInstitutes.page.profile.title" arguments="${faoInstitute.fullName}" argumentSeparator="|" /></title>
</head>
<body>
<body typeof="schema:Organization">
<h1>
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${faoInstitute.country.code3.toUpperCase()}.png" />
<c:out value="${faoInstitute.fullName}" />
<span property="schema:Organization#name"><c:out value="${faoInstitute.fullName}" /></span>
<small><c:out value="${faoInstitute.code}" /></small>
</h1>
......@@ -39,13 +39,19 @@
</a>
</security:authorize>
<span property="schema:Organization#description">
<%@include file="/WEB-INF/jsp/content/include/blurp-display.jsp" %>
</span>
<div class="row" style="">
<div class="col-sm-4">
<div class="col-sm-4" property="schema:Organization#location">
<spring:message code="faoInstitute.country" />:
<%-- <img src="<c:url value="${cdnFlagsUrl}" />/${faoInstitute.country.code3.toUpperCase()}.png" /> --%>
<a href="<c:url value="/geo/${faoInstitute.country.code3.toLowerCase()}" />"><c:out value="${faoInstitute.country.getName(pageContext.response.locale)}" /></a>
<a href="<c:url value="/geo/${faoInstitute.country.code3.toLowerCase()}" />">
<span typeof="schema:Country"><span property="schema:Country#name">
<c:out value="${faoInstitute.country.getName(pageContext.response.locale)}" />
</span></span>
</a>
</div>
<%-- <div class="col-sm-4">
<spring:message code="faoInstitute.code" />:
......@@ -68,7 +74,7 @@
--%>
<div class="col-sm-12">
<spring:message code="faoInstitute.url" />:
<a href="<c:out value="${faoInstitute.url}" />"><c:out value="${faoInstitute.url}" /></a>
<a href="<c:out value="${faoInstitute.url}" />"><span property="schema:Organization#sameAs"><c:out value="${faoInstitute.url}" /></span></a>
</div>
</div>
......@@ -88,6 +94,9 @@
<div class="row" style="">
<div class="col-sm-12">
<div id="map" class="gis-map"></div>
<span property="schema:Organization#location"><span typeof="schema:Place"><span property="schema:Place#geo"><span typeof="schema:GeoCoordinates">
<span property="schema:GeoCoordinates#latitude">${faoInstitute.latitude}</span>, <span property="schema:GeoCoordinates#longitude">${faoInstitute.longitude}</span>
</span></span></span></span>
</div>
</div>
</c:if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment