Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 327 #331

Merged
merged 14 commits into from
Dec 2, 2019
Merged

Issue 327 #331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fc8493b
select or deselect all filter checkboxes (#327)
jakosch Nov 17, 2019
b22b878
checkboxes are checked (marked active) by default
jakosch Nov 17, 2019
282c90e
use <span> in checkbox label
jakosch Nov 17, 2019
ae9305d
some more work on the search filter
jakosch Nov 21, 2019
961dbf8
better label for filter checkbox
jakosch Nov 21, 2019
1a0e8db
required catalogue entries
jakosch Nov 21, 2019
2820e46
weitere Arbeit: funktionierender Code, Refresh-Button... (#327)
jakosch Nov 22, 2019
1c86717
collapsible filters
jakosch Nov 29, 2019
752bcf3
range slider labels inside div
jakosch Nov 29, 2019
6163a9b
"apply filters"
jakosch Nov 29, 2019
4586154
styling, v.a. sidebar
jakosch Nov 29, 2019
70631ad
update expected results
peterstadler Dec 2, 2019
dd54b92
update expected results, part 2
peterstadler Dec 2, 2019
51b77cd
fix structural position of the heading
peterstadler Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
collapsible filters
  • Loading branch information
@jakosch @peterstadler
jakosch authored and peterstadler committed Dec 2, 2019
commit 1c86717e83d0da457b0217da7785d038f9c22c39
4 changes: 2 additions & 2 deletions templates/ajax/backlinks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="backlinks">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">docType</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/biblio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="biblio">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>
<div class="input-group facet-group checkbox">
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/contacts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="contacts">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">surnames</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/correspondence.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="letters">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>
<div class="input-group facet-group checkbox">
Expand Down
8 changes: 4 additions & 4 deletions templates/ajax/diaries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="diaries">
<div class="col-md-3 order-2 side-col">
<div>
<h2 data-template="lang:translate">calendar</h2>
<div id="datePicker" data-template="app:inject-api-base" style="margin-bottom:4ex;"/>
<h2><a href="#datePicker" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">calendar</span></a></h2>
<div id="datePicker" class="panel-collapse collapse show" data-template="app:inject-api-base" style="margin-bottom:4ex;"/>
</div>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>

Expand Down
5 changes: 2 additions & 3 deletions templates/ajax/documents.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="documents">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<div class="col-md-3 order-2 side-col">
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>

<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>

Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/indices.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="indices">
<!-- complete indices, i.e. http://localhost:8080/exist/apps/WeGA-WebApp/de/Register -->
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">docType</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/news.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="news">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>

Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/places.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="places">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">placenames</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/sources.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="sources">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">asksam-cat</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/thematicCommentaries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="thematicCommentaries">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!--<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>-->

Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/works.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="works">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<!-- <h4 data-template="lang:translate">chronology</h4>-->

<h4 data-template="lang:translate">composers</h4>
Expand Down
4 changes: 2 additions & 2 deletions templates/ajax/writings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div xmlns="http://www.w3.org/1999/xhtml" class="row" data-template="search:results" data-template-docType="writings">
<div class="col-md-3 order-2 side-col">
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<!-- Facetten Filter-->
<div class="allFilter">
<h2 data-template="lang:translate">filter</h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<h4 data-template="lang:translate">chronology</h4>
<input type="text" class="rangeSlider" name="chronology-slider" data-template="app:set-slider-range"/>

Expand Down
12 changes: 3 additions & 9 deletions templates/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,8 @@ <h1 data-template="lang:translate">search</h1>
<div class="row paddingBottomIcon paddingTopIcon">
<form role="form" class="searchfilter">
<div class="col-md-3 order-2 side-col">
<div class="allFilter">
<div class="row">
<div class="col-md-9 col-12">
<h2>Filter</h2>
</div>
<div class="col-md-3 col-12">
<button type="button" class="btn btn-link" onclick="checkBoxRefresh()"><i class="fa fa-refresh" aria-hidden="true"></i></button>
</div>
</div>
<h2><a href="#allFilter" class="collapseSingle" data-toggle="collapse"><span data-template="lang:translate">filter</span></a></h2>
<div class="allFilter panel-collapse collapse show" id="allFilter">
<div class="filterGroup searchDocTypeFilter">
<div class="filterHead">
<h3 data-template="lang:translate">docType</h3>
Expand All @@ -50,6 +43,7 @@ <h3 data-template="lang:translate">docType</h3>
<input type="checkbox" name="d" value="persons"/> persons
</label>
</div>
<button type="button" class="mt-4 btn btn-primary btn-sm" onclick="checkBoxRefresh()"><span data-template="lang:translate">applyFilter</span></button>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/var.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ <h1 data-template="app:document-title">CARL MARIA VON WEBER AN
<div class="col-md-3 order-2 side-col">
<div class="allFilter" data-template="facets:document-allFilter">
<div>
<h2><a href="#dokument" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">document</a></h2>
<div id="dokument" class="panel-collapse collapse ">
<h2><a href="#dokument" data-template="lang:translate" class="collapseSingle" data-toggle="collapse">document</a></h2>
<div id="dokument" class="panel-collapse collapse show">
<!-- Nav tabs -->
<ul class="nav nav-tabs">
<li class="nav-item gradient-light"><a href="#transcription" class="active nav-link" data-toggle="tab">Text</a></li>
Expand Down