Skip to content

GitLab

Commit 23d724fb authored by Matija Obreza's avatar Matija Obreza
Browse files

CDN configuration updated

parent fc603fcb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
src/main/resources/spring/spring.properties
View file @ 23d724fb
......@@ -47,7 +47,7 @@ itpgrfa.easysmta.password=
google.analytics.account=
# CDN
cdn.base=http://cdn.sandbox.genesys-pgr.org
cdn.base=/html
cdn.flags.url=${cdn.base}/flags
# Content creation on startup
......
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @ 23d724fb
......@@ -107,7 +107,7 @@
<c:if test="${accession.countryOfOrigin ne null}">
<tr>
<td><spring:message code="accession.origin" /></td>
<td><img src="${cdnFlagsUrl}/${accession.origin.toUpperCase()}.png" /> <a href="<c:url value="/geo/${accession.origin.toLowerCase()}" />"> <c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" />
<td><img src="<c:url value="${cdnFlagsUrl}" />/${accession.origin.toUpperCase()}.png" /> <a href="<c:url value="/geo/${accession.origin.toLowerCase()}" />"> <c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" />
</a></td>
</tr>
</c:if>
......
src/main/webapp/WEB-INF/jsp/country/details.jsp
View file @ 23d724fb
......@@ -9,7 +9,7 @@
<body>
<h1>
<c:out value="${country.getName(pageContext.response.locale)}" />
<img class="country-flag bigger" src="${cdnFlagsUrl}/${country.code3.toUpperCase()}.png" />
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${country.code3.toUpperCase()}.png" />
</h1>
<c:if test="${not country.current}">
......
src/main/webapp/WEB-INF/jsp/country/edit.jsp
View file @ 23d724fb
......@@ -9,7 +9,7 @@
<body>
<h1>
<c:out value="${country.getName(pageContext.response.locale)}" />
<img class="country-flag bigger" src="${cdnFlagsUrl}/${country.code3.toUpperCase()}.png" />
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${country.code3.toUpperCase()}.png" />
</h1>
<form role="form" class="" action="<c:url value="/geo/${country.code3.toLowerCase()}/update" />" method="post">
......
src/main/webapp/WEB-INF/jsp/country/map.jsp
View file @ 23d724fb
......@@ -9,7 +9,7 @@
<body>
<h1>
<c:out value="${country.getName(pageContext.response.locale)}" />
<img class="country-flag bigger" src="${cdnFlagsUrl}/${country.code3.toUpperCase()}.png" />
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${country.code3.toUpperCase()}.png" />
</h1>
<div class="main-col-header">
......
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @ 23d724fb
......@@ -8,7 +8,7 @@
</head>
<body>
<h1>
<img class="country-flag bigger" src="${cdnFlagsUrl}/${faoInstitute.country.code3.toUpperCase()}.png" />
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${faoInstitute.country.code3.toUpperCase()}.png" />
<c:out value="${faoInstitute.fullName}" />
<small><c:out value="${faoInstitute.code}" /></small>
</h1>
......@@ -44,7 +44,7 @@
<div class="row" style="">
<div class="col-sm-4">
<spring:message code="faoInstitute.country" />:
<%-- <img src="${cdnFlagsUrl}/${faoInstitute.country.code3.toUpperCase()}.png" /> --%>
<%-- <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>
</div>
<%-- <div class="col-sm-4">
......
src/main/webapp/WEB-INF/jsp/wiews/edit.jsp
View file @ 23d724fb
......@@ -8,7 +8,7 @@
</head>
<body>
<h1>
<img class="country-flag bigger" src="${cdnFlagsUrl}/${faoInstitute.country.code3.toUpperCase()}.png" />
<img class="country-flag bigger" src="<c:url value="${cdnFlagsUrl}" />/${faoInstitute.country.code3.toUpperCase()}.png" />
<c:out value="${faoInstitute.fullName}" />
<small><c:out value="${faoInstitute.code}" /></small>
</h1>
......
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