Skip to content

Added label display control #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added label display control #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9825902
Update field.html
diopib Nov 18, 2013
d62348d
Update bootstrap.py
diopib Nov 18, 2013
26f88dc
Update bootstrap.py
diopib Nov 20, 2013
2f7d12d
little bugfix
diopib Jan 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bootstrapform/templates/bootstrapform/field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="checkbox">
{% if field.auto_id %}
<label>
{{ field }} <span>{{ field.label }}</span>
{{ field }} {% if label %}<span>{{ field.label }}</span>{% endif %}
</label>
{% endif %}
{% for error in field.errors %}
Expand All @@ -22,7 +22,7 @@
</div>
{% else %}{% if field|is_radio %}
{% if field.auto_id %}
<label class="control-label {{ classes.label }}">{{ field.label }}</label>
{% if label %}<label class="control-label {{ classes.label }}">{{ field.label }}</label>{% endif %}
{% endif %}
<div class="{{ classes.value }}">
{% for choice in field %}
Expand All @@ -47,7 +47,7 @@

{% else %}
{% if field.auto_id %}
<label class="control-label {{ classes.label }}" for="{{ field.auto_id }}">{{ field.label }}</label>
{% if label %}<label class="control-label {{ classes.label }}" for="{{ field.auto_id }}">{{ field.label }}</label>{% endif %}
{% endif %}
<div class="{{ classes.value }}">
{{ field }}
Expand Down
20 changes: 10 additions & 10 deletions bootstrapform/templatetags/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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):
Expand All @@ -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:
Expand All @@ -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)

Expand Down