Commit 33629148 authored by Maxim's avatar Maxim
Browse files

Filters from URL do not open - fixed. Not displayed column name of Crop name...

Filters from URL do not open  - fixed. Not displayed column name of Crop name table after updated filters - fixed. Bug with layout of Remove Filter button - fixed.
parent c332ea71
......@@ -2123,20 +2123,23 @@ h2.short {
}
.applyBtn {
background-color: #87bc38;
padding: 5px 40px;
padding: 5px 0px;
font-size: 14px;
border: none;
display: block;
//margin-left: 15px;
float: none;
}
.removeFilterBtn {
background-color: #bebaa9;
padding: 5px 20px;
padding: 5px 0px;
font-size: 14px;
border: none;
display: block;
color: #fff;
//margin-right: 15px;
@media (max-width: 767px) {
float: left!important;
margin-top: 15px;
}
}
.filtval.complex {
display: inline-block;
......
......@@ -512,7 +512,7 @@
$.each($('#collapseFilters').find("div.panel-collapse"), function () {
<c:forEach items="${appliedFilters}" var="appliedFilter">
<c:set var="normalizedAppliedFilter" value="${appliedFilter.key.replace(':', '_').replace('.','-')}"/>
<c:set var="normalizedAppliedFilter" value="${appliedFilter.key.replace(':', '_')}"/>
var collapseDiv = $(this).find($("div[id*='${normalizedAppliedFilter}']"));
if (collapseDiv[0] !== undefined) {
$(this).collapse("show");
......
......@@ -9,4 +9,8 @@ var messages = new Array();
<c:forEach var="country" items="${countries}">
messages["geo.iso3166-3.<spring:message text='${country.getCode3()}' javaScriptEscape='true'/>"] = "<c:out value='${country.getName(locale)}'/>";
</c:forEach>
<c:forEach items="${cropsNames}" var="cropName">
messages["${cropName.key}"] = "${cropName.value}";
</c:forEach>
\ No newline at end of file
......@@ -263,7 +263,7 @@
$.each($('#collapseFilters').find("div.panel-collapse"), function () {
<c:forEach items="${appliedFilters}" var="appliedFilter">
<c:set var="normalizedAppliedFilter" value="${appliedFilter.key.replace(':', '_').replace('.','-')}"/>
<c:set var="normalizedAppliedFilter" value="${appliedFilter.key.replace(':', '_')}"/>
var collapseDiv = $(this).find($("div[id*='${normalizedAppliedFilter}']"));
if (collapseDiv[0] !== undefined) {
$(this).collapse("show");
......
......@@ -196,10 +196,10 @@
</c:forEach>
<div class="filtersBtn clearfix">
<button type="button" class="btn btn-success applyBtn pull-left ">
<button type="button" class="btn btn-success applyBtn pull-left col-xs-6 col-sm-4 col-lg-5">
<spring:message code="filter.apply"/>
</button>
<button type="button" class="btn removeFilterBtn pull-right">
<button type="button" class="btn removeFilterBtn pull-right col-xs-7 col-lg-6">
<spring:message code="filter.remove"/>
</button>
</div>
......
......@@ -157,7 +157,7 @@
<button type="button" class="btn btn-success applyBtn">
<button type="button" class="btn btn-success applyBtn col-xs-6 col-sm-4 col-lg-5">
<spring:message code="filter.apply"/>
</button>
</div>
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