openstack
/
horizon
Code Issues Proposed changes

Merge "Form Fields Required Visual treatment is missing"

This commit is contained in:
Jenkins 2016-03-11 06:14:12 +00:00 committed by Gerrit Code Review
parent 6765d70c9b fee8b5a0d3
commit 16660b07da
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/templates/horizon/common/_form_field.html
View File

@ -8,8 +8,8 @@
{% elif field|is_radio %}
{% if field.auto_id %}
<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.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>
{% endif %}
{% endif %}
@ -31,8 +31,8 @@
{% else %}
{% 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>
{% if field.field.required %}{% include "horizon/common/_form_field_required.html" %}{% endif %}
{% 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>
{% endif %}
{% endif %}

4
horizon/templates/horizon/common/_horizontal_field.html
View File

@ -1,7 +1,9 @@
{% load form_helpers %}
<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 }}">
{% if field|is_checkbox %}
{% with is_vertical=1 %}