Commit da73a733 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '213-wiews-link-changed' into 'master'

Resolve "WIEWS link changed"

Closes #213

See merge request genesys-pgr/genesys-server!119
parents 305f7f83 95ab33c4
......@@ -68,7 +68,7 @@
<c:otherwise><c:set var="wiewsLang" value="en" /></c:otherwise>
</c:choose>
<div class="text-ellipsis"><a target="_blank" rel="nofollow"
href="<c:url value="http://www.fao.org/wiews/instab/${wiewsLang}/"><c:param name="instcode" value="${faoInstitute.code}" /></c:url>">
href="<c:url value="http://www.fao.org/wiews/data/organizations/${wiewsLang}/"><c:param name="instcode" value="${faoInstitute.code}" /></c:url>">
<spring:message code="faoInstitute.wiewsLink" arguments="${faoInstitute.code}" />
</a></div>
</div>
......@@ -461,7 +461,7 @@
</div>
</div>
</c:if>
<c:if test="${countByInstitute gt 0}">
<spring:eval expression="T(java.text.DateFormatSymbols).getInstance(pageContext.response.locale).getMonths()" var="monthNames" />
<div class="collect-info col-lg-6 col-md-12 col-sm-12 col-xs-12">
......@@ -491,7 +491,7 @@
</div>
</div>
</c:if>
<security:authorize access="hasRole('ADMINISTRATOR') or hasPermission(#faoInstitute, 'ADMINISTRATION')">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 form-group">
<a href="<c:url value="/acl/${faoInstitute.getClass().name}/${faoInstitute.id}/permissions"><c:param name="back">/wiews/${faoInstitute.code}</c:param></c:url>" class="btn btn-default">
......@@ -572,7 +572,7 @@
minZoom: 0,
maxZoom: 4, /* WIEWS does not provide enough detail */
<c:if test="${faoInstitute.latitude ne null}">
center: new GenesysMaps.LatLng(${faoInstitute.latitude}, ${faoInstitute.longitude}),
center: new GenesysMaps.LatLng(${faoInstitute.latitude}, ${faoInstitute.longitude}),
markerTitle: "<spring:escapeBody javaScriptEscape="true">${faoInstitute.code}</spring:escapeBody>",
</c:if>
scrollWheelZoom: false,
......@@ -599,4 +599,4 @@
});
</script> </content>
</body>
</html>
\ No newline at end of file
</html>
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