diff --git a/python/nav/web/radius/forms.py b/python/nav/web/radius/forms.py index a9f33e87d1..d93fd1ab9b 100644 --- a/python/nav/web/radius/forms.py +++ b/python/nav/web/radius/forms.py @@ -22,6 +22,12 @@ from crispy_forms.helper import FormHelper from crispy_forms_foundation.layout import Layout, Row, Column, Submit +from nav.web.crispyforms import ( + set_flat_form_attributes, + FormColumn, + FormRow, + SubmitField, +) from nav.util import is_valid_cidr @@ -146,17 +152,21 @@ class ErrorLogSearchForm(forms.Form): def __init__(self, *args, **kwargs): super(ErrorLogSearchForm, self).__init__(*args, **kwargs) css_class = 'medium-4' - self.helper = FormHelper() - self.helper.form_action = '' - self.helper.form_method = 'GET' - self.helper.form_class = 'custom' - self.helper.layout = Layout( - Row( - Column('query', css_class=css_class), - Column('log_entry_type', css_class=css_class), - Column('time', css_class=css_class), - ), - Submit('send', 'Search', css_class='small'), + self.attrs = set_flat_form_attributes( + form_method='get', + form_class='custom', + form_fields=[ + FormRow( + fields=[ + FormColumn(fields=[self['query']], css_classes=css_class), + FormColumn( + fields=[self['log_entry_type']], css_classes=css_class + ), + FormColumn(fields=[self['time']], css_classes=css_class), + ] + ), + SubmitField(value='Search', css_classes='small'), + ], ) diff --git a/python/nav/web/templates/radius/error_log.html b/python/nav/web/templates/radius/error_log.html index 41e8ac78c7..809762ca0b 100644 --- a/python/nav/web/templates/radius/error_log.html +++ b/python/nav/web/templates/radius/error_log.html @@ -1,5 +1,4 @@ {% extends "radius/base.html" %} -{% load crispy_forms_tags %} {% load report %} {% block content %} @@ -16,7 +15,11 @@

Search in radius error logs

- {% crispy form %} + {% if form.attrs %} + {% include 'custom_crispy_templates/flat_form.html' %} + {% else %} + {{ form }} + {% endif %}
{% if form.is_bound %}