Commit 08d99f4b authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1330: Fix extended search JS issues

Task-Url: https://pm.winseda.de/issues/1330
parent 9609dd21
......@@ -12,16 +12,45 @@
<div class="col-12">
<h1><s:message code="~eu.dariah.de.minfba.search.view.titles.extended_search" /></h1>
</div>
<div id="search-facets-container" class="col-12"></div>
<div class="col-12">
<div class="col-12 col-xl-10">
<div id="search-facets-container"></div>
<p class="mt-1 ml-5 float-left">
<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>
<p class="mt-1 ml-5 float-right">
<button onClick="search.queryHandler.insertSearchFacet();" class="btn btn-inline"><i class="fa fa-plus" aria-hidden="true"></i> <s:message code="~eu.dariah.de.minfba.search.view.labels.add_facet" /></button>
</p>
</div>
<div class="col-12 col-xl-2">
<div class="float-right">
<button onClick="search.search();" class="btn btn-primary"><i class="fas fa-search"></i></button>
</div>
</div>
<div class="col-12 col-xl-10">
<!-- <p class="mt-1 ml-5 float-left">
<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 class="float-right">
<button onClick="search.queryHandler.insertSearchFacet();" class="btn btn-inline"><s:message code="~eu.dariah.de.minfba.search.view.labels.add_facet" /></button>
<button onClick="search.search();" class="btn btn-primary"><i class="fas fa-search"></i></button>
</div> -->
</div>
<!-- <div class="col-12">
<div class="float-right">
<button onClick="search.queryHandler.insertSearchFacet();" class="btn btn-primary"><s:message code="~eu.dariah.de.minfba.search.view.labels.add_facet" /></button>
<button onClick="search.doSearch();" class="btn btn-primary"><i class="fas fa-search"></i></button>
<button onClick="search.queryHandler.insertSearchFacet();" class="btn btn-inline"><s:message code="~eu.dariah.de.minfba.search.view.labels.add_facet" /></button>
<button onClick="search.search();" class="btn btn-primary"><i class="fas fa-search"></i></button>
</div>
<p class="mt-1 float-left">
<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> -->
<div class="col-sm-12 col-xl-8">
<%@ include file="incl/applied_filters_container.jsp" %>
......
......@@ -4,7 +4,11 @@
<%@ taglib prefix="sf" uri="http://www.springframework.org/tags/form" %>
<div id="facets${index}" class="search-facet d-flex">
<div class="flex-grow-1">
<div class="mt-1">
<input type="hidden" class="facet-fieldselect-hiddenindex" value="${index}" />
<button onclick="search.queryHandler.removeSearchFacet(this);" class="btn btn-link btn-remove-search-facet"><i class="fa fa-trash fa-lg"></i></button>
</div>
<div class="flex-grow-2">
<select name="facets[${index}].elementId" id="facets${index}.elementId" class="form-control search-facet-element">
<c:forEach items="${availableFacets}" var="availFacet">
<c:choose>
......@@ -22,10 +26,7 @@
<div class="flex-grow-1 pl-2">
<input onkeypress="if (event.which==13) { search.queryHandler.doSearch(); }" name="facets[${index}].value" id="facets${index}.value" class="form-control search-facet-expression" type="text" placeholder="<s:message code="~eu.dariah.de.minfba.search.view.labels.query_expression" />" value="${facet.value}" />
</div>
<div class="mt-2">
<input type="hidden" class="facet-fieldselect-hiddenindex" value="${index}" />
<button onclick="search.queryHandler.removeSearchFacet(this);" class="btn btn-link btn-remove-search-facet"><i class="far fa-times-circle fa-color-danger"></i></button>
</div>
<!-- <div class="col-md-2">
<label class="checkbox"><input type="checkbox" value="false" name="search-facet-not-${index}" class="search-facet-not-flag"><s:message code="~eu.dariah.de.minfba.search.view.labels.not" /></label>
<label class="radio"><input type="radio" value="true" name="search-facet-flags-${index}" class="search-facet-must-flag"><s:message code="~eu.dariah.de.minfba.search.view.labels.must" /></label>
......
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