Commit eade6849 authored by Matija Obreza's avatar Matija Obreza

Using HTTPS for tiles and updated SGSV URL

parent 00b37ce1
......@@ -579,7 +579,7 @@
</div>
<div class="col-xs-8">
<a target="_blank" title="<spring:message code="accession.svalbard-data.url-title" />"
href="http://nordgen.org/sgsv/index.php?app=data_unit&unit=sgsv&unit_id=${svalbardData.unitId}"
href="<c:url value="http://www.nordgen.org/sgsv/index.php?app=data_unit&unit=sgsv&unit_id=${svalbardData.unitId}" />"
><spring:message code="accession.svalbard-data.url-text" arguments="${accession.accessionName}" /></a>
</div>
</div>
......@@ -589,26 +589,26 @@
<div class="col-xs-4">
<spring:message code="accession.svalbard-data.taxonomy" />
</div>
<div class="col-xs-8">${svalbardData.taxonomy}</div>
<div class="col-xs-8"><c:out value="${svalbardData.taxonomy}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.svalbard-data.depositDate" />
</div>
<div class="col-xs-8">${svalbardData.depositDate}</div>
<div class="col-xs-8"><c:out value="${svalbardData.depositDate}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.svalbard-data.boxNumber" />
</div>
<div class="col-xs-8">${svalbardData.boxNumber}</div>
<div class="col-xs-8"><c:out value="${svalbardData.boxNumber}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.svalbard-data.quantity" />
</div>
<div class="col-xs-8">${svalbardData.quantity}</div>
<div class="col-xs-8"><c:out value="${svalbardData.quantity}" /></div>
</div>
<c:if test="${svalbardData.acceUrl ne null}">
......@@ -617,7 +617,7 @@
<spring:message code="accession.acceUrl" />
</div>
<div class="col-xs-8">
<a href="<c:out value="${svalbardData.acceUrl}" />"><c:out value="${svalbardData.acceUrl}" /></a>
<a href="<c:url value="${svalbardData.acceUrl}" />"><c:out value="${svalbardData.acceUrl}" /></a>
</div>
</div>
</c:if>
......@@ -731,7 +731,7 @@
<script type="text/javascript">
jQuery(document).ready(function() {
var map = L.map('map').setView([${accessionGeo.latitude}, ${accessionGeo.longitude}], 2);
L.tileLayer('http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
attribution: 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ',
maxZoom: 16
}).addTo(map);
......
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