diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html index 8150352..e6c0f5d 100644 --- a/bootstrapform/templates/bootstrapform/field.html +++ b/bootstrapform/templates/bootstrapform/field.html @@ -6,7 +6,7 @@
{% if field.auto_id %} {% endif %} {% for error in field.errors %} @@ -22,7 +22,7 @@
{% else %}{% if field|is_radio %} {% if field.auto_id %} - + {% if label %}{% endif %} {% endif %}
{% for choice in field %} @@ -47,7 +47,7 @@ {% else %} {% if field.auto_id %} - + {% if label %}{% endif %} {% endif %}
{{ field }} diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py index 3ab5aac..3e22be2 100644 --- a/bootstrapform/templatetags/bootstrap.py +++ b/bootstrapform/templatetags/bootstrap.py @@ -5,19 +5,19 @@ register = template.Library() @register.filter -def bootstrap(element): +def bootstrap(element, label=True): markup_classes = {'label': '', 'value': '', 'single_value': ''} - return render(element, markup_classes) + return render(element, markup_classes, label) @register.filter -def bootstrap_inline(element): +def bootstrap_inline(element, label=True): markup_classes = {'label': 'sr-only', 'value': '', 'single_value': ''} - return render(element, markup_classes) + return render(element, markup_classes, label) @register.filter -def bootstrap_horizontal(element, label_cols={}): +def bootstrap_horizontal(element, label_cols={}, label=True): if not label_cols: label_cols = 'col-sm-2 col-lg-2' @@ -44,7 +44,7 @@ def bootstrap_horizontal(element, label_cols={}): markup_classes['value'] += ' ' + '-'.join(splited_class) - return render(element, markup_classes) + return render(element, markup_classes, label) def add_input_classes(field): @@ -54,13 +54,13 @@ def add_input_classes(field): field.field.widget.attrs['class'] = field_classes -def render(element, markup_classes): +def render(element, markup_classes, label=True): element_type = element.__class__.__name__.lower() if element_type == 'boundfield': add_input_classes(element) template = get_template("bootstrapform/field.html") - context = Context({'field': element, 'classes': markup_classes}) + context = Context({'field': element, 'classes': markup_classes, 'label': label}) else: has_management = getattr(element, 'management_form', None) if has_management: @@ -69,13 +69,13 @@ def render(element, markup_classes): add_input_classes(field) template = get_template("bootstrapform/formset.html") - context = Context({'formset': element, 'classes': markup_classes}) + context = Context({'formset': element, 'classes': markup_classes, 'label': label}) else: for field in element.visible_fields(): add_input_classes(field) template = get_template("bootstrapform/form.html") - context = Context({'form': element, 'classes': markup_classes}) + context = Context({'form': element, 'classes': markup_classes, 'label': label}) return template.render(context)