Reorganized filtering elements (below pagination)

src/main/webapp/WEB-INF/jsp/accession/explore_new.jsp

@@ -12,33 +12,7 @@
 	</h1>
     <%--Dropdown filters--%>
 	<div class="main-col-header clearfix">
-        <ul class="nav nav-pills">
-            <li class="dropdown form-horizontal" id="menu1">
-
-                <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">
-                    <spring:message code="filter.add"/>
-                    <b class="glyphicon-plus"></b>
-                </a>
-
-                <ul class="dropdown-menu">
-                    <c:forEach items="${availableFilters}" var="filter">
-                        <li><a href="#" id="${filter.key}_id" onclick="enableFilter('${filter.key}')">
-                            <spring:message code="filter.${filter.key}"/></a></li>
-                    </c:forEach>
-                </ul>
-
-            </li>
-
-
-            <c:if test="${crop != null}">
-                <li class="dropdown form-horizontal" id="menu2">
-                    <a class="btn btn-default" data-toggle="modal" data-target="#myModal">
-                        <spring:message code="filter.additional"/>
-                        <b class="glyphicon-plus"></b>
-                    </a>
-                </li>
-            </c:if>
-        </ul>
+        
 	<div class="nav-header">
 
 		<c:if test="${pagedData.totalElements le 100000}">
@@ -66,12 +40,35 @@
 	</div>
 
     <%--Filters--%>
-    <div id="allfilters">
-        <div class="row">
-            <div style="text-align: center">
-                <button  class="btn btn-green apply"><spring:message code="filter.apply"/></button>
-            </div>
-        </div>
+    <div id="allfilters" class="applied-filters">
+    	<ul class="nav nav-pills">
+            <li class="dropdown form-horizontal" id="menu1">
+
+                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                    <spring:message code="filter.add"/>
+                    <b class="glyphicon-plus"></b>
+                </a>
+
+                <ul class="dropdown-menu">
+                    <c:forEach items="${availableFilters}" var="filter">
+                        <li><a href="#" id="${filter.key}_id" onclick="enableFilter('${filter.key}')">
+                            <spring:message code="filter.${filter.key}"/></a></li>
+                    </c:forEach>
+                </ul>
+
+            </li>
+
+
+            <c:if test="${crop != null}">
+                <li class="dropdown form-horizontal" id="menu2">
+                    <a class="" data-toggle="modal" data-target="#myModal">
+                        <spring:message code="filter.additional"/>
+                        <b class="glyphicon-plus"></b>
+                    </a>
+                </li>
+            </c:if>
+        </ul>
+       
         <c:forEach items="${allFilters}" var="filter">
 
             <c:set var="normalizedKey" value="${filter.key.replace(':', '_')}"/>

src/main/webapp/html/css/custom.css

@@ -1308,9 +1308,7 @@ table.crop-details h4 {
 /* Main column - Filters */
 
 #allfilters {
-  background:#d4d1c6;
-  padding:10px;
-  margin: -10px -10px 10px -10px;
+  padding: 10px;
 }
 
 #allfilters .filter-block {