diff --git a/workbench/logbook/forms.py b/workbench/logbook/forms.py index 00f8df24..19761d12 100644 --- a/workbench/logbook/forms.py +++ b/workbench/logbook/forms.py @@ -86,7 +86,7 @@ class LoggedHoursSearchForm(Form): ) date_from = forms.DateField(widget=DateInput, required=False, label="") date_until = forms.DateField( - widget=DateInput, required=False, label=mark_safe("– ") + widget=DateInput, required=False, label=mark_safe("–") ) service = forms.ModelChoiceField( queryset=Service.objects.all(), @@ -230,7 +230,7 @@ class LoggedCostSearchForm(Form): expenses = forms.BooleanField(required=False, label=_("expenses")) date_from = forms.DateField(widget=DateInput, required=False, label="") date_until = forms.DateField( - widget=DateInput, required=False, label=mark_safe("– ") + widget=DateInput, required=False, label=mark_safe("–") ) service = forms.ModelChoiceField( queryset=Service.objects.all(), diff --git a/workbench/static/workbench/main.scss b/workbench/static/workbench/main.scss index 030eef02..de4e3720 100644 --- a/workbench/static/workbench/main.scss +++ b/workbench/static/workbench/main.scss @@ -140,10 +140,18 @@ tbody th > a { align-items: flex-start; margin-bottom: 1rem; } + .form-search input, .form-search select { max-width: 10em; } + +.form-search .form-group { + display: flex; + align-items: center; + gap: 4px; +} + .form-search > * { margin-left: 0.25rem; } diff --git a/workbench/templates/logbook/loggedhours_list.html b/workbench/templates/logbook/loggedhours_list.html index 95b4a997..bcb38796 100644 --- a/workbench/templates/logbook/loggedhours_list.html +++ b/workbench/templates/logbook/loggedhours_list.html @@ -1,5 +1,7 @@ {% extends "generic/object_list.html" %} + {% load django_bootstrap5 i18n workbench %} + {% block search-form-buttons %} {% if request.GET and request.user.features.CONTROLLING %}