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
13
Issues
13
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
5ae85913
Commit
5ae85913
authored
Feb 25, 2014
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GUI fixes
parent
ba5b1b3c
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
45 additions
and
26 deletions
+45
-26
src/main/webapp/WEB-INF/jsp/accession/details.jsp
src/main/webapp/WEB-INF/jsp/accession/details.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/accession/map.jsp
src/main/webapp/WEB-INF/jsp/accession/map.jsp
+3
-2
src/main/webapp/WEB-INF/jsp/country/index.jsp
src/main/webapp/WEB-INF/jsp/country/index.jsp
+8
-3
src/main/webapp/WEB-INF/jsp/wiews/index.jsp
src/main/webapp/WEB-INF/jsp/wiews/index.jsp
+14
-15
src/main/webapp/html/css/custom.css
src/main/webapp/html/css/custom.css
+19
-5
src/main/webapp/html/images/icon_row_select.png
src/main/webapp/html/images/icon_row_select.png
+0
-0
src/main/webapp/html/images/sel-add.png
src/main/webapp/html/images/sel-add.png
+0
-0
src/main/webapp/html/images/sel-add2.png
src/main/webapp/html/images/sel-add2.png
+0
-0
src/main/webapp/html/images/sel-remove.png
src/main/webapp/html/images/sel-remove.png
+0
-0
src/main/webapp/html/images/sel-remove2.png
src/main/webapp/html/images/sel-remove2.png
+0
-0
No files found.
src/main/webapp/WEB-INF/jsp/accession/details.jsp
View file @
5ae85913
...
...
@@ -364,7 +364,7 @@
<script
type=
"text/javascript"
>
L
.
Icon
.
Default
.
imagePath
=
'
<c:url
value=
"/html/css/leaflet"
/>
'
;
jQuery
(
document
).
ready
(
function
()
{
var
map
=
L
.
map
(
'
map
'
).
setView
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}],
5
);
var
map
=
L
.
map
(
'
map
'
).
setView
([
$
{
accessionGeo
.
latitude
},
$
{
accessionGeo
.
longitude
}],
2
);
L
.
tileLayer
(
'
https://otile{s}-s.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png
'
,
{
attribution
:
"
MapQuest
"
,
styleId
:
22677
,
...
...
src/main/webapp/WEB-INF/jsp/accession/map.jsp
View file @
5ae85913
...
...
@@ -13,8 +13,6 @@
<div
class=
"main-col-header"
>
<a
href=
"javascript: window.history.go(-1);"
><spring:message
code=
"navigate.back"
/></a>
</div>
<div
class=
"row"
>
<a
class=
""
href=
"
<c:url
value=
"/explore"
/>
"
id=
"selectArea"
>
View accessions
</a>
</div>
<div
class=
"row"
>
...
...
@@ -57,6 +55,9 @@
locationFilter
.
on
(
"
enabled
"
,
function
()
{
// Do something when enabled.
var
bounds
=
locationFilter
.
getBounds
();
filterJson
.
latitude
=
[{
range
:[
bounds
.
getSouth
(),
bounds
.
getNorth
()]}];
filterJson
.
longitude
=
[{
range
:[
bounds
.
getWest
(),
bounds
.
getEast
()]}];
$
(
"
#selectArea
"
).
show
();
});
...
...
src/main/webapp/WEB-INF/jsp/country/index.jsp
View file @
5ae85913
...
...
@@ -11,6 +11,14 @@
<spring:message
code=
"country.page.list.title"
/>
</h1>
<div
class=
"main-col-header clearfix"
>
<div
class=
"nav-header pull-left"
>
<div
class=
"results"
>
<spring:message
code=
"paged.totalElements"
arguments=
"
${
countries
.
size
()
}
"
/>
</div>
</div>
</div>
<div
id=
"letter-top"
class=
"main-col-header"
>
<c:set
value=
""
var=
"hoofdleter"
/>
<c:forEach
items=
"
${
countries
}
"
var=
"country"
varStatus=
"status"
>
...
...
@@ -21,9 +29,6 @@
</c:forEach>
</div>
<div
class=
"nav-header"
>
<spring:message
code=
"paged.totalElements"
arguments=
"
${
countries
.
size
()
}
"
/>
</div>
<c:set
value=
""
var=
"hoofdleter"
/>
<ul
class=
"funny-list"
>
...
...
src/main/webapp/WEB-INF/jsp/wiews/index.jsp
View file @
5ae85913
...
...
@@ -11,23 +11,22 @@
<spring:message
code=
"faoInstitutes.page.list.title"
/>
</h1>
<c:if
test=
"
${
activeOnly
eq
true
}
"
>
<div
class=
"main-col-header"
>
<a
href=
"
<c:url
value=
"/wiews/active/map"
/>
"
><spring:message
code=
"maps.view-map"
/></a>
<a
href=
"
<c:url
value=
"/wiews/"
/>
"
><spring:message
code=
"faoInstitutes.viewAll"
/></a>
<div
class=
"main-col-header clearfix"
>
<div
class=
"nav-header pull-left"
>
<div
class=
"results"
><spring:message
code=
"paged.totalElements"
arguments=
"
${
pagedData
.
totalElements
}
"
/>
<c:if
test=
"
${
activeOnly
eq
true
}
"
>
<a
href=
"
<c:url
value=
"/wiews/active/map"
/>
"
><spring:message
code=
"maps.view-map"
/></a>
<a
href=
"
<c:url
value=
"/wiews/"
/>
"
><spring:message
code=
"faoInstitutes.viewAll"
/></a>
</c:if>
<c:if
test=
"
${
activeOnly
ne
true
}
"
>
<a
href=
"
<c:url
value=
"/wiews/active"
/>
"
><spring:message
code=
"faoInstitutes.viewActiveOnly"
/></a>
</c:if>
</div>
</c:if>
<c:if
test=
"
${
activeOnly
ne
true
}
"
>
<div
class=
"main-col-header"
>
<a
href=
"
<c:url
value=
"/wiews/active"
/>
"
><spring:message
code=
"faoInstitutes.viewActiveOnly"
/></a>
<div
class=
"pagination"
>
<spring:message
code=
"paged.pageOfPages"
arguments=
"
${
pagedData
.
number
+
1
}
,${pagedData.totalPages}"
/>
<a
class=
"${pagedData.number eq 0 ? 'disabled' :''}"
href=
"?page=${pagedData.number eq 0 ? 1 : pagedData.number}"
><spring:message
code=
"pagination.previous-page"
/></a>
<a
href=
"?page=${pagedData.number + 2}"
><spring:message
code=
"pagination.next-page"
/></a>
</div>
</c:if>
<div
class=
"nav-header"
>
<spring:message
code=
"paged.totalElements"
arguments=
"
${
pagedData
.
totalElements
}
"
/>
<br
/>
<spring:message
code=
"paged.pageOfPages"
arguments=
"
${
pagedData
.
number
+
1
}
,${pagedData.totalPages}"
/>
<a
class=
"${pagedData.number eq 0 ? 'disabled' :''}"
href=
"?page=${pagedData.number eq 0 ? 1 : pagedData.number}"
><spring:message
code=
"pagination.previous-page"
/></a>
<a
href=
"?page=${pagedData.number + 2}"
><spring:message
code=
"pagination.next-page"
/></a>
</div>
</div>
<ul
class=
"funny-list"
>
...
...
src/main/webapp/html/css/custom.css
View file @
5ae85913
...
...
@@ -1048,13 +1048,27 @@ html[dir="rtl"] #stats .stat-lists ol li img {
padding
:
5px
0
5px
40px
;
}
.main-col
.acn
a
.add
{
background
:
url('../images/icon_add.png')
no-repeat
center
left
;
font-weight
:
bold
;
padding
:
7px
0
7px
35px
;
.main-col
.acn
.sel
a
:before
{
content
:
""
;
float
:
left
;
width
:
32px
;
height
:
32px
;
margin
:
0
;
padding
:
0
;
background
:
url('../images/icon_row_select.png')
no-repeat
;
}
.main-col
.acn
.sel
a
{
padding
:
7px
0
7px
7px
;
text-transform
:
uppercase
;
}
.main-col
.acn
a
.add
:before
{
background-position
:
-4px
-4px
;
}
.main-col
.acn
a
.remove
:before
{
background-position
:
-36px
-4px
;
}
.main-col
.acn
a
.download
{
background
:
url('../images/icon_download.png')
no-repeat
center
left
;
padding
:
7px
0
7px
35px
;
...
...
@@ -1231,7 +1245,7 @@ ul.funny-list {
background-repeat
:
no-repeat
;
background-position
:
center
left
;
cursor
:
pointer
;
width
:
21
px
;
width
:
32
px
;
}
.main-col
table
tr
.acn
.sel.picked
{
...
...
src/main/webapp/html/images/icon_row_select.png
100755 → 100644
View replaced file @
ba5b1b3c
View file @
5ae85913
1.35 KB
|
W:
|
H:
1.14 KB
|
W:
|
H:
2-up
Swipe
Onion skin
src/main/webapp/html/images/sel-add.png
deleted
100644 → 0
View file @
ba5b1b3c
2.42 KB
src/main/webapp/html/images/sel-add2.png
deleted
100644 → 0
View file @
ba5b1b3c
608 Bytes
src/main/webapp/html/images/sel-remove.png
deleted
100644 → 0
View file @
ba5b1b3c
2.71 KB
src/main/webapp/html/images/sel-remove2.png
deleted
100644 → 0
View file @
ba5b1b3c
605 Bytes
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