Commit 702aa1e9 authored by Matija Obreza's avatar Matija Obreza
Browse files

Buttons layout fixed on Explore page (too many buttons)

parent 6fc0670f
...@@ -591,6 +591,7 @@ session.expiry-warning-title=Session expiration warning ...@@ -591,6 +591,7 @@ session.expiry-warning-title=Session expiration warning
session.expiry-warning=Your current session is about to expire. Do you wish to extend this session? session.expiry-warning=Your current session is about to expire. Do you wish to extend this session?
session.expiry-extend=Extend session session.expiry-extend=Extend session
download=Download
download.kml=Download KML download.kml=Download KML
data-overview=Statistical overview data-overview=Statistical overview
......
...@@ -2115,35 +2115,30 @@ table.terms-table td { ...@@ -2115,35 +2115,30 @@ table.terms-table td {
.mobile-header { .mobile-header {
display: none; display: none;
.header-top {
background: #2b2924;
.navbar-nav {
float: right;
margin: 5px 0 0 0;
}
.mobile-menu-show, .mobile-menu-hide {
display: inline-block;
padding: 10px;
}
}
.logo-container {
background: #4d4c46;
padding: 5px 0 10px 0;
}
} }
.mobile-header .header-top {
background: #2b2924;
}
.mobile-header .header-top .navbar-nav {
float: right;
margin: 5px 0 0 0;
}
.mobile-header .header-top .mobile-menu-show, .mobile-header .header-top .mobile-menu-hide {
display: inline-block;
padding: 10px;
}
.mobile-header .logo-container {
background: #4d4c46;
padding: 5px 0 10px 0;
}
/* @media ( max-width : 1200px) { @media ( max-width : 1200px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog {
width: 970px;
}
#search { #search {
width: 35%; width: 35%;
} }
} */ }
/* /*
@media ( max-width : 1024px) { @media ( max-width : 1024px) {
#popup-gallery .modal-dialog, #popup-map .modal-dialog { #popup-gallery .modal-dialog, #popup-map .modal-dialog {
...@@ -2445,3 +2440,12 @@ div[x-href] { ...@@ -2445,3 +2440,12 @@ div[x-href] {
.white-background { .white-background {
background-color: White; background-color: White;
} }
.btn {
&.btn-inline {
border: none;
background-color: inherit;
color: inherit;
display: inline;
}
}
\ No newline at end of file
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<spring:message code="accessions.number" arguments="${pagedData.totalElements}" /> <spring:message code="accessions.number" arguments="${pagedData.totalElements}" />
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12 col-lg-6"> <div class="col-md-12 col-lg-5">
<form method="get" action=""> <form method="get" action="">
<input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" /> <input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" />
<div class="pagination"> <div class="pagination">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
</form> </form>
</div> </div>
<div class="col-md-12 col-lg-6 text-right" style="padding-top: 12px"> <div class="col-md-12 col-lg-7 text-right" style="padding-top: 12px">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="menuShareLink"> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="menuShareLink">
<span class="glyphicon glyphicon-share"></span><span><spring:message code="share.link"/></span> <span class="caret"></span> <span class="glyphicon glyphicon-share"></span><span><spring:message code="share.link"/></span> <span class="caret"></span>
...@@ -42,18 +42,29 @@ ...@@ -42,18 +42,29 @@
</div> </div>
<c:if test="${pagedData.totalElements le 200000}"> <c:if test="${pagedData.totalElements le 200000}">
<form style="display: inline-block" method="post" action="<c:url value="/download/explore/dwca" />"> <div class="btn-group">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" /> <span class="glyphicon glyphicon-download"></span><span><spring:message code="download"/></span> <span class="caret"></span>
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-download"></span><span><spring:message code="filter.download-dwca" /></span></button> </button>
</form> <ul class="dropdown-menu">
<security:authorize access="isAuthenticated()"> <security:authorize access="isAuthenticated()">
<form style="display: inline-block" method="post" action="<c:url value="/download/explore/download/mcpd" />"> <li>
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <form style="display: inline-block" method="post" action="<c:url value="/download/explore/download/mcpd" />">
<input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" /> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-download"></span><span><spring:message code="filter.download-mcpd" /></span></button> <input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" />
</form> <button class="btn btn-inline" type="submit"><span><spring:message code="filter.download-mcpd" /></span></button>
</security:authorize> </form>
</li>
</security:authorize>
<li>
<form style="display: inline-block" method="post" action="<c:url value="/download/explore/dwca" />">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="filter" value="<c:out value="${jsonFilter}" />" />
<button class="btn btn-inline" type="submit"><span><spring:message code="filter.download-dwca" /></span></button>
</form>
</li>
</ul>
</div>
</c:if> </c:if>
<a class="btn btn-default" href="<c:url value="/explore/overview"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span class="glyphicon glyphicon-eye-open"></span><span><spring:message code="data-overview.short" /></span></a> <a class="btn btn-default" href="<c:url value="/explore/overview"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span class="glyphicon glyphicon-eye-open"></span><span><spring:message code="data-overview.short" /></span></a>
<a class="btn btn-default" href="<c:url value="/explore/map"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span class="glyphicon glyphicon-globe"></span><span><spring:message code="maps.view-map" /></span></a> <a class="btn btn-default" href="<c:url value="/explore/map"><c:param name="filter">${jsonFilter}</c:param></c:url>"><span class="glyphicon glyphicon-globe"></span><span><spring:message code="maps.view-map" /></span></a>
......
Supports Markdown
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