diff options
| -rw-r--r-- | chimere/forms.py | 14 | ||||
| -rw-r--r-- | chimere/models.py | 4 | ||||
| -rw-r--r-- | chimere/static/chimere/css/styles.css | 3 | ||||
| -rw-r--r-- | chimere/templates/chimere/edit.html | 8 |
4 files changed, 22 insertions, 7 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 1178c81..bfac727 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -141,6 +141,15 @@ def notifySubmission(absolute_uri, geo_object): return notifyByEmail(subject, message, user_list) +class BSForm: + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + for field in self.fields: + self.fields[field].widget.attrs.update({ + 'class': 'form-control' + }) + + class ContactForm(forms.Form): """ Main form for categories @@ -288,7 +297,7 @@ def get_properties(queryset): return fields -class MarkerAdminFormBase(forms.ModelForm): +class MarkerAdminFormBase(BSForm, forms.ModelForm): """ Main form for marker """ @@ -307,6 +316,9 @@ class MarkerAdminFormBase(forms.ModelForm): PropertyModel.objects.filter( **self._PROPERTY_FILTERS).order_by('order').all()) for key in fields: + fields[key].widget.attrs.update({ + 'class': 'form-control' + }) self.fields[key] = fields[key] def __init__(self, *args, **keys): diff --git a/chimere/models.py b/chimere/models.py index 5a8157f..06e2ea9 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -49,7 +49,7 @@ from django.template import defaultfilters from django.utils.translation import ugettext_lazy as _ from chimere.widgets import HiddenPointChooserWidget, PointField, RouteField, \ - SelectMultipleField, TextareaWidget, DatePickerWidget, PolygonField, \ + SelectMultipleField, FullTextareaWidget, DatePickerWidget, PolygonField, \ JQueryAutoComplete from chimere import utils @@ -2375,7 +2375,7 @@ class PropertyModel(models.Model): ('B', _("Boolean")), ) TYPE_WIDGET = {'T': forms.TextInput, - 'L': TextareaWidget, + 'L': FullTextareaWidget, 'P': forms.PasswordInput, 'D': DatePickerWidget, 'C': forms.Select, diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index e1ce87a..8b99aba 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -3654,9 +3654,6 @@ a.close_img{ width:250px; } -input#id_name{ - width:250px; -} select#id_categories{ max-width:240px; diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index b6e0963..f534b42 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -82,11 +82,17 @@ <div class="row"> {% for field in form %}{% if field.name|startswith:'property_' %} {% for property in properties %}{% ifequal field.name property.getNamedId %} - <div class="col-sm-12 col-md-6 col-xl-4"> + {% if property.type == 'L' and forloop.parentloop.counter0 %} + </div> + <div class="row">{% endif %} + <div class="{% if property.type == 'L' %}col-md-12 full{% else %}col-sm-12 col-md-6 col-xl-4{% endif %}"> <label for="id_{{field.name}}">{% trans field.label %}{% if property.mandatory %} *{% endif %}</label> {% if field.errors %}<div class='errors'>{{ field.errors }}</div>{% endif %} {{ field }} </div> + {% if property.type == 'L' and forloop.parentloop.counter0 %} + </div> + <div class="row">{% endif %} {% endifequal %}{% endfor %}{% endif %}{% endfor %} </div> </div> |