Commit f480a2be authored by Matija Obreza's avatar Matija Obreza

Institute map

parent 8422d31a
......@@ -161,7 +161,7 @@
<tr>
<td colspan="2">
<h4><spring:message code="accession.collecting.site" /></h4>
<div id="accessionMap" style="width: 100%; height: 300px">Loading Google Maps...</div>
<div id="map" style="width: 100%; height: 300px"><spring:message code="maps.loading-maps" /></div>
</td>
</tr>
</c:if>
......@@ -242,12 +242,12 @@
</ul>
</c:if>
<c:if test="${accessionEnvironment ne null and accessionEnvironment.latitude ne null}">
<script type="text/javascript">
jQuery(document).ready(function() {
var accessionMap=GoogleMaps.map("${pageContext.response.locale.language}", $("#accessionMap"), { center: new GoogleMaps.LatLng(${accessionEnvironment.latitude}, ${accessionEnvironment.longitude}), markerTitle: "<spring:escapeBody javaScriptEscape="true">${accession.accessionName}, ${accession.instituteCode}</spring:escapeBody>" });
});
</script>
</c:if>
<c:if test="${accessionEnvironment ne null and accessionEnvironment.latitude ne null}">
<script type="text/javascript">
jQuery(document).ready(function() {
var accessionMap=GoogleMaps.map("${pageContext.response.locale.language}", $("#map"), { center: new GoogleMaps.LatLng(${accessionEnvironment.latitude}, ${accessionEnvironment.longitude}), markerTitle: "<spring:escapeBody javaScriptEscape="true">${accession.accessionName}, ${accession.instituteCode}</spring:escapeBody>" });
});
</script>
</c:if>
</body>
</html>
\ No newline at end of file
......@@ -78,6 +78,13 @@
</c:if>
</div>
<c:if test="${faoInstitute.latitude ne null}">
<div class="row" style="">
<div class="col-sm-12">
<div id="map" class="gis-map"><spring:message code="maps.loading-maps" /></div>
</div>
</div>
</c:if>
<%-- <h3>
......@@ -86,7 +93,7 @@
<div class="row" style="margin-top: 2em;">
<c:if test="${statisticsCrop ne null}">
<%-- <c:if test="${statisticsCrop ne null}">
<div class="col-sm-4">
<h4><spring:message code="faoInstitute.stat-by-crop" arguments="${statisticsCrop.numberOfElements}" /></h4>
<ul class="funny-list statistics">
......@@ -95,9 +102,9 @@
</c:forEach>
</ul>
</div>
</c:if>
</c:if> --%>
<div class="col-sm-4">
<div class="col-sm-6">
<h4><spring:message code="faoInstitute.stat-by-genus" arguments="${statisticsGenus.numberOfElements}" /></h4>
<ul class="funny-list statistics">
<c:forEach items="${statisticsGenus.content}" var="stat" varStatus="status">
......@@ -106,7 +113,7 @@
</ul>
</div>
<div class="col-sm-4">
<div class="col-sm-6">
<h4><spring:message code="faoInstitute.stat-by-species" arguments="${statisticsTaxonomy.numberOfElements}" /></h4>
<ul class="funny-list statistics">
<c:forEach items="${statisticsTaxonomy.content}" var="stat" varStatus="status">
......@@ -118,5 +125,16 @@
</div>
<c:if test="${faoInstitute.latitude ne null}">
<script type="text/javascript">
jQuery(document).ready(function() {
var map=GoogleMaps.map("${pageContext.response.locale.language}", $("#map"), {
center: new GoogleMaps.LatLng(${faoInstitute.latitude}, ${faoInstitute.longitude}),
markerTitle: "<spring:escapeBody javaScriptEscape="true">${faoInstitute.fullName}</spring:escapeBody>"
});
});
</script>
</c:if>
</body>
</html>
\ No newline at end of file
......@@ -535,4 +535,14 @@ tr.acn .sel.picked {
.translationmissing {
padding: 0.3em;
}
\ No newline at end of file
}
.gis-map {
width: 100%;
height: 300px;
margin-top: 1em;
}
.gis-map.gis-map-400 {
height: 400px;
}
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