openstack/deb-python-django-bootstrap-form
Code Issues Proposed changes

Added last updates from upstream

Browse Source
This commit is contained in:
Enric Caumons 2013-09-12 03:57:23 +02:00
commit 645b0b68af
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bootstrapform/templates/bootstrapform/field.html
View File

@ -4,10 +4,11 @@
{% if field|is_checkbox %} {% if field|is_checkbox %}
<div class="{{ classes.single_value }}"> <div class="{{ classes.single_value }}">
<div class="checkbox"> <div class="checkbox">
<label {% if field.field.required and form.required_css_class %}class="{{ form.required_css_class }}"{% endif %}> {% if field.auto_id %}
{{ field }} <span>{{ field.label }}</span> <label {% if field.field.required and form.required_css_class %}class="{{ form.required_css_class }}"{% endif %}>
</label> {{ field }} <span>{{ field.label }}</span>
</label>
{% endif %}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help-block {{ form.error_css_class }}">{{ error }}</span> <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
@ -20,8 +21,9 @@
</div> </div>
</div> </div>
{% elif field|is_radio %} {% elif field|is_radio %}
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label> {% if field.auto_id %}
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}">{{ field.label }}</label>
{% endif %}
<div class="{{ classes.value }}"> <div class="{{ classes.value }}">
{% for choice in field %} {% for choice in field %}
<div class="radio"> <div class="radio">
@ -43,7 +45,9 @@
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}
<label class="control-label {{ classes.label }} {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">{{ field.label }}</label> {% 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>
{% endif %}
<div class="{{ classes.value }} {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}"> <div class="{{ classes.value }} {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
{{ field }} {{ field }}

2
docs/install.rst
View File

@ -63,7 +63,7 @@ CHANGELOG
- 2013-8-27: - 2013-8-27:
Add support for Bootstrap 3, contributed by `Nivl<https://github.com/Nivl>`_ Add support for Bootstrap 3, contributed by `Nivl <https://github.com/Nivl>`_
- 2013-5-7: - 2013-5-7: