Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-08-15 15:20:46 +02:00
@@ -35,52 +35,52 @@
@click.prevent="resetFilterSettings">Filter zurücksetzen</a>
<form class="border">
<div class="panel-group" id="filteroptions" role="tablist" aria-multiselectable="true">
<div class="panel-heading" role="tab" id="headingPeriod">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapsePeriod"
aria-expanded="true" aria-controls="collapsePeriod"
:class="{ collapsed: !filterSettings.dateFrom && !filterSettings.dateTo }">
Reisezeitraum
</a>
</h4>
</div>
<div id="collapsePeriod" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.dateFrom || filterSettings.dateTo }"
aria-labelledby="headingPeriod">
<div class="panel-body">
<div class="form-group hidden-xs hidden-sm">
<daterange-select
class="form-control"
:presets="datePresets"
:from="filterSettings.dateFrom"
:to="filterSettings.dateTo"
:min-date="filterOptions.dateFrom"
:max-date="filterOptions.dateTo"
:show-label="false"
@selected="updateDateRange"
></daterange-select>
</div>
<div class="form-group hidden-md hidden-lg">
<label>Früheste Anreise</label>
<input
type="date"
@change="updateDateSelectMobile"
v-model="filterSettings.dateFrom"
class="form-control"
>
</div>
<div class="form-group hidden-md hidden-lg">
<label>Späteste Abreise</label>
<input
type="date"
@change="updateDateSelectMobile"
v-model="filterSettings.dateTo"
class="form-control"
>
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingPeriod">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapsePeriod"
aria-expanded="true" aria-controls="collapsePeriod"
:class="{ collapsed: !filterSettings.dateFrom && !filterSettings.dateTo }">
Reisezeitraum
</a>
</h4>
</div>
<div id="collapsePeriod" class="panel-collapse collapse" role="tabpanel"
:class="{ in: filterSettings.dateFrom || filterSettings.dateTo }"
aria-labelledby="headingPeriod">
<div class="panel-body">
<div class="form-group hidden-xs hidden-sm">
<daterange-select
class="form-control"
:presets="datePresets"
:from="filterSettings.dateFrom"
:to="filterSettings.dateTo"
:min-date="filterOptions.dateFrom"
:max-date="filterOptions.dateTo"
:show-label="false"
@selected="updateDateRange"
></daterange-select>
</div>
<div class="form-group hidden-md hidden-lg">
<label>Früheste Anreise</label>
<input
type="date"
@change="updateDateSelectMobile"
v-model="filterSettings.dateFrom"
class="form-control"
>
</div>
<div class="form-group hidden-md hidden-lg">
<label>Späteste Abreise</label>
<input
type="date"
@change="updateDateSelectMobile"
v-model="filterSettings.dateTo"
class="form-control"
>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingSearch">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" href="#collapseSearch"