Commit 5ae85913 authored by Matija Obreza's avatar Matija Obreza

GUI fixes

parent ba5b1b3c
......@@ -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,
......
......@@ -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();
});
......
......@@ -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">
......
......@@ -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">
......
......@@ -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:21px;
width:32px;
}
.main-col table tr.acn .sel.picked {
......
src/main/webapp/html/images/icon_row_select.png

1.35 KB | W: | H:

src/main/webapp/html/images/icon_row_select.png

1.14 KB | W: | H:

src/main/webapp/html/images/icon_row_select.png
src/main/webapp/html/images/icon_row_select.png
src/main/webapp/html/images/icon_row_select.png
src/main/webapp/html/images/icon_row_select.png
  • 2-up
  • Swipe
  • Onion skin
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