1312: Implement initial vocabulary browsing mechanism

Task-Url: https://pm.winseda.de/issues/1312

search/extended.jsp

@@ -22,11 +22,15 @@
 	  			<a href='<s:url value="/search/simple/"></s:url>' target="_self"><s:message code="~eu.dariah.de.minfba.search.view.titles.simple_search" /></a>
 	  		</p>
 		</div>
-		<div class="col-12">
+		
+		<div class="col-sm-12 col-xl-8">
 			<%@ include file="incl/applied_filters_container.jsp" %>
-		</div>
-		<div class="col-12">
 			<%@ include file="incl/tabs_results.jsp" %>
 		</div>
+		<div class="col-sm-12 col-xl-4">
+			<div class="ml-2 mt-5">
+				<%@ include file="incl/filters.jsp" %>
+			</div>
+		</div>
 	</div>
 </div>
\ No newline at end of file

search/incl/filters.jsp

+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
+
+<nav class="sidebar-block sidebar-filters">
+	<h2><s:message code="~eu.dariah.de.minfba.search.options.available_filters" /></h2>
+	<div class="search-available-filter-container">
+		<c:forEach items="${availableFilters}" var="filter" varStatus="filterStatus">
+			<h3><s:message code="${filter.displayCode}" /></h3>
+		
+			<ul id="search-available-filter-${filterStatus.index}">
+				<c:forEach items="${filter.terms}" var="term" varStatus="termStatus">
+					<li ${termStatus.index>4 ? "class='hide'" : ""}><button class="btn btn-inline" onclick="search.addFilterTerm('${filter.label}', '${term.type}', '${term.term}', this);">${term.term} (${term.count})</button></li>			
+				</c:forEach>
+			</ul>
+			<c:if test="${filter.totalSize > 4}">
+				<button id="btn-search-available-filter-more-${filterStatus.index}" class="btn btn-inline btn-search-available-filter-more" onclick="search.showMoreFilterTerms('${filterStatus.index}');">
+					<s:message code="~eu.dariah.de.minfba.search.view.filter.more" />
+				</button>		
+			</c:if>
+		</c:forEach>
+	</div>
+	<input type="hidden" id="selected-filters" name="selected-filters" value="[]" />
+</nav>
\ No newline at end of file

search/incl/simple_options.jsp

@@ -27,21 +27,4 @@
 		<button class="btn btn-link" onclick="search.sourceSelection.selectAll();"><s:message code="~eu.dariah.de.minfba.search.options.actions.select_all_collections" /></button>
 		<input type="hidden" id="selected-datasources" name="selected-datasources" value="[]" />
 	</div>
-</nav>
-
-<nav class="sidebar-block">
-	<h2><s:message code="~eu.dariah.de.minfba.search.options.available_filters" /></h2>
-
-	<c:forEach items="${availableFilters}" var="filter" varStatus="filterStatus">
-		<h3><s:message code="${filter.displayCode}" /></h3>
-		<ul id="search-available-filter-${filterStatus.index}" class="search-available-filter">
-			<c:forEach items="${filter.terms}" var="term" varStatus="termStatus">
-				<li ${termStatus.index>4 ? "class='hide'" : ""}><button class="btn btn-inline" onclick="search.addFilterTerm('${filter.label}', '${term.type}', '${term.term}');">${term.term} (${term.count})</button></li>			
-			</c:forEach>
-		</ul>
-		<c:if test="${filter.totalSize > 4}">
-			<button id="btn-search-available-filter-more-${filterStatus.index}" class="btn btn-inline" onclick="search.showMoreFilterTerms('${filterStatus.index}');">~more..</button>		
-		</c:if>
-	</c:forEach>
-	<input type="hidden" id="selected-filters" name="selected-filters" value="[]" />
 </nav>
\ No newline at end of file

search/simple.jsp

@@ -23,11 +23,15 @@
 	  			<a href='<s:url value="/search/extended/"></s:url>' target="_self"><s:message code="~eu.dariah.de.minfba.search.view.titles.extended_search" /></a>
 	  		</p>
 		</div>
-		<div class="col-12">
+		
+		<div class="col-sm-12 col-xl-8">
 			<%@ include file="incl/applied_filters_container.jsp" %>
-		</div>
-		<div class="col-12">
 			<%@ include file="incl/tabs_results.jsp" %>
 		</div>
+		<div class="col-sm-12 col-xl-4">
+			<div class="ml-2 mt-5">
+				<%@ include file="incl/filters.jsp" %>
+			</div>
+		</div>
 	</div>
 </div>
\ No newline at end of file