Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
eade6849
Commit
eade6849
authored
Aug 05, 2016
by
Matija Obreza
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using HTTPS for tiles and updated SGSV URL
parent
00b37ce1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
src/main/webapp/WEB-INF/jsp/accession/details.jsp
src/main/webapp/WEB-INF/jsp/accession/details.jsp
+7
-7
No files found.
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
eade6849
...
@@ -579,7 +579,7 @@
...
@@ -579,7 +579,7 @@
</div>
</div>
<div
class=
"col-xs-8"
>
<div
class=
"col-xs-8"
>
<a
target=
"_blank"
title=
"
<spring:message
code=
"accession.svalbard-data.url-title"
/>
"
<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}
"
href=
"
<c:url
value=
"http://www.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>
><spring:message
code=
"accession.svalbard-data.url-text"
arguments=
"
${
accession
.
accessionName
}
"
/></a>
</div>
</div>
</div>
</div>
...
@@ -589,26 +589,26 @@
...
@@ -589,26 +589,26 @@
<div
class=
"col-xs-4"
>
<div
class=
"col-xs-4"
>
<spring:message
code=
"accession.svalbard-data.taxonomy"
/>
<spring:message
code=
"accession.svalbard-data.taxonomy"
/>
</div>
</div>
<div
class=
"col-xs-8"
>
${svalbardData.taxonomy}
</div>
<div
class=
"col-xs-8"
>
<c:out
value=
"
${
svalbardData
.
taxonomy
}
"
/>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-4"
>
<div
class=
"col-xs-4"
>
<spring:message
code=
"accession.svalbard-data.depositDate"
/>
<spring:message
code=
"accession.svalbard-data.depositDate"
/>
</div>
</div>
<div
class=
"col-xs-8"
>
${svalbardData.depositDate}
</div>
<div
class=
"col-xs-8"
>
<c:out
value=
"
${
svalbardData
.
depositDate
}
"
/>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-4"
>
<div
class=
"col-xs-4"
>
<spring:message
code=
"accession.svalbard-data.boxNumber"
/>
<spring:message
code=
"accession.svalbard-data.boxNumber"
/>
</div>
</div>
<div
class=
"col-xs-8"
>
${svalbardData.boxNumber}
</div>
<div
class=
"col-xs-8"
>
<c:out
value=
"
${
svalbardData
.
boxNumber
}
"
/>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-xs-4"
>
<div
class=
"col-xs-4"
>
<spring:message
code=
"accession.svalbard-data.quantity"
/>
<spring:message
code=
"accession.svalbard-data.quantity"
/>
</div>
</div>
<div
class=
"col-xs-8"
>
${svalbardData.quantity}
</div>
<div
class=
"col-xs-8"
>
<c:out
value=
"
${
svalbardData
.
quantity
}
"
/>
</div>
</div>
</div>
<c:if
test=
"
${
svalbardData
.
acceUrl
ne
null
}
"
>
<c:if
test=
"
${
svalbardData
.
acceUrl
ne
null
}
"
>
...
@@ -617,7 +617,7 @@
...
@@ -617,7 +617,7 @@
<spring:message
code=
"accession.acceUrl"
/>
<spring:message
code=
"accession.acceUrl"
/>
</div>
</div>
<div
class=
"col-xs-8"
>
<div
class=
"col-xs-8"
>
<a
href=
"
<c:
out
value=
"
${
svalbardData
.
acceUrl
}
"
/>
"
><c:out
value=
"
${
svalbardData
.
acceUrl
}
"
/></a>
<a
href=
"
<c:
url
value=
"
${
svalbardData
.
acceUrl
}
"
/>
"
><c:out
value=
"
${
svalbardData
.
acceUrl
}
"
/></a>
</div>
</div>
</div>
</div>
</c:if>
</c:if>
...
@@ -731,7 +731,7 @@
...
@@ -731,7 +731,7 @@
<script
type=
"text/javascript"
>
<script
type=
"text/javascript"
>
jQuery
(
document
).
ready
(
function
()
{
jQuery
(
document
).
ready
(
function
()
{
var
map
=
L
.
map
(
'
map
'
).
setView
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}],
2
);
var
map
=
L
.
map
(
'
map
'
).
setView
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}],
2
);
L
.
tileLayer
(
'
http://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}
'
,
{
L
.
tileLayer
(
'
http
s
://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}
'
,
{
attribution
:
'
Tiles © Esri — Esri, DeLorme, NAVTEQ
'
,
attribution
:
'
Tiles © Esri — Esri, DeLorme, NAVTEQ
'
,
maxZoom
:
16
maxZoom
:
16
}).
addTo
(
map
);
}).
addTo
(
map
);
...
...
Matija Obreza
@mobreza
mentioned in commit
e0b728a2
·
Sep 01, 2016
mentioned in commit
e0b728a2
mentioned in commit e0b728a2f99a0c0431057ec1b9d662e8ce1d5e3c
Toggle commit list
Write
Preview
Markdown
is supported
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