#6797: Improve object edit form field layout

This commit is contained in:
Matt 2021-08-04 10:57:01 -07:00
parent 0cf9be2a8d
commit 582b69de74
5 changed files with 12 additions and 8 deletions

View File

@ -86,8 +86,7 @@
</div> </div>
<div class="field-group"> <div class="field-group">
<h5 class="text-center">Comments</h5> {% render_field form.comments label='Comments' %}
{% render_field form.comments %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -30,7 +30,7 @@
{% render_field form.width %} {% render_field form.width %}
{% render_field form.u_height %} {% render_field form.u_height %}
<div class="row mb-3"> <div class="row mb-3">
<label class="col col-md-3 col-form-label">Outer Dimensions</label> <label class="col col-md-3 col-form-label text-end">Outer Dimensions</label>
<div class="col col-md-3"> <div class="col col-md-3">
{{ form.outer_width }} {{ form.outer_width }}
<div class="form-text">Width</div> <div class="form-text">Width</div>
@ -53,7 +53,6 @@
</div> </div>
{% endif %} {% endif %}
<div class="field-group"> <div class="field-group">
<h5 class="text-center">Comments</h5> {% render_field form.comments label='Comments' %}
{% render_field form.comments %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -48,8 +48,7 @@
{% if form.comments %} {% if form.comments %}
<div class="field-group"> <div class="field-group">
<h5 class="text-center">Comments</h5> {% render_field form.comments label='Comments' %}
{% render_field form.comments %}
</div> </div>
{% endif %} {% endif %}

View File

@ -25,6 +25,12 @@
{% elif field|widget_type == 'textarea' and not field.label %} {% elif field|widget_type == 'textarea' and not field.label %}
<div class="row mb-3"> <div class="row mb-3">
{% if label %}
<label class="col-sm-3 col-form-label text-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
{{ label }}
</label>
{% else %}
{% endif %}
<div class="col"> <div class="col">
{{ field }} {{ field }}
{% if field.help_text %} {% if field.help_text %}

View File

@ -13,12 +13,13 @@ def getfield(form, fieldname):
@register.inclusion_tag('utilities/render_field.html') @register.inclusion_tag('utilities/render_field.html')
def render_field(field, bulk_nullable=False): def render_field(field, bulk_nullable=False, label=None):
""" """
Render a single form field from template Render a single form field from template
""" """
return { return {
'field': field, 'field': field,
'label': label,
'bulk_nullable': bulk_nullable, 'bulk_nullable': bulk_nullable,
} }