From 045bfe71586c0eeacf8a696d97ed5a136fb2cedf Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 3 Dec 2020 16:14:20 +0100 Subject: Container QA form: fix parent add - fix field layout (refs #4996 - refs #4997) --- archaeological_finds/forms_treatments.py | 6 +++--- archaeological_finds/templates/ishtar/forms/qa_find_treatment.html | 2 ++ archaeological_warehouse/forms.py | 7 ++++--- ishtar_common/static/bootstrap/bootstrap.css | 2 +- scss/custom.scss | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index c62dbcc57..ad4966e51 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -407,9 +407,9 @@ class QAFindTreatmentForm(IshtarForm): container_to_change = forms.ChoiceField( label=_("Change "), required=True, choices=( - ('current-and-reference', _(u"current and reference containers")), - ('reference', _(u"the reference container")), - ('current', _(u"the current container")), + ('current-and-reference', _("reference and current containers")), + ('reference', _("the reference container")), + ('current', _("the current container")), ) ) collection = forms.BooleanField( diff --git a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html index c7944f2a0..e8d00cb33 100644 --- a/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html +++ b/archaeological_finds/templates/ishtar/forms/qa_find_treatment.html @@ -21,12 +21,14 @@ {% endif %} {% endfor %}
+ {% with force_large_col=True %} {% with form.container as field %} {% include "blocks/bs_field_snippet.html" %} {% endwith %} {% with form.container_to_change as field %} {% include "blocks/bs_field_snippet.html" %} {% endwith %} + {% endwith %}
{{ form.collection }}