From 3f8fe9078736c719b851e03e952b881af72b1590 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 1 Apr 2015 03:34:41 -0400 Subject: [PATCH] Update look of horizontal forms --- .../appearance/generic_form_instance.html | 12 ++------ .../appearance/generic_form_subtemplate.html | 28 ++++++++++--------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/mayan/apps/appearance/templates/appearance/generic_form_instance.html b/mayan/apps/appearance/templates/appearance/generic_form_instance.html index c7f6d71930..79504278e7 100644 --- a/mayan/apps/appearance/templates/appearance/generic_form_instance.html +++ b/mayan/apps/appearance/templates/appearance/generic_form_instance.html @@ -15,22 +15,14 @@ {% endfor %} {% if form_display_mode_table %} - {% for field in form.visible_fields %} - {% for error in field.errors %} -
-

{{ error }}

-
- {% endfor %} - {% endfor %} - {% for field in form.hidden_fields %} {{ field }} {% endfor %} {% for field in form.visible_fields %} - {% if field.errors %}
{% endif %} - {{ field }} + {% if field.errors %}
{% endif %} + {% render_field field class+="form-control" %} {% if field.errors %}
{% endif %} {% endfor %} diff --git a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html index 077444811e..43c211adf8 100644 --- a/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html +++ b/mayan/apps/appearance/templates/appearance/generic_form_subtemplate.html @@ -40,23 +40,25 @@ {{ formset.management_form }} {% if form_display_mode_table %} - - - - {% for field in formset.forms.0.visible_fields %} - - {% endfor %} - - {% endif %} +
+
- {{ field.label_tag }}{% if field.field.required and not read_only %} ({% trans 'required' %}){% endif %} -
+ + + {% for field in formset.forms.0.visible_fields %} + + {% endfor %} + + {% endif %} - {% for form in formset.forms %} - {% include 'appearance/generic_form_instance.html' %} + {% for form in formset.forms %} + {% include 'appearance/generic_form_instance.html' %} {% endfor %} {% if form_display_mode_table %} - +
+ {{ field.label_tag }}{% if field.field.required and not read_only %} ({% trans 'required' %}){% endif %} +
+
{% endif %} {% endwith %} {% else %}