Skip to content

Added EmailField with domain ending #79

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 2 commits into
base: master
Choose a base branch
from
Open

Added EmailField with domain ending #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2beb4aa
Added EmailField which has a given domain ending
Dec 20, 2015
0bc3b2d
Added EmailField which has a given domain ending
Dec 20, 2015
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
21 changes: 21 additions & 0 deletions bootstrapform/templates/bootstrapform/field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,27 @@
</p>
{% endif %}
</div>
{% elif field|is_email and classes.domain %}
{% 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 }}">
<div class="input-group">
{{ field }}
<span class="input-group-addon" id="{{ field.auto_id }}-addon">{{ classes.domain }}</span>
</div>

{% for error in field.errors %}
<span class="help-block {{ form.error_css_class }}">{{ error }}</span>
{% endfor %}

{% if field.help_text %}
<p class="help-block">
{{ field.help_text|safe }}
</p>
{% endif %}
</div>
{% 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>
Expand Down
19 changes: 15 additions & 4 deletions bootstrapform/templatetags/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,26 @@

@register.filter
def bootstrap(element):
markup_classes = {'label': '', 'value': '', 'single_value': ''}
markup_classes = {'label': '', 'value': '', 'single_value': '', 'domain': ''}
return render(element, markup_classes)

@register.filter
def bootstrap_email(element, domain='example.com'):
markup_classes = {'label': '', 'value': '', 'single_value': '', 'domain': domain}
element.field.widget.attrs.update({'aria-describedby' : element.id_for_label + '-addon'})
element.field.widget.attrs.update({'class' : 'form-control' })
return render(element, markup_classes)

@register.filter
def bootstrap_inline(element):
markup_classes = {'label': 'sr-only', 'value': '', 'single_value': ''}
markup_classes = {'label': 'sr-only', 'value': '', 'single_value': '', 'domain': ''}
return render(element, markup_classes)


@register.filter
def bootstrap_horizontal(element, label_cols='col-sm-2 col-lg-2'):

markup_classes = {'label': label_cols, 'value': '', 'single_value': ''}
markup_classes = {'label': label_cols, 'value': '', 'single_value': '', 'domain': ''}

for cl in label_cols.split(' '):
splitted_class = cl.split('-')
Expand All @@ -48,7 +54,8 @@ def bootstrap_horizontal(element, label_cols='col-sm-2 col-lg-2'):
@register.filter
def add_input_classes(field):
if not is_checkbox(field) and not is_multiple_checkbox(field) \
and not is_radio(field) and not is_file(field):
and not is_radio(field) and not is_file(field) \
and not is_email(field):
field_classes = field.field.widget.attrs.get('class', '')
field_classes += ' form-control'
field.field.widget.attrs['class'] = field_classes
Expand Down Expand Up @@ -79,6 +86,10 @@ def render(element, markup_classes):

return template.render(context)

@register.filter
def is_email(field):
return isinstance(field.field.widget, forms.EmailInput)


@register.filter
def is_checkbox(field):
Expand Down