Skip to content
GitLab
Menu
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
5de135c9
Commit
5de135c9
authored
Dec 22, 2015
by
Matija Obreza
Browse files
Mini changes to maps base layers and institute details page
parent
baa64e8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/resources/content/language.properties
View file @
5de135c9
...
...
@@ -388,8 +388,6 @@ savedmaps.list=Map list
savedmaps.save
=
Remember map
taxonomy.subtaxa
=
Subtaxa
mapproviders.list
=
Providers list
filter.enter.title
=
Enter filter title
filters.page.title
=
Data filters
filters.view
=
Current filters
...
...
@@ -538,6 +536,7 @@ maps.loading-map=Loading map...
maps.view-map
=
View map
maps.accession-map
=
Accession map
maps.accession-map.intro
=
The map shows the collecting site of geo-referenced accessions.
maps.baselayer.list
=
Change map base layer
audit.createdBy
=
Created by {0}
audit.lastModifiedBy
=
Last updated by {0}
...
...
src/main/webapp/WEB-INF/jsp/accession/map.jsp
View file @
5de135c9
<!DOCTYPE html>
<%@include
file=
"/WEB-INF/jsp/init.jsp"
%>
...
...
@@ -32,7 +33,7 @@
<ul
class=
"nav nav-pills "
>
<li
style=
"margin-left: 5px"
class=
"active dropdown form-horizontal pull-right"
>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><spring:message
code=
"map
provid
er
s
.list"
/></a>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
><spring:message
code=
"map
s.baselay
er.list"
/></a>
<ul
class=
"dropdown-menu"
>
<li>
...
...
@@ -112,6 +113,12 @@
<script
type=
"text/javascript"
>
jQuery
(
document
).
ready
(
function
()
{
function
niceDec
(
d
,
b
)
{
if
(
b
==
null
)
b
=
5
;
var
x
=
Math
.
pow
(
10
,
b
);
return
d
===
null
?
null
:
Math
.
round
(
d
*
x
)
/
x
;
}
var
map
=
L
.
map
(
'
map
'
).
setView
([
20
,
0
],
2
);
var
topPane
=
map
.
_createPane
(
'
leaflet-top-pane
'
,
map
.
getPanes
().
mapPane
);
var
mapProviders
=
{
...
...
@@ -321,8 +328,8 @@
// Do something when the bounds change.
// Bounds are available in `e.bounds`.
var
bounds
=
locationFilter
.
getBounds
();
filterJson
[
'
geo.latitude
'
]
=
[{
range
:
[
bounds
.
getSouth
(),
bounds
.
getNorth
()]}];
filterJson
[
'
geo.longitude
'
]
=
[{
range
:
[
bounds
.
getWest
(),
bounds
.
getEast
()]}];
filterJson
[
'
geo.latitude
'
]
=
[{
range
:
[
niceDec
(
nice
bounds
.
getSouth
()
)
,
niceDec
(
bounds
.
getNorth
()
)
]}];
filterJson
[
'
geo.longitude
'
]
=
[{
range
:
[
niceDec
(
bounds
.
getWest
()
)
,
niceDec
(
bounds
.
getEast
()
)
]}];
});
map
.
on
(
"
viewreset
"
,
function
()
{
...
...
@@ -334,8 +341,8 @@
locationFilter
.
on
(
"
enabled
"
,
function
()
{
// Do something when enabled.
var
bounds
=
locationFilter
.
getBounds
();
filterJson
[
'
geo.latitude
'
]
=
[{
range
:
[
bounds
.
getSouth
(),
bounds
.
getNorth
()]}];
filterJson
[
'
geo.longitude
'
]
=
[{
range
:
[
bounds
.
getWest
(),
bounds
.
getEast
()]}];
filterJson
[
'
geo.latitude
'
]
=
[{
range
:
[
niceDec
(
bounds
.
getSouth
()
)
,
niceDec
(
bounds
.
getNorth
()
)
]}];
filterJson
[
'
geo.longitude
'
]
=
[{
range
:
[
niceDec
(
bounds
.
getWest
()
)
,
niceDec
(
bounds
.
getEast
()
)
]}];
$
(
"
#selectArea
"
).
show
();
});
...
...
src/main/webapp/WEB-INF/jsp/wiews/details.jsp
View file @
5de135c9
...
...
@@ -182,7 +182,7 @@
</li>
</ul>
<c:if
test=
"
${
datasetCount
gt
0
}
"
>
<spring:message
code=
"statistics.phenotypic.stats-text"
arguments=
"
${
statisticsPheno
.
elStats
}
"
/>
<p>
<spring:message
code=
"statistics.phenotypic.stats-text"
arguments=
"
${
statisticsPheno
.
elStats
}
"
/>
</p>
</c:if>
<c:if
test=
"
${
countByInstitute
gt
0
}
"
>
...
...
@@ -191,27 +191,42 @@
<div
class=
"row"
style=
"margin-top: 2em;"
>
<div
class=
"col-sm-12"
>
<a
class=
"btn btn-primary"
title=
"
<spring:message
code=
"faoInstitute.data-title"
arguments=
"
${
faoInstitute
.
fullName
}
"
/>
"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/data"
/>
"
>
<span
class=
"glyphicon glyphicon-list"
></span>
<spring:message
code=
"view.accessions"
/>
</a>
<a
class=
"btn btn-default"
title=
"
<spring:message
code=
"faoInstitute.overview-title"
arguments=
"
${
faoInstitute
.
fullName
}
"
/>
"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/overview"
/>
"
>
<span
class=
"glyphicon glyphicon-eye-open"
></span>
<spring:message
code=
"data-overview.short"
/>
</a>
<c:if
test=
"
${
datasetCount
gt
0
}
"
>
<a
title=
"
<spring:message
code=
"faoInstitute.datasets-title"
arguments=
"
${
faoInstitute
.
fullName
}
"
/>
"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/datasets"
/>
"
>
<a
class=
"btn btn-default"
title=
"
<spring:message
code=
"faoInstitute.datasets-title"
arguments=
"
${
faoInstitute
.
fullName
}
"
/>
"
href=
"
<c:url
value=
"/wiews/${faoInstitute.code}/datasets"
/>
"
>
<spring:message
code=
"view.datasets"
/>
</a>
</c:if>
<security:authorize
access=
"isAuthenticated()"
>
<button
name=
"mcpd"
class=
"btn btn-default"
type=
"submit"
>
<spring:message
code=
"filter.download-mcpd"
/>
</button>
<%-- <button name="pdci" class="btn btn-default" type="submit">
<spring:message code="filter.download-pdci" />
</button> --%>
</security:authorize>
<button
name=
"dwca"
class=
"btn btn-default"
type=
"submit"
>
<spring:message
code=
"metadata.download-dwca"
/>
</button>
<div
class=
"btn-group"
>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"glyphicon glyphicon-download"
></span><span><spring:message
code=
"download"
/></span>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
<security:authorize
access=
"isAuthenticated()"
>
<li>
<button
name=
"mcpd"
class=
"btn btn-inline"
type=
"submit"
>
<spring:message
code=
"filter.download-mcpd"
/>
</button>
<%-- <button name="pdci" class="btn btn-default" type="submit">
<spring:message code="filter.download-pdci" />
</button> --%>
</li>
</security:authorize>
<li>
<button
name=
"dwca"
class=
"btn btn-inline"
type=
"submit"
>
<spring:message
code=
"metadata.download-dwca"
/>
</button>
</li>
</ul>
</div>
</div>
</div>
</form>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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