Commit b9fd012b authored by Matija Obreza's avatar Matija Obreza

Merge branch 'master' into staging

* master:
  CSS historic-record added
parents ed7c473f 32174ba3
...@@ -1407,9 +1407,18 @@ ul.funny-list>li.not-current * { ...@@ -1407,9 +1407,18 @@ ul.funny-list>li.not-current * {
background-position: center right; background-position: center right;
} }
table.accessions tr.not-available>td, table tr.expired>td { table.accessions {
text-decoration: line-through; tr.not-available>td, table tr.expired>td {
opacity: 0.5; text-decoration: line-through;
opacity: 0.5;
}
tr.historic-record>td {
opacity: 0.5;
a {
color: Red;
}
}
} }
.crop-details { .crop-details {
......
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status"> <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="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td class="sel" x-aid="${accession.id}"></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="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status"> <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 class="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td><spring:message code="accession.availability.${accession.availability}" /></td> <td><spring:message code="accession.availability.${accession.availability}" /></td>
<td><spring:message code="accession.historic.${accession.historic}" /></td> <td><spring:message code="accession.historic.${accession.historic}" /></td>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status"> <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="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td class="sel" x-aid="${accession.id}"></td> <td class="sel" x-aid="${accession.id}"></td>
<td><a href="<c:url value="/acn/id/${accession.id}" />"><b> <td><a href="<c:url value="/acn/id/${accession.id}" />"><b>
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</thead> </thead>
<tbody> <tbody>
<c:forEach items="${pagedData.content}" var="accession" varStatus="status"> <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="idx-col">${status.count + pagedData.size * pagedData.number}</td>
<td class="sel ${selection.containsId(accession.id) ? 'picked' : ''}" x-aid="${accession.id}"></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> <td><a href="<c:url value="/acn/id/${accession.id}" />"><b><c:out value="${accession.accessionName}" /></b></a></td>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment