Merge "Form Fields Required Visual treatment is missing"
This commit is contained in:
commit
16660b07da
@ -8,8 +8,8 @@
|
|||||||
{% elif field|is_radio %}
|
{% elif field|is_radio %}
|
||||||
{% if field.auto_id %}
|
{% if field.auto_id %}
|
||||||
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
|
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
|
||||||
|
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
|
||||||
{% if field.help_text %}
|
{% if field.help_text %}
|
||||||
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
|
|
||||||
<span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
|
<span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -31,8 +31,8 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
{% if field.auto_id %}
|
{% if field.auto_id %}
|
||||||
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
|
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label>
|
||||||
|
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
|
||||||
{% if field.help_text %}
|
{% if field.help_text %}
|
||||||
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
|
|
||||||
<span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
|
<span class="help-icon" data-toggle="tooltip" data-placement="top" title="{{ field.help_text|safe }}"><span class="fa fa-question-circle"></span></span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
{% load form_helpers %}
|
{% load form_helpers %}
|
||||||
|
|
||||||
<div class="form-group{% if field.errors %} has-error{% endif %} {{ field.css_classes }}">
|
<div class="form-group{% if field.errors %} has-error{% endif %} {{ field.css_classes }}">
|
||||||
<label class="control-label col-sm-3 {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
|
<label class="control-label col-sm-3" for="{{ field.id_for_label }}">{{ field.label }}
|
||||||
|
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
|
||||||
|
</label>
|
||||||
<div class="col-sm-9 {{ classes.value }} {{ field|wrapper_classes }}">
|
<div class="col-sm-9 {{ classes.value }} {{ field|wrapper_classes }}">
|
||||||
{% if field|is_checkbox %}
|
{% if field|is_checkbox %}
|
||||||
{% with is_vertical=1 %}
|
{% with is_vertical=1 %}
|
||||||
|
Loading…
Reference in New Issue
Block a user