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
18
Issues
18
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
b9fd012b
Commit
b9fd012b
authored
Oct 22, 2015
by
Matija Obreza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into staging
* master: CSS historic-record added
parents
ed7c473f
32174ba3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
7 deletions
+16
-7
src/main/sourceapp/styles/genesys.scss
src/main/sourceapp/styles/genesys.scss
+12
-3
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/request/index.jsp
src/main/webapp/WEB-INF/jsp/request/index.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/search/accessions.jsp
src/main/webapp/WEB-INF/jsp/search/accessions.jsp
+1
-1
src/main/webapp/WEB-INF/jsp/selection/index.jsp
src/main/webapp/WEB-INF/jsp/selection/index.jsp
+1
-1
No files found.
src/main/sourceapp/styles/genesys.scss
View file @
b9fd012b
...
...
@@ -1407,9 +1407,18 @@ ul.funny-list>li.not-current * {
background-position
:
center
right
;
}
table
.accessions
tr
.not-available
>
td
,
table
tr
.expired
>
td
{
text-decoration
:
line-through
;
opacity
:
0
.5
;
table
.accessions
{
tr
.not-available
>
td
,
table
tr
.expired
>
td
{
text-decoration
:
line-through
;
opacity
:
0
.5
;
}
tr
.historic-record
>
td
{
opacity
:
0
.5
;
a
{
color
:
Red
;
}
}
}
.crop-details
{
...
...
src/main/webapp/WEB-INF/jsp/accession/explore.jsp
View file @
b9fd012b
...
...
@@ -308,7 +308,7 @@
</thead>
<tbody>
<c:forEach
items=
"
${
pagedData
.
content
}
"
var=
"accession"
varStatus=
"status"
>
<tr
class=
"acn ${status.count % 2 == 0 ? 'even' : 'odd'}"
>
<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=
"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>
...
...
src/main/webapp/WEB-INF/jsp/request/index.jsp
View file @
b9fd012b
...
...
@@ -51,7 +51,7 @@
</thead>
<tbody>
<c:forEach
items=
"
${
pagedData
.
content
}
"
var=
"accession"
varStatus=
"status"
>
<tr
id=
"a${accession.id}"
class=
"acn targeted ${status.count % 2 == 0 ? 'even' : 'odd'} ${accession.availability!=false and
!accession.historic and accession.institute.allowMaterialRequests ? '' : 'not-available
'}"
>
<tr
id=
"a${accession.id}"
class=
"acn targeted ${status.count % 2 == 0 ? 'even' : 'odd'} ${accession.availability!=false and
accession.institute.allowMaterialRequests ? '' : 'not-available'} ${accession.historic ? 'historic-record' : '
'}"
>
<td
class=
"idx-col"
>
${status.count + pagedData.size * pagedData.number}
</td>
<td><spring:message
code=
"accession.availability.${accession.availability}"
/></td>
<td><spring:message
code=
"accession.historic.${accession.historic}"
/></td>
...
...
src/main/webapp/WEB-INF/jsp/search/accessions.jsp
View file @
b9fd012b
...
...
@@ -62,7 +62,7 @@
</thead>
<tbody>
<c:forEach
items=
"
${
pagedData
.
content
}
"
var=
"accession"
varStatus=
"status"
>
<tr
class=
"acn"
>
<tr
class=
"acn
${accession.historic ? 'historic-record' : ''}
"
>
<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>
...
...
src/main/webapp/WEB-INF/jsp/selection/index.jsp
View file @
b9fd012b
...
...
@@ -76,7 +76,7 @@
</thead>
<tbody>
<c:forEach
items=
"
${
pagedData
.
content
}
"
var=
"accession"
varStatus=
"status"
>
<tr
id=
"a${accession.id}"
class=
"acn targeted ${status.count % 2 == 0 ? 'even' : 'odd'}"
>
<tr
id=
"a${accession.id}"
class=
"acn targeted ${
accession.historic ? 'historic-record' : ''} ${
status.count % 2 == 0 ? 'even' : 'odd'}"
>
<td
class=
"idx-col"
>
${status.count + pagedData.size * pagedData.number}
</td>
<td
class=
"sel ${selection.containsId(accession.id) ? 'picked' : ''}"
x-aid=
"${accession.id}"
></td>
<td><a
href=
"
<c:url
value=
"/acn/id/${accession.id}"
/>
"
><b><c:out
value=
"
${
accession
.
accessionName
}
"
/></b></a></td>
...
...
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