Commit 2aa362b5 authored by Matija Obreza's avatar Matija Obreza

Styled funny-list odd|even

parent 97958d10
......@@ -115,7 +115,7 @@ country.accessions.from=Accessions collected in {0}
faoInstitutes.page.list.title=WIEWS Institutes
faoInstitutes.page.profile.title=WIEWS {0}
faoInstitutes.stat.accessionCount=Accessions in Genesys: {0}.
faoInstitute.accessionCount={0} accessions in Genesys.
faoInstitute.accessionCount={0} accessions
faoInstitute.statistics=Institute statistics
faoInstitutes.page.data.title=Accessions in {0}
faoInstitute.accessions.at=Accessions at {0}
......
......@@ -92,17 +92,8 @@
</div>
</div>
<div id="nav-main" class="clearfix">
<ul>
<li><a href="<c:url value="/" />"><spring:message code="menu.home" /></a></li>
<li><a href="<c:url value="/acn/" />"><spring:message code="menu.browse" /></a></li>
<li><a href="<c:url value="/data/" />"><spring:message code="menu.datasets" /></a></li>
<li><a href="<c:url value="/descriptors/" />"><spring:message code="menu.descriptors" /></a></li>
<li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li>
<li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li>
<li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" /><div id="selcounter">${selection.size() gt 0 ? selection.size() : ''}</div></a></li>
</ul>
</div>
<%@include file="menu.jsp" %>
<div id="content" class="clearfix">
......
......@@ -59,18 +59,7 @@
</div>
</div>
<div id="nav-main" class="clearfix">
<ul>
<li><a href="<c:url value="/" />"><spring:message code="menu.home" /></a></li>
<li><a href="<c:url value="/acn/" />"><spring:message code="menu.browse" /></a></li>
<li><a href="<c:url value="/data/" />"><spring:message code="menu.datasets" /></a></li>
<li><a href="<c:url value="/descriptors/" />"><spring:message code="menu.descriptors" /></a></li>
<li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li>
<li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li>
<li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" />
<div id="selcounter">${selection.size() gt 0 ? selection.size() : ''}</div></a></li>
</ul>
</div>
<%@include file="menu.jsp" %>
<div id="content" class="clearfix">
......
<%@include file="/WEB-INF/jsp/init.jsp"%>
<div id="nav-main" class="clearfix">
<ul>
<li><a href="<c:url value="/" />"><spring:message code="menu.home" /></a></li>
<li><a href="<c:url value="/acn/" />"><spring:message code="menu.browse" /></a></li>
<li><a href="<c:url value="/data/" />"><spring:message code="menu.datasets" /></a></li>
<%-- <li><a href="<c:url value="/descriptors/" />"><spring:message code="menu.descriptors" /></a></li> --%>
<li><a href="<c:url value="/geo/" />"><spring:message code="menu.countries" /></a></li>
<li><a href="<c:url value="/wiews/active" />"><spring:message code="menu.institutes" /></a></li>
<li><a href="<c:url value="/sel/" />"><spring:message code="menu.my-list" />
<div id="selcounter">${selection.size() gt 0 ? selection.size() : ''}</div></a></li>
</ul>
</div>
\ No newline at end of file
......@@ -36,7 +36,9 @@
<h3><spring:message code="country.stat.countByLocation" arguments="${countByLocation}" /></h3>
<ul class="funny-list">
<c:forEach items="${genesysInstitutes}" var="faoInstitute" varStatus="status">
<li><a href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a> <spring:message code="faoInstitute.accessionCount" arguments="${faoInstitute.accessionCount}" /></li>
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}">
<a class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a>
<div class="pull-right"><spring:message code="faoInstitute.accessionCount" arguments="${faoInstitute.accessionCount}" /></div></li>
</c:forEach>
</ul>
......@@ -46,7 +48,7 @@
<ul class="funny-list">
<c:forEach items="${faoInstitutes}" var="faoInstitute" varStatus="status">
<li><a href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a></li>
<li class="${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show" href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a></li>
</c:forEach>
</ul>
......
......@@ -31,7 +31,7 @@
<small><a href="#letter-top">Back to top</a></small>
</li>
</c:if>
<li><a href="<c:url value="/geo/${country.code3.toLowerCase()}" />"><c:out value="${country.name}" /></a> <c:if test="${not country.current}">(Historic entry)</c:if></li>
<li class="${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show ${not country.current ? 'disabled' : ''}" href="<c:url value="/geo/${country.code3.toLowerCase()}" />"><c:out value="${country.name}" /></a></li>
</c:forEach>
</ul>
<c:remove var="hoofdleter" />
......
......@@ -12,16 +12,16 @@
<div id="crops-menu" class="content-block">
<c:if test="${cropList ne null and cropList.size() gt 0}">
<h1><spring:message code="crop.croplist"/></h1>
<ul class="funny-list">
<c:forEach items="${cropList}" var="crop" varStatus="status">
<li><a href="/c/${crop.shortName}/data"><c:out value="${crop.name}" /></a></li>
</c:forEach>
</ul>
<sec:authorize access="hasRole('ADMINISTRATOR')">
<form method="post" action="<c:url value="/c/rebuild" />">
<input type="submit" value="Rebuild" />
</form>
</sec:authorize>
<ul class="funny-list">
<c:forEach items="${cropList}" var="crop" varStatus="status">
<li><a class="show" href="/c/${crop.shortName}/data"><c:out value="${crop.name}" /></a></li>
</c:forEach>
</ul>
</c:if>
</div>
......
......@@ -38,7 +38,6 @@
<td><spring:message code="accession.taxonomy" /></td>
<td><spring:message code="accession.holdingInstitute" /></td>
<td><spring:message code="accession.holdingCountry" /></td>
<td></td>
</tr>
</thead>
<tbody>
......@@ -53,7 +52,6 @@
<td><c:out value="${accession.taxonomy.taxonName}" /></td>
<td><a href="<c:url value="/wiews/${accession.institute.code.toLowerCase()}" />"><c:out value="${accession.institute.code}" /></a></td>
<td><a href="<c:url value="/geo/${accession.institute.country.code3.toLowerCase()}" />"><c:out value="${accession.institute.country.name}" /></a></td>
<td class="idx-col"><a href="<c:url value="/sel/remove/${accession.id}" />">Remove</a></td>
</tr>
</c:forEach>
</tbody>
......@@ -61,6 +59,7 @@
<form method="post" action="<c:url value="/sel/order" />" class="form-vertical">
<div class="form-actions">
<a href="<c:url value="/sel/" />"><button class="btn" type="button">Refresh</button></a>
<button class="btn btn-primary" type="submit">Send request for germplasm</button>
<a href="<c:url value="/sel/clear" />"><button class="btn" type="button">Clear list</button></a>
</div>
......
......@@ -31,7 +31,8 @@
<ul class="funny-list">
<c:forEach items="${pagedData.content}" var="faoInstitute" varStatus="status">
<li><a href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a> <spring:message code="faoInstitute.accessionCount" arguments="${faoInstitute.accessionCount}" /></li>
<li class="clearfix ${status.count % 2 == 0 ? 'even' : 'odd'}"><a class="show pull-left" href="<c:url value="/wiews/${faoInstitute.code.toLowerCase()}" />"><b><c:out value="${faoInstitute.code}" /></b> <c:out value="${faoInstitute.fullName}" /></a>
<div class="pull-right"><spring:message code="faoInstitute.accessionCount" arguments="${faoInstitute.accessionCount}" /></div></li>
</c:forEach>
</ul>
......
......@@ -47,11 +47,18 @@
a {
color: #5476b2;
}
a.disabled {
color: #4d4c47;
}
#crops-menu {
background-color: #d9d6d1;
}
#crops-menu li {
margin: 0;
}
#crops-menu a {
color: #4d4c47;
}
......@@ -120,6 +127,14 @@ td {
padding: 0.5em 0.5em;
}
ul.funny-list li {
margin: 3px 0;
padding: 0.2em 0.5em;
}
ul.funny-list li > a {
}
.idx-col {
font-size: 80%;
width: 3em;
......@@ -133,10 +148,10 @@ span.idx-col {
display: inline-block;
}
tr.odd td {
tr.odd td, ul.funny-list > li.odd {
background-color: #f8f7f5;
}
tr.even td {
tr.even td, ul.funny-list > li.even {
background-color: #f3f2ee;
}
......
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