Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
d4e9d562
Commit
d4e9d562
authored
Jul 02, 2014
by
Matija Obreza
Browse files
Use case insensitive WIEWS and ISO3 codes
parent
962bbbcd
Changes
22
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/servlet/controller/CountryController.java
View file @
d4e9d562
...
...
@@ -61,6 +61,11 @@ public class CountryController extends BaseController {
@RequestMapping
(
"/{country}"
)
public
String
view
(
ModelMap
model
,
@PathVariable
(
value
=
"country"
)
String
countryStr
)
{
_logger
.
debug
(
"Viewing country "
+
countryStr
);
if
(!
countryStr
.
toUpperCase
().
equals
(
countryStr
))
{
return
"redirect:/geo/"
+
countryStr
.
toUpperCase
();
}
Country
country
=
geoService
.
getCountry
(
countryStr
);
if
(
country
==
null
)
{
throw
new
ResourceNotFoundException
();
...
...
@@ -111,7 +116,7 @@ public class CountryController extends BaseController {
geoService
.
updateBlurp
(
country
,
blurp
,
getLocale
());
return
"redirect:/geo/"
+
country
.
getCode3
()
.
toLowerCase
()
;
return
"redirect:/geo/"
+
country
.
getCode3
();
}
@RequestMapping
(
"/{country}/data"
)
...
...
src/main/java/org/genesys2/server/servlet/controller/WiewsController.java
View file @
d4e9d562
...
...
@@ -92,6 +92,11 @@ public class WiewsController extends BaseController {
@RequestMapping
(
"/{wiewsCode}"
)
public
String
view
(
ModelMap
model
,
@PathVariable
(
value
=
"wiewsCode"
)
String
wiewsCode
)
{
_logger
.
debug
(
"Viewing institute "
+
wiewsCode
);
if
(!
wiewsCode
.
toUpperCase
().
equals
(
wiewsCode
))
{
return
"redirect:/wiews/"
+
wiewsCode
.
toUpperCase
();
}
FaoInstitute
faoInstitute
=
instituteService
.
getInstitute
(
wiewsCode
);
if
(
faoInstitute
==
null
)
{
throw
new
ResourceNotFoundException
();
...
...
src/main/webapp/WEB-INF/jsp/accession/data.jsp
View file @
d4e9d562
...
...
@@ -44,10 +44,10 @@
<a
href=
"
<c:url
value=
"/c/${filters[by].shortName}"
/>
"
>
${filters[by].getName(pageContext.response.locale)}
</a>
</c:when>
<c:when
test=
"
${
clazz
eq
'Country'
}
"
>
<a
href=
"
<c:url
value=
"/geo/${filters[by].code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
filters
[
by
].
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
<a
href=
"
<c:url
value=
"/geo/${filters[by].code3}"
/>
"
><c:out
value=
"
${
filters
[
by
].
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
</c:when>
<c:when
test=
"
${
clazz
eq
'FaoInstitute'
}
"
>
<a
href=
"
<c:url
value=
"/wiews/${filters[by].code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
filters
[
by
].
fullName
}
"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${filters[by].code}"
/>
"
><c:out
value=
"
${
filters
[
by
].
fullName
}
"
/></a>
</c:when>
<c:when
test=
"
${
clazz
eq
'Organization'
}
"
>
<a
href=
"
<c:url
value=
"/org/${filters[by].slug}"
/>
"
><c:out
value=
"
${
filters
[
by
].
title
}
"
/></a>
...
...
@@ -86,11 +86,11 @@
<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> --%>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin
.toLowerCase()
}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<td
class=
"notimportant"
><c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></td>
<td
class=
"notimportant"
><spring:message
code=
"accession.sampleStatus.${accession.sampleStatus}"
/></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td><a href="<c:url value="/geo/${accession.institute.country.code3
.toLowerCase()
}" />"><c:out value="${accession.institute.country.name}" /></a></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.name}" /></a></td>
--%>
</tr>
</c:forEach>
...
...
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
d4e9d562
...
...
@@ -76,12 +76,12 @@
<tbody>
<tr>
<td><spring:message
code=
"accession.holdingInstitute"
/></td>
<td><a
property=
"dwc:instituteId"
href=
"
<c:url
value=
"/wiews/${accession.instituteCode
.toLowerCase()
}"
/>
"
>
<c:out
value=
"
${
accession
.
institute
.
fullName
}
"
/>
<td><a
property=
"dwc:instituteId"
href=
"
<c:url
value=
"/wiews/${accession.instituteCode}"
/>
"
>
<c:out
value=
"
${
accession
.
institute
.
fullName
}
"
/>
</a></td>
</tr>
<tr>
<td><spring:message
code=
"accession.holdingCountry"
/></td>
<td><a
href=
"
<c:url
value=
"/geo/${accession.institute.country.code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></td>
<td><a
href=
"
<c:url
value=
"/geo/${accession.institute.country.code3}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></td>
</tr>
<tr>
<td><spring:message
code=
"accession.accessionName"
/></td>
...
...
@@ -106,7 +106,7 @@
<c:if
test=
"
${
accession
.
countryOfOrigin
ne
null
}
"
>
<tr>
<td><spring:message
code=
"accession.origin"
/></td>
<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
)
}
"
/>
<td><img
src=
"
<c:url
value=
"
${
cdnFlagsUrl
}
"
/>
/${accession.origin.toUpperCase()}.png"
/>
<a
href=
"
<c:url
value=
"/geo/${accession.origin}"
/>
"
>
<c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/>
</a></td>
</tr>
</c:if>
...
...
@@ -119,7 +119,7 @@
<td><spring:message
code=
"taxonomy.species"
/></td>
<td><a
href=
"
<c:url
value=
"/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}"
/>
"
><c:out
value=
"
${
accession
.
taxonomy
.
genus
}
${accession.taxonomy.species}"
/></a>
<br
/>
<a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}/t/${accession.taxonomy.genus}/${accession.taxonomy.species}"
/>
"
><spring:message
code=
"accession.taxonomy-at-institute"
arguments=
"
${
accession
.
taxonomy
.
genus
}
${accession.taxonomy.species}|||${accession.institute.code}"
argumentSeparator=
"|||"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}/t/${accession.taxonomy.genus}/${accession.taxonomy.species}"
/>
"
><spring:message
code=
"accession.taxonomy-at-institute"
arguments=
"
${
accession
.
taxonomy
.
genus
}
${accession.taxonomy.species}|||${accession.institute.code}"
argumentSeparator=
"|||"
/></a>
</td>
</tr>
<tr>
...
...
@@ -151,7 +151,7 @@
<div>
<c:out
value=
"
${
accessionAlias
.
name
}
"
/>
<c:if
test=
"
${
accessionAlias
.
instCode
!=
''
}
"
>
<a
href=
"
<c:url
value=
"/wiews/${accessionAlias.instCode
.toLowerCase()
}"
/>
"
>
<a
href=
"
<c:url
value=
"/wiews/${accessionAlias.instCode}"
/>
"
>
${accessionAlias.instCode}
</a>
</c:if>
...
...
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
View file @
d4e9d562
...
...
@@ -238,11 +238,11 @@
<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> --%>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin
.toLowerCase()
}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<td
class=
"notimportant"
><c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></td>
<td
class=
"notimportant"
><spring:message
code=
"accession.sampleStatus.${accession.sampleStatus}"
/></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td><a href="<c:url value="/geo/${accession.institute.country.code3
.toLowerCase()
}" />"><c:out value="${accession.institute.country.name}" /></a></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.name}" /></a></td>
--%>
</tr>
</c:forEach>
...
...
src/main/webapp/WEB-INF/jsp/accession/resolve.jsp
View file @
d4e9d562
...
...
@@ -25,8 +25,8 @@
<td><a
href=
"
<c:url
value=
"/acn/id/${accession.id}"
/>
"
><b><c:out
value=
"
${
accession
.
accessionName
}
"
/></b></a></td>
<td><c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></td>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<td><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<td><a
href=
"
<c:url
value=
"/geo/${accession.institute.country.code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></td>
<td><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<td><a
href=
"
<c:url
value=
"/geo/${accession.institute.country.code3}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></td>
</tr>
</c:forEach>
</tbody>
...
...
src/main/webapp/WEB-INF/jsp/admin/oauth/client/edit.jsp
View file @
d4e9d562
...
...
@@ -22,7 +22,7 @@
</div>
<input
type=
"submit"
value=
"
<spring:message
code=
"blurp.update-blurp"
/>
"
class=
"btn btn-primary"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}"
/>
"
class=
"btn btn-default"
>
<spring:message
code=
"cancel"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3}"
/>
"
class=
"btn btn-default"
>
<spring:message
code=
"cancel"
/>
</a>
<!-- CSRF protection -->
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
...
...
src/main/webapp/WEB-INF/jsp/country/details.jsp
View file @
d4e9d562
...
...
@@ -17,7 +17,7 @@
<spring:message
code=
"country.page.not-current"
/>
<c:if
test=
"
${
country
.
replacedBy
!=
null
}
"
>
<spring:message
code=
"country.replaced-by"
arguments=
"
${
country
.
replacedBy
.
code3
}
"
/>
<a
href=
"${country.replacedBy.code3
.toLowerCase()
}"
><c:out
value=
"
${
country
.
replacedBy
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
<a
href=
"${country.replacedBy.code3}"
><c:out
value=
"
${
country
.
replacedBy
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
</c:if>
</div>
</c:if>
...
...
@@ -25,12 +25,12 @@
<div
class=
"jumbotron"
>
<spring:message
code=
"country.stat.countByOrigin"
arguments=
"
${
countByOrigin
}
"
/>
<c:if
test=
"
${
countByOrigin
gt
0
}
"
>
<a
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
<a
href=
"
<c:url
value=
"/geo/${country.code3}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
</c:if>
</div>
<security:authorize
access=
"hasRole('ADMINISTRATOR')"
>
<a
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}/edit"
/>
"
class=
"close"
>
<spring:message
code=
"edit"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3}/edit"
/>
"
class=
"close"
>
<spring:message
code=
"edit"
/>
</a>
</security:authorize>
...
...
@@ -80,7 +80,7 @@
</h3>
<ul
class=
"funny-list"
>
<c:forEach
items=
"
${
genesysInstitutes
}
"
var=
"faoInstitute"
varStatus=
"status"
>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show pull-left"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show pull-left"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
<div
class=
"pull-right"
>
<spring:message
code=
"faoInstitute.accessionCount"
arguments=
"
${
faoInstitute
.
accessionCount
}
"
/>
</div></li>
...
...
@@ -93,7 +93,7 @@
<ul
class=
"funny-list"
>
<c:forEach
items=
"
${
faoInstitutes
}
"
var=
"faoInstitute"
varStatus=
"status"
>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a></li>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a></li>
</c:forEach>
</ul>
...
...
@@ -111,7 +111,7 @@
<c:forEach
items=
"
${
genesysInstitutes
}
"
var=
"faoInstitute"
varStatus=
"status"
>
<c:if
test=
"
${
faoInstitute
.
latitude
ne
null
and
faoInstitute
.
longitude
ne
null
}
"
>
marker
=
L
.
marker
([
$
{
faoInstitute
.
latitude
},
$
{
faoInstitute
.
longitude
}]).
addTo
(
map
);
marker
.
bindPopup
(
"
<a href='
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}"
/>
'>${faoInstitute.fullName}</a>
"
);
marker
.
bindPopup
(
"
<a href='
<c:url
value=
"/wiews/${faoInstitute.code}"
/>
'>${faoInstitute.fullName}</a>
"
);
bounds
.
add
([
$
{
faoInstitute
.
latitude
},
$
{
faoInstitute
.
longitude
}]);
</c:if>
</c:forEach>
...
...
src/main/webapp/WEB-INF/jsp/country/edit.jsp
View file @
d4e9d562
...
...
@@ -12,7 +12,7 @@
<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"
>
<form
role=
"form"
class=
""
action=
"
<c:url
value=
"/geo/${country.code3}/update"
/>
"
method=
"post"
>
<div
class=
"form-group"
>
<label
for=
"blurp-body"
class=
"control-label"
><spring:message
code=
"blurp.blurp-body"
/></label>
<div
class=
"controls"
>
...
...
@@ -23,7 +23,7 @@
</div>
<input
type=
"submit"
value=
"
<spring:message
code=
"blurp.update-blurp"
/>
"
class=
"btn btn-primary"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}"
/>
"
class=
"btn btn-default"
>
<spring:message
code=
"cancel"
/>
<a
href=
"
<c:url
value=
"/geo/${country.code3}"
/>
"
class=
"btn btn-default"
>
<spring:message
code=
"cancel"
/>
</a>
<!-- CSRF protection -->
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
...
...
src/main/webapp/WEB-INF/jsp/country/index.jsp
View file @
d4e9d562
...
...
@@ -39,7 +39,7 @@
<small><a
href=
"#letter-top"
><spring:message
code=
"jump-to-top"
/></a></small>
</li>
</c:if>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show ${not country.current ? 'disabled' : ''}"
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></li>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show ${not country.current ? 'disabled' : ''}"
href=
"
<c:url
value=
"/geo/${country.code3}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></li>
</c:forEach>
</ul>
<c:remove
var=
"hoofdleter"
/>
...
...
src/main/webapp/WEB-INF/jsp/country/map.jsp
View file @
d4e9d562
...
...
@@ -13,7 +13,7 @@
</h1>
<div
class=
"main-col-header"
>
<a
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
<a
href=
"
<c:url
value=
"/geo/${country.code3}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a>
</div>
<c:if
test=
"
${
jsonInstitutes
ne
null
}
"
>
...
...
@@ -34,7 +34,7 @@
var
jsonInstitutes
=
$
{
jsonInstitutes
};
jsonInstitutes
.
forEach
(
function
(
inst
)
{
var
marker
=
L
.
marker
([
inst
.
lat
,
inst
.
lng
]).
addTo
(
map
);
marker
.
bindPopup
(
"
<a href='
<c:url
value=
"/wiews/"
/>
"
+
inst
.
code
.
toLowerCase
()
+
"
'>
"
+
inst
.
title
+
"
</a>
"
);
marker
.
bindPopup
(
"
<a href='
<c:url
value=
"/wiews/"
/>
"
+
inst
.
code
+
"
'>
"
+
inst
.
title
+
"
</a>
"
);
});
map
.
fitBounds
(
GenesysMaps
.
boundingBox
(
jsonInstitutes
));
});
...
...
src/main/webapp/WEB-INF/jsp/itpgrfa/countries.jsp
View file @
d4e9d562
...
...
@@ -41,7 +41,7 @@
<small><a
href=
"#letter-top"
><spring:message
code=
"jump-to-top"
/></a></small>
</li>
</c:if>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show ${not country.current ? 'disabled' : ''}"
href=
"
<c:url
value=
"/geo/${country.code3
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></li>
<li
class=
"${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show ${not country.current ? 'disabled' : ''}"
href=
"
<c:url
value=
"/geo/${country.code3}"
/>
"
><c:out
value=
"
${
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></a></li>
</c:forEach>
</ul>
<c:remove
var=
"hoofdleter"
/>
...
...
src/main/webapp/WEB-INF/jsp/metadata/view.jsp
View file @
d4e9d562
...
...
@@ -64,7 +64,7 @@
<c:if
test=
"
${
faoInstitute
ne
null
}
"
>
<p>
<a
class=
""
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
<a
class=
""
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
</p>
</c:if>
...
...
@@ -102,11 +102,11 @@
<td
class=
"idx-col"
>
${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="/geo/${accession.origin
.toLowerCase()
}" />"><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></a></td>
<%-- <td><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></a></td>
--%>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<%-- <td><a href="<c:url value="/wiews/${accession.institute.code
.toLowerCase()
}" />"><c:out value="${accession.institute.code}" /></a></td>
<td><a href="<c:url value="/geo/${accession.institute.country.code3
.toLowerCase()
}" />"><c:out value="${accession.institute.country.getName(pageContext.response.locale)}" /></a></td>
<%-- <td><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></td>
<td><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.getName(pageContext.response.locale)}" /></a></td>
--%>
<c:set
value=
"
${
accessionMethods
[
accession
.
id
]
}
"
var=
"methodValues"
/>
...
...
src/main/webapp/WEB-INF/jsp/organization/details.jsp
View file @
d4e9d562
...
...
@@ -53,7 +53,7 @@
<c:set
var=
"countryName"
value=
"
${
faoInstitute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/>
<li
class=
"hoofdleter"
id=
"nav-${faoInstitute.country.code3}"
><c:out
value=
"
${
countryName
}
"
/>
<small><a
href=
"#"
><spring:message
code=
"jump-to-top"
/></a></small></li>
</c:if>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show pull-left"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><a
class=
"show pull-left"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}"
/>
"
><b><c:out
value=
"
${
faoInstitute
.
code
}
"
/></b>
<c:out
value=
"
${
faoInstitute
.
fullName
}
"
/></a>
<div
class=
"pull-right"
>
<spring:message
code=
"faoInstitute.accessionCount"
arguments=
"
${
faoInstitute
.
accessionCount
}
"
/>
</div></li>
...
...
src/main/webapp/WEB-INF/jsp/organization/map.jsp
View file @
d4e9d562
...
...
@@ -37,7 +37,7 @@
var
jsonInstitutes
=
$
{
jsonInstitutes
};
jsonInstitutes
.
forEach
(
function
(
inst
)
{
var
marker
=
L
.
marker
([
inst
.
lat
,
inst
.
lng
]).
addTo
(
map
);
marker
.
bindPopup
(
'
<a href="
<c:url
value=
"/wiews/"
/>
'
+
inst
.
code
.
toLowerCase
()
+
'
">
'
+
inst
.
title
+
'
</a>
'
);
marker
.
bindPopup
(
'
<a href="
<c:url
value=
"/wiews/"
/>
'
+
inst
.
code
+
'
">
'
+
inst
.
title
+
'
</a>
'
);
});
map
.
fitBounds
(
GenesysMaps
.
boundingBox
(
jsonInstitutes
));
});
...
...
src/main/webapp/WEB-INF/jsp/request/index.jsp
View file @
d4e9d562
...
...
@@ -56,7 +56,7 @@
<td><a
href=
"
<c:url
value=
"/acn/id/${accession.id}"
/>
"
><b><c:out
value=
"
${
accession
.
accessionName
}
"
/></b></a></td>
<td
class=
"notimportant"
><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<%-- <td class="notimportant"><c:out value="${accession.countryOfOrigin.getName(pageContext.response.locale)}" /></td> --%>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
</tr>
</c:forEach>
</tbody>
...
...
src/main/webapp/WEB-INF/jsp/search/accessions.jsp
View file @
d4e9d562
...
...
@@ -73,10 +73,10 @@
<td><c:out
value=
"
${
name
}
"
/></td>
<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.taxonName}" /></a></td> --%>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin
.toLowerCase()
}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.origin}" />"><c:out value="${accession.countryOfOrigin.name}" /></a></td> --%>
<td
class=
"notimportant"
><c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></td>
<td
class=
"notimportant"
><spring:message
code=
"accession.sampleStatus.${accession.sampleStatus}"
/></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
</tr>
</c:forEach>
</tbody>
...
...
src/main/webapp/WEB-INF/jsp/search/index.jsp
View file @
d4e9d562
...
...
@@ -57,7 +57,7 @@
<a
href=
"
<c:url
value=
"/c/${searchResult.shortName}/data"
/>
"
>
${searchResult.name}
</a>
</c:when>
<c:when
test=
"
${
clazz
eq
'FaoInstitute'
}
"
>
<a
href=
"
<c:url
value=
"/wiews/${searchResult.code
.toLowerCase()
}"
/>
"
>
${searchResult.fullName}
</a>
<a
href=
"
<c:url
value=
"/wiews/${searchResult.code}"
/>
"
>
${searchResult.fullName}
</a>
${searchResult.code} ${searchResult.country.getName(pageContext.response.locale)}
</c:when>
<c:when
test=
"
${
clazz
eq
'Metadata'
}
"
>
...
...
@@ -67,7 +67,7 @@
${searchResult.title}
</c:when>
<c:when
test=
"
${
clazz
eq
'Country'
}
"
>
<a
href=
"
<c:url
value=
"/geo/${searchResult.code3
.toLowerCase()
}"
/>
"
>
${searchResult.getName(pageContext.response.locale)}
</a>
<a
href=
"
<c:url
value=
"/geo/${searchResult.code3}"
/>
"
>
${searchResult.getName(pageContext.response.locale)}
</a>
</c:when>
<c:when
test=
"
${
clazz
eq
'Article'
}
"
>
<a
href=
"
<c:url
value=
"/content/${searchResult.slug}"
/>
"
>
${searchResult.title}
</a>
...
...
src/main/webapp/WEB-INF/jsp/selection/index.jsp
View file @
d4e9d562
...
...
@@ -60,8 +60,8 @@
<td><a
href=
"
<c:url
value=
"/acn/id/${accession.id}"
/>
"
><b><c:out
value=
"
${
accession
.
accessionName
}
"
/></b></a></td>
<td><c:out
value=
"
${
accession
.
taxonomy
.
taxonName
}
"
/></td>
<td
class=
"notimportant"
><c:out
value=
"
${
accession
.
countryOfOrigin
.
getName
(
pageContext
.
response
.
locale
)
}
"
/></td>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code
.toLowerCase()
}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.institute.country.code3
.toLowerCase()
}" />"><c:out value="${accession.institute.country.getName(pageContext.response.locale)}" /></a></td> --%>
<td
class=
"notimportant"
><a
href=
"
<c:url
value=
"/wiews/${accession.institute.code}"
/>
"
><c:out
value=
"
${
accession
.
institute
.
code
}
"
/></a></td>
<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.institute.country.code3}" />"><c:out value="${accession.institute.country.getName(pageContext.response.locale)}" /></a></td> --%>
</tr>
</c:forEach>
</tbody>
...
...
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @
d4e9d562
...
...
@@ -16,7 +16,7 @@
<c:if
test=
"
${
not
faoInstitute
.
current
}
"
>
<div
class=
"alert alert-warning"
>
<spring:message
code=
"faoInstitute.institute-not-current"
/>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.vCode
.toLowerCase()
}"
/>
"
><spring:message
code=
"faoInstitute.view-current-institute"
arguments=
"
${
faoInstitute
.
vCode
}
"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.vCode}"
/>
"
><spring:message
code=
"faoInstitute.view-current-institute"
arguments=
"
${
faoInstitute
.
vCode
}
"
/></a>
</div>
</c:if>
...
...
@@ -29,18 +29,18 @@
<div
class=
"jumbotron"
>
<spring:message
code=
"faoInstitutes.stat.accessionCount"
arguments=
"
${
countByInstitute
}
"
/>
<c:if
test=
"
${
countByInstitute
gt
0
}
"
>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/data"
/>
"
><spring:message
code=
"view.accessions"
/></a>
</c:if>
<spring:message
code=
"faoInstitutes.stat.datasetCount"
arguments=
"
${
datasetCount
}
"
/>
<c:if
test=
"
${
datasetCount
gt
0
}
"
>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}/datasets"
/>
"
><spring:message
code=
"view.datasets"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/datasets"
/>
"
><spring:message
code=
"view.datasets"
/></a>
</c:if>
</div>
<div
class=
""
>
<security:authorize
access=
"hasRole('ADMINISTRATOR') or hasPermission(#faoInstitute, 'ADMINISTRATION')"
>
<a
href=
"
<c:url
value=
"/acl/${faoInstitute.class.name}/${faoInstitute.id}/permissions"
><c:param
name=
"back"
>
/wiews/${faoInstitute.code
.toLowerCase()
}
</c:param></c:url>
"
class=
"close"
>
<spring:message
code=
"edit-acl"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}/edit"
/>
"
class=
"close"
>
<a
href=
"
<c:url
value=
"/acl/${faoInstitute.class.name}/${faoInstitute.id}/permissions"
><c:param
name=
"back"
>
/wiews/${faoInstitute.code}
</c:param></c:url>
"
class=
"close"
>
<spring:message
code=
"edit-acl"
/></a>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/edit"
/>
"
class=
"close"
>
<spring:message
code=
"edit"
/>
</a>
</security:authorize>
...
...
@@ -53,7 +53,7 @@
<div
class=
"col-sm-4"
property=
"schema:Organization#location"
>
<spring:message
code=
"faoInstitute.country"
/>
:
<%-- <img src="<c:url value="${cdnFlagsUrl}" />/${faoInstitute.country.code3.toUpperCase()}.png" /> --%>
<a
href=
"
<c:url
value=
"/geo/${faoInstitute.country.code3
.toLowerCase()
}"
/>
"
>
<a
href=
"
<c:url
value=
"/geo/${faoInstitute.country.code3}"
/>
"
>
<span
typeof=
"schema:Country"
><span
property=
"schema:Country#name"
>
<c:out
value=
"
${
faoInstitute
.
country
.
getName
(
pageContext
.
response
.
locale
)
}
"
/>
</span></span>
...
...
@@ -119,7 +119,7 @@
<h4><spring:message code="faoInstitute.stat-by-crop" arguments="${statisticsCrop.numberOfElements}" /></h4>
<ul class="funny-list statistics">
<c:forEach items="${statisticsCrop.content}" var="stat" varStatus="status">
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"><span class="stats-number"><fmt:formatNumber value="${stat[1]}" /></span> <a href="<c:url value="/wiews/${faoInstitute.code
.toLowerCase()
}/" />"><c:out value="${stat[0].getName(pageContext.response.locale)}" /></a></li>
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"><span class="stats-number"><fmt:formatNumber value="${stat[1]}" /></span> <a href="<c:url value="/wiews/${faoInstitute.code}/" />"><c:out value="${stat[0].getName(pageContext.response.locale)}" /></a></li>
</c:forEach>
</ul>
</div>
...
...
@@ -138,7 +138,7 @@
<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"
>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><span
class=
"stats-number"
><fmt:formatNumber
value=
"
${
stat
[
1
]
}
"
/></span>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code
.toLowerCase()
}/t/${stat[0].genus}/${stat[0].species}"
/>
"
><c:out
value=
"
${
stat
[
0
].
taxonName
}
"
/></a></li>
<li
class=
"clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"
><span
class=
"stats-number"
><fmt:formatNumber
value=
"
${
stat
[
1
]
}
"
/></span>
<a
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/t/${stat[0].genus}/${stat[0].species}"
/>
"
><c:out
value=
"
${
stat
[
0
].
taxonName
}
"
/></a></li>
</c:forEach>
</ul>
</div>
...
...
@@ -146,7 +146,7 @@
</div>
<form
class=
"form-horizontal"
method=
"post"
action=
"/wiews/${faoInstitute.code
.toLowerCase()
}/dwca"
>
<form
class=
"form-horizontal"
method=
"post"
action=
"/wiews/${faoInstitute.code}/dwca"
>
<input
type=
"hidden"
name=
"${_csrf.parameterName}"
value=
"${_csrf.token}"
/>
<div
class=
"row"
style=
"margin-top: 2em;"
>
<div
class=
"col-sm-4"
>
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment