Skip to content

GitLab

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

Using <c:out and <c:url

parent 59b754c6
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 116 deletions
src/main/webapp/WEB-INF/decorator/0/footer.jsp
View file @ e923f380
......@@ -27,7 +27,7 @@
</div>
<div class="pull-right">
<div class="pull-left text-right" style="color: #808080; font-family: monospace; font-size: 8px;"><spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br /><a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
<br /><a target="_blank" href="<c:url value="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}" />"><c:out value="${buildName}" /></a>
<%-- <br />${lastGet} --%>
</div>
</div>
......
src/main/webapp/WEB-INF/decorator/0/ga.jsp
View file @ e923f380
......@@ -7,7 +7,7 @@
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '${googleAnalyticsAccount}', 'auto');
ga('create', '<c:out value="${googleAnalyticsAccount}" />', 'auto');
var p={};
try {
if (_pageDim && _pageDim.institute != null) {
......
src/main/webapp/WEB-INF/decorator/0/menu.jsp
View file @ e923f380
......@@ -23,7 +23,7 @@
<li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li>
<li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li>
<li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" />
<span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter">${selection.size() gt 0 ? selection.size() : '0'}</span></a></li>
<span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter"><c:out value="${selection.size() gt 0 ? selection.size() : '0'}" /></span></a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="right"><local:twitter-follow screenName="GenesysPGR" /></li>
......
src/main/webapp/WEB-INF/decorator/1/footer.jsp
View file @ e923f380
......@@ -49,7 +49,7 @@
<div class="text-center footer-link">
<spring:message code="page.rendertime" arguments="${springExecuteTime}" />
<br /> <a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}">${buildName}</a>
<br /> <a target="_blank" href="<c:url value="https://bitbucket.org/genesys2/genesys2-server/commits/${buildRevision}" />"><c:out value="${buildName}" /></a>
</div>
</div>
</footer>
......
src/main/webapp/WEB-INF/decorator/1/menu.jsp
View file @ e923f380
......@@ -83,7 +83,7 @@
</a>
</li>
<li>
<a href="<c:url value="/1/sel/" />"> <spring:message code="menu.my-list" /> <span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter">${selection.size() gt 0 ? selection.size() : '0'}</span>
<a href="<c:url value="/1/sel/" />"> <spring:message code="menu.my-list" /> <span class="badge" x-size="${selection.size() gt 0 ? selection.size() : '0'}" id="selcounter"><c:out value="${selection.size() gt 0 ? selection.size() : '0'}" /></span>
</a>
</li>
......
src/main/webapp/WEB-INF/jsp/1/accession/details.jsp
View file @ e923f380
......@@ -53,28 +53,6 @@
<spring:message code="accession.available-for-distribution" />
</gui:alert>
--%>
<%--
<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="<c:url value="/wiews/${accession.institute.code}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.institute.fullName}</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="<c:url value="/wiews/${accession.institute.code}/data" />" itemprop="url">
<span itemprop="title" dir="ltr">Accessions</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a title="<spring:message code="accession.taxonomy-at-institute" arguments="${accession.taxonomy.genus}|||${accession.institute.code}" argumentSeparator="|||" />" href="<c:url value="/wiews/${accession.institute.code}/t/${accession.taxonomy.genus}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.taxonomy.genus}</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a title="<spring:message code="accession.taxonomy-at-institute" arguments="${accession.taxonomy.genus} ${accession.taxonomy.species}|||${accession.institute.code}" argumentSeparator="|||" />" href="<c:url value="/wiews/${accession.institute.code}/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.taxonomy.genus} ${accession.taxonomy.species}</span>
</a>
</span>
</span>
</span>
</div>
--%>
<div class="crop-details">
<div class="basic-info">
......@@ -263,10 +241,10 @@
<p>
<c:out value="${accessionAlias.name}" />
<c:if test="${accessionAlias.instCode != ''}">
<a href="<c:url value="/wiews/${accessionAlias.instCode}" />"> ${accessionAlias.instCode} </a>
<a href="<c:url value="/wiews/${accessionAlias.instCode}" />"><c:out value="${accessionAlias.instCode}" /></a>
</c:if>
<c:if test="${accessionAlias.usedBy != ''}">
${accessionAlias.usedBy}
<c:out value="${accessionAlias.usedBy}" />
</c:if>
<c:if test="${accessionAlias.lang != ''}">
<c:out value="${accessionAlias.lang}" />
......@@ -349,7 +327,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<p property="dc:identifier">
<a href="https://purl.org/germplasm/id/${accession.uuid}"><c:out value="https://purl.org/germplasm/id/${accession.uuid}" /></a>
<a href="<c:url value="https://purl.org/germplasm/id/${accession.uuid}" />"><c:out value="https://purl.org/germplasm/id/${accession.uuid}" /></a>
</p>
</div>
</div>
......@@ -385,7 +363,7 @@
<div class="row imagegallery thumbs" id="accession-images-thumbs">
<c:forEach items="${imageGallery.images}" var="image">
<div x-uuid="<c:out value="${image.uuid}" />" x-ext="<c:out value="${image.extension}" />" style="cursor: pointer;" class="col-xs-6 col-sm-3 col-md-2 col-lg-2">
<img src="<c:url value="/repository/d${image.path}_thumb/${thumbnailFormat}_${image.uuid}.png" />" alt="${image.title}" />
<img src="<c:url value="/repository/d${image.path}_thumb/${thumbnailFormat}_${image.uuid}.png" />" alt="<c:out value="${image.title}" />" />
</div>
</c:forEach>
</div>
......@@ -810,7 +788,7 @@
<c:forEach items="${worldclimJson.other.keySet()}" var="worldclimDescriptor">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><c:out value="${worldclimDescriptor.title}" /></div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><fmt:formatNumber value="${worldclimJson.other[worldclimDescriptor]}" /><span class="uom">${worldclimDescriptor.uom}</span></div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><fmt:formatNumber value="${worldclimJson.other[worldclimDescriptor]}" /><span class="uom"><c:out value="${worldclimDescriptor.uom}" /></span></div>
</div>
</c:forEach>
--%>
......@@ -830,7 +808,7 @@
<spring:message code="accession.svalbard-data.url" />
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<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}"><spring:message
<a target="_blank" title="<spring:message code="accession.svalbard-data.url-title" />" href="<c:url value="http://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>
......@@ -840,26 +818,26 @@
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<spring:message code="accession.svalbard-data.taxonomy" />
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">${svalbardData.taxonomy}</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><c:out value="${svalbardData.taxonomy}" /></div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<spring:message code="accession.svalbard-data.depositDate" />
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">${svalbardData.depositDate}</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><c:out value="${svalbardData.depositDate}" /></div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<spring:message code="accession.svalbard-data.boxNumber" />
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">${svalbardData.boxNumber}</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><c:out value="${svalbardData.boxNumber}" /></div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">
<spring:message code="accession.svalbard-data.quantity" />
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12">${svalbardData.quantity}</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12"><c:out value="${svalbardData.quantity}" /></div>
</div>
<c:if test="${svalbardData.acceUrl ne null}">
......
src/main/webapp/WEB-INF/jsp/1/accession/explore.jsp
View file @ e923f380
......@@ -90,11 +90,11 @@
</div>
</c:if>
<a class="btn btn-default"
href="<c:url value="/explore/overview"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span
href="<c:url value="/explore/overview"><c:param name="filter" value="${jsonFilter}" /></c:url>"><span
class="glyphicon glyphicon-eye-open"></span><span><spring:message
code="data-overview.short"/></span></a>
<a class="btn btn-default"
href="<c:url value="/explore/map"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span
href="<c:url value="/explore/map"><c:param name="filter" value="${jsonFilter}" /></c:url>"><span
class="glyphicon glyphicon-globe"></span><span><spring:message code="maps.view-map"/></span></a>
</div>
</div>
......@@ -291,7 +291,7 @@
class="form-control filter-crop">
<option value=""></option>
<c:forEach items="${crops}" var="c">
<option value="${c.shortName}" ${c.shortName== crop.shortName?'selected':''} >
<option value="<c:out value="${c.shortName}" />" ${c.shortName== crop.shortName?'selected':''} >
<c:out value="${c.getName(pageContext.response.locale)}"/></option>
</c:forEach>
</select>
......@@ -416,7 +416,7 @@
<tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status">
<tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'} ${accession.historic ? 'historic-record' : ''}">
<td class="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
<td class="sel" x-aid="${accession.id}" title="<spring:message code="selection.checkbox" />"></td>
<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.acceNumb}"/></b></a></td>
<%--<td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.taxonName}" /></a></td> --%>
......
src/main/webapp/WEB-INF/jsp/1/admin/logger/index.jsp
View file @ e923f380
......@@ -22,7 +22,7 @@
<c:forEach items="${loggers.content}" var="logger" varStatus="status">
<tr>
<td class="col-xs-8 form-control-static"><a
href="<c:url value="/admin/logger/${logger.name}." />">${logger.name}</a>
href="<c:url value="/admin/logger/${logger.name}." />"><c:out value="${logger.name}" /></a>
</td>
<td class="col-xs-4 text-right form-control-static"><c:out
value="${logger.level}" /></td>
......@@ -42,7 +42,7 @@
<c:forTokens items="all,debug,info,warn,error,fatal,off,trace"
delims="," var="level">
<option value="${level}" ${level == "debug" ? "selected" : ""}>
${level}</option>
<c:out value="${level}" /></option>
</c:forTokens>
</select>
</div>
......
src/main/webapp/WEB-INF/jsp/1/admin/users/edit.jsp
View file @ e923f380
......@@ -60,7 +60,7 @@
<c:forEach items="${availableRoles}" var="role">
<div class="form-group">
<div class="col-lg-12">
<label><input type="checkbox" name="role" value="${role}" ${user.hasRole(role) ? 'checked="true"' : ''} /> ${role}</label>
<label><input type="checkbox" name="role" value="<c:out value="${role}" />" ${user.hasRole(role) ? 'checked="true"' : ''} /><c:out value="${role}" /></label>
</div>
</div>
</c:forEach>
......
src/main/webapp/WEB-INF/jsp/1/admin/users/index.jsp
View file @ e923f380
......@@ -25,7 +25,7 @@
<td class="col-xs-2"><c:if test="${user.systemAccount}">SYSTEM</c:if>
<c:if test="${not user.enabled}">DISABLED</c:if> <c:if
test="${user.accountLocked}">LOCKED</c:if></td>
<td class="col-xs-5">${user.email}</td>
<td class="col-xs-5"><c:out value="${user.email}" /></td>
</tr>
</c:forEach>
</tbody>
......
src/main/webapp/WEB-INF/jsp/1/admin/users/profile.jsp
View file @ e923f380
......@@ -14,13 +14,13 @@
<div class="form-horizontal">
<div class="form-group">
<label for="password" class="col-lg-2 control-label"><spring:message code="user.full-name" /></label>
<div class="col-lg-5 form-control-static">${user.name}</div>
<div class="col-lg-5 form-control-static"><c:out value="${user.name}" /></div>
</div>
<security:authorize access="hasRole('ADMINISTRATOR') || (isAuthenticated() && principal.user.id == #user.id)">
<div class="form-group">
<label for="password" class="col-lg-2 control-label"><spring:message code="user.email" /></label>
<div class="col-lg-5 form-control-static">${user.email}</div>
<div class="col-lg-5 form-control-static"><c:out value="${user.email}" /></div>
</div>
<div class="form-group">
......@@ -38,7 +38,7 @@
<label class="col-lg-2 control-label"><spring:message code="user.roles" /></label>
<div class="col-lg-10 form-control-static">
<c:forEach items="${user.roles}" var="role">
<div>${role}</div>
<div><c:out value="${role}" /></div>
</c:forEach>
</div>
</div>
......
src/main/webapp/WEB-INF/jsp/1/content/article.jsp
View file @ e923f380
......@@ -4,7 +4,7 @@
<html>
<head>
<title>${title}</title>
<title><c:out value="${title}" /></title>
<local:content-headers description="${jspHelper.htmlToText(article.summary, 150)}" title="${title}"/>
</head>
<body class="about-page">
......
src/main/webapp/WEB-INF/jsp/1/content/ascii-doc.jsp
View file @ e923f380
......@@ -5,7 +5,7 @@
<html>
<head>
<c:out value="${head}" escapeXml="false" />
<title>${title}</title>
<title><c:out value="${title}" /></title>
</head>
<body class="about-page">
<content tag="header">
......
src/main/webapp/WEB-INF/jsp/1/crop/index.jsp
View file @ e923f380
......@@ -86,7 +86,7 @@
<c:forEach items="${cropRules}" var="rule">
<div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">
<p class="${rule.included ? '' : 'excluded'}">
<b>${rule.included ? '+' : '-'}</b>
<b><c:out value="${rule.included ? '+' : '-'}" /></b>
<c:out value="${rule.genus}" />
<c:out value="${rule.species eq null ? '*' : rule.species}" />
</p>
......
src/main/webapp/WEB-INF/jsp/accession/data.jsp
View file @ e923f380
......@@ -14,7 +14,7 @@
<div class="main-col-header clearfix">
<div class="nav-header pull-left">
<div class="results"><spring:message code="accessions.number" arguments="${pagedData.totalElements}" />
<a href="<c:url value="/explore/map"><c:param name="filter">${jsonFilter}</c:param></c:url>">Map</a></div>
<a href="<c:url value="/explore/map"><c:param name="filter" value="${jsonFilter}" /></c:url>">Map</a></div>
<div class="pagination">
<spring:message code="paged.pageOfPages" arguments="${pagedData.number+1},${pagedData.totalPages}" />
<a href="<spring:url value=""><spring:param name="page" value="${pagedData.number eq 0 ? 1 : pagedData.number}" /><spring:param name="filter" value="${jsonFilter}" /></spring:url>"><spring:message code="pagination.previous-page" /></a>
......@@ -38,10 +38,10 @@
<spring:message code="${by}" />: <b>
<c:choose>
<c:when test="${clazz eq 'Taxonomy'}">
${filters[by].taxonName}
<c:out value="${filters[by].taxonName}" />
</c:when>
<c:when test="${clazz eq 'Crop'}">
<a href="<c:url value="/c/${filters[by].shortName}" />">${filters[by].getName(pageContext.response.locale)}</a>
<a href="<c:url value="/c/${filters[by].shortName}" />"><c:out value="${filters[by].getName(pageContext.response.locale)}" /></a>
</c:when>
<c:when test="${clazz eq 'Country'}">
<a href="<c:url value="/geo/${filters[by].code3}" />"><c:out value="${filters[by].getName(pageContext.response.locale)}" /></a>
......@@ -53,7 +53,7 @@
<a href="<c:url value="/org/${filters[by].slug}" />"><c:out value="${filters[by].title}" /></a>
</c:when>
<c:otherwise>
${filters[by]}
<c:out value="${filters[by]}" />
</c:otherwise>
</c:choose>
</b>
......@@ -81,7 +81,7 @@
<tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status">
<tr class="acn ${status.count % 2 == 0 ? 'even' : 'odd'}">
<td class="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td class="idx-col"><c:out value="${status.count + pagedData.size * pagedData.number}" /></td>
<td class="sel" x-aid="${accession.id}"></td>
<td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.taxonName}" /></a></td> --%>
......
src/main/webapp/WEB-INF/jsp/accession/details-turtle.jsp
View file @ e923f380
......@@ -11,7 +11,7 @@
@prefix germplasm: <http://purl.org/germplasm/germplasmTerm#> .
@prefix germplasmType: <http://purl.org/germplasm/germplasmType#> .
<http://www.genesys-pgr.org/acn/id/${accession.id}>
<<c:url value="http://www.genesys-pgr.org/acn/id/${accession.id}" />>
a germplasm:GermplasmAccession;
germplasm:germplasmID "<c:out value="${accession.id}" />";
dc:identifier "urn:uuid:<c:out value="${accession.uuid}" />";
......
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @ e923f380
......@@ -49,28 +49,6 @@
<spring:message code="accession.available-for-distribution" />
</gui:alert>
--%>
<%--
<div itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="<c:url value="/wiews/${accession.institute.code}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.institute.fullName}</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="<c:url value="/wiews/${accession.institute.code}/data" />" itemprop="url">
<span itemprop="title" dir="ltr">Accessions</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a title="<spring:message code="accession.taxonomy-at-institute" arguments="${accession.taxonomy.genus}|||${accession.institute.code}" argumentSeparator="|||" />" href="<c:url value="/wiews/${accession.institute.code}/t/${accession.taxonomy.genus}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.taxonomy.genus}</span>
</a> ›
<span itemprop="child" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
<a title="<spring:message code="accession.taxonomy-at-institute" arguments="${accession.taxonomy.genus} ${accession.taxonomy.species}|||${accession.institute.code}" argumentSeparator="|||" />" href="<c:url value="/wiews/${accession.institute.code}/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />" itemprop="url">
<span itemprop="title" dir="ltr">${accession.taxonomy.genus} ${accession.taxonomy.species}</span>
</a>
</span>
</span>
</span>
</div>
--%>
<div class="pseudo-right-col col-md-3">
<c:if test="${accessionGeo.latitude ne null and accessionGeo.longitude ne null}">
......@@ -151,7 +129,7 @@
<spring:message code="accession.origin" />
</div>
<div class="col-xs-8">
<img class="flag" src="<c:url value="${cdnFlagsUrl}" />/${accession.origin.toUpperCase()}.svg" /> <a
<img class="flag" src="<c:url value="${cdnFlagsUrl}/${accession.origin.toUpperCase()}.svg" />" /> <a
href="<c:url value="/geo/${accession.origin}" />"
> <c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" />
</a>
......@@ -242,10 +220,10 @@
<div>
<c:out value="${accessionAlias.name}" />
<c:if test="${accessionAlias.instCode != ''}">
<a href="<c:url value="/wiews/${accessionAlias.instCode}" />"> ${accessionAlias.instCode} </a>
<a href="<c:url value="/wiews/${accessionAlias.instCode}" />"><c:out value="${accessionAlias.instCode}" /></a>
</c:if>
<c:if test="${accessionAlias.usedBy != ''}">
${accessionAlias.usedBy}
<c:out value="${accessionAlias.usedBy}" />
</c:if>
<c:if test="${accessionAlias.lang != ''}">
<c:out value="${accessionAlias.lang}" />
......@@ -277,16 +255,16 @@
</div>
<div class="col-xs-8">
<c:if test="${accessionExchange.donorInstitute eq null}">
${accessionExchange.donorName}
<c:out value="${accessionExchange.donorName}" />
</c:if>
${accessionExchange.donorInstitute}
<c:out value="${accessionExchange.donorInstitute}" />
</div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.donor.accessionNumber" />
</div>
<div class="col-xs-8">${accessionExchange.accNumbDonor}</div>
<div class="col-xs-8"><c:out value="${accessionExchange.accNumbDonor}" /></div>
</div>
</c:if>
......@@ -304,7 +282,7 @@
<spring:message code="accession.purl" />
</div>
<div class="col-xs-8">
<span property="dc:identifier"><a href="https://purl.org/germplasm/id/${accession.uuid}"><c:out
<span property="dc:identifier"><a href="<c:url value="https://purl.org/germplasm/id/${accession.uuid}" />"><c:url
value="https://purl.org/germplasm/id/${accession.uuid}"
/></a></span>
</div>
......@@ -318,7 +296,7 @@
<spring:message code="accession.acceUrl" />
</div>
<div class="col-xs-8">
<a target="_blank" href="<c:out value="${accession.acceUrl}" />"><c:out value="${accession.acceUrl}" /></a>
<a target="_blank" href="<c:url value="${accession.acceUrl}" />"><c:url value="${accession.acceUrl}" /></a>
</div>
</div>
</c:if>
......@@ -330,7 +308,7 @@
<div class="row imagegallery thumbs" id="accession-images-thumbs">
<c:forEach items="${imageGallery.images}" var="image">
<div x-uuid="<c:out value="${image.uuid}" />" x-ext="<c:out value="${image.extension}" />" style="cursor: pointer;" class="col-xs-6 col-sm-3 col-md-2 col-lg-2">
<img src="<c:url value="/repository/d${image.path}_thumb/${thumbnailFormat}_${image.uuid}.png" />" alt="${image.title}" />
<img src="<c:url value="/repository/d${image.path}_thumb/${thumbnailFormat}_${image.uuid}.png" />" alt="<c:out value="${image.title}" />" />
</div>
</c:forEach>
</div>
......@@ -364,14 +342,14 @@
<div class="col-xs-4">
<spring:message code="accession.collecting.institute" />
</div>
<div class="col-xs-8">${accessionCollect.collCode}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collCode}" /></div>
</div>
<c:if test="${accessionCollect.collName ne null}">
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.collecting.institute" />
</div>
<div class="col-xs-8">${accessionCollect.collName}${accessionCollect.collInstAddress}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collName}${accessionCollect.collInstAddress}" /></div>
</div>
</c:if>
<div class="row">
......@@ -387,19 +365,19 @@
<div class="col-xs-4">
<spring:message code="accession.collecting.date" />
</div>
<div class="col-xs-8">${accessionCollect.collDate}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collDate}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.collecting.number" />
</div>
<div class="col-xs-8">${accessionCollect.collNumb}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collNumb}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.collecting.site" />
</div>
<div class="col-xs-8">${accessionCollect.collSite}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collSite}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
......@@ -420,13 +398,13 @@
<div class="col-xs-4">
<spring:message code="accession.breederCode" />
</div>
<div class="col-xs-8">${accessionBreeding.breederCode}</div>
<div class="col-xs-8"><c:out value="${accessionBreeding.breederCode}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.pedigree" />
</div>
<div class="col-xs-8">${accessionBreeding.pedigree}</div>
<div class="col-xs-8"><c:out value="${accessionBreeding.pedigree}" /></div>
</div>
</c:if>
......@@ -441,7 +419,7 @@
<div class="col-xs-4">
<spring:message code="accession.collecting.site" />
</div>
<div class="col-xs-8">${accessionCollect.collSite}</div>
<div class="col-xs-8"><c:out value="${accessionCollect.collSite}" /></div>
</div>
</c:if>
<c:if test="${accessionGeo.latitude ne null}">
......@@ -449,7 +427,7 @@
<div class="col-xs-4">
<spring:message code="accession.geolocation" />
</div>
<div class="col-xs-8">${accessionGeo.latitude},${accessionGeo.longitude}</div>
<div class="col-xs-8"><c:out value="${accessionGeo.latitude}, ${accessionGeo.longitude}" /></div>
</div>
</c:if>
<c:if test="${accessionGeo.elevation ne null}">
......@@ -457,7 +435,7 @@
<div class="col-xs-4">
<spring:message code="accession.elevation" />
</div>
<div class="col-xs-8">${accessionGeo.elevation}<span class="uom">m</span>
<div class="col-xs-8"><c:out value="${accessionGeo.elevation}" /><span class="uom">m</span>
</div>
</div>
</c:if>
......@@ -465,20 +443,20 @@
<div class="col-xs-4">
<spring:message code="accession.geo.datum" />
</div>
<div class="col-xs-8">${accessionGeo.datum}</div>
<div class="col-xs-8"><c:out value="${accessionGeo.datum}" /></div>
</div>
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.geo.method" />
</div>
<div class="col-xs-8">${accessionGeo.method}</div>
<div class="col-xs-8"><c:out value="${accessionGeo.method}" /></div>
</div>
<c:if test="${accessionGeo.uncertainty ne null}">
<div class="row">
<div class="col-xs-4">
<spring:message code="accession.geo.uncertainty" />
</div>
<div class="col-xs-8">${accessionGeo.uncertainty}<span class="uom">m</span>
<div class="col-xs-8"><c:out value="${accessionGeo.uncertainty}" /><span class="uom">m</span>
</div>
</div>
</c:if>
......@@ -580,7 +558,7 @@
<c:forEach items="${worldclimJson.other.keySet()}" var="worldclimDescriptor">
<div class="row">
<div class="col-xs-4"><c:out value="${worldclimDescriptor.title}" /></div>
<div class="col-xs-8"><fmt:formatNumber value="${worldclimJson.other[worldclimDescriptor]}" /><span class="uom">${worldclimDescriptor.uom}</span></div>
<div class="col-xs-8"><fmt:formatNumber value="${worldclimJson.other[worldclimDescriptor]}" /><span class="uom"><c:out value="${worldclimDescriptor.uom}" /></span></div>
</div>
</c:forEach>
--%>
......@@ -597,9 +575,9 @@
<spring:message code="accession.svalbard-data.url" />
</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}"
><spring:message code="accession.svalbard-data.url-text" arguments="${accession.accessionName}" /></a>
<a target="_blank" href="<c:url value="http://nordgen.org/sgsv/index.php?app=data_unit&unit=sgsv&unit_id=${svalbardData.unitId}" />"
title="<spring:message code="accession.svalbard-data.url-title" />">
<spring:message code="accession.svalbard-data.url-text" arguments="${accession.accessionName}" /></a>
</div>
</div>
</c:if>
......@@ -608,26 +586,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">