DGNum/kadenios
16
0
Fork 0
Code Issues 12 Pull requests Projects Wiki Activity

Use label_tag to add punctuation

Browse source
This commit is contained in:
Tom Hubrecht 2020-12-19 15:28:32 +01:00
parent d418fd9e3d
commit bc7967f01a
8 changed files with 67 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
elections/templates/elections/forms/field.html
View file

@ -3,31 +3,31 @@
<div class="field"> <div class="field">
{% if field|is_checkbox %} {% if field|is_checkbox %}
{% include "elections/forms/checkbox.html" with field=field %} {% include "elections/forms/checkbox.html" with field=field %}
{% elif field|is_radio %} {% elif field|is_radio %}
{% include "elections/forms/radio.html" with field=field %} {% include "elections/forms/radio.html" with field=field %}
{% elif field|is_input %} {% elif field|is_input %}
{% include "elections/forms/input.html" with field=field %} {% include "elections/forms/input.html" with field=field %}
{% elif field|is_textarea %} {% elif field|is_textarea %}
{% include "elections/forms/textarea.html" with field=field %} {% include "elections/forms/textarea.html" with field=field %}
{% elif field|is_select %} {% elif field|is_select %}
{% include "elections/forms/select.html" with field=field %} {% include "elections/forms/select.html" with field=field %}
{% elif field|is_file %} {% elif field|is_file %}
{% include "elections/forms/file.html" with field=field %} {% include "elections/forms/file.html" with field=field %}
{% else %} {% else %}
{% include "elections/forms/other.html" with field=field %} {% include "elections/forms/other.html" with field=field %}
{% endif %} {% endif %}
</div> </div>

13
elections/templates/elections/forms/file.html
View file

@ -1,5 +1,4 @@
{% load bulma_utils %} {% load bulma_utils i18n %}
{% load i18n %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
{{ field.label }} {{ field.label }}
@ -20,12 +19,12 @@
</label> </label>
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>

28
elections/templates/elections/forms/form.html
View file

@ -1,22 +1,22 @@
{% if errors %} {% if errors %}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<div class="message is-danger"> <div class="message is-danger">
<div class="message-header"> <div class="message-header">
<button class="delete" aria-label="delete"></button> <button class="delete" aria-label="delete"></button>
</div> </div>
<div class="message-body"> <div class="message-body">
{% for non_field_error in form.non_field_errors %} {% for non_field_error in form.non_field_errors %}
{{ non_field_error }} {{ non_field_error }}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% for field in form.hidden_fields %} {% for field in form.hidden_fields %}
{{ field }} {{ field }}
{% endfor %} {% endfor %}
{% for field in form.visible_fields %} {% for field in form.visible_fields %}
{% include 'elections/forms/field.html' %} {% include 'elections/forms/field.html' %}
{% endfor %} {% endfor %}

12
elections/templates/elections/forms/input.html
View file

@ -1,19 +1,19 @@
{% load bulma_utils %} {% load bulma_utils %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
{{ field.label }} {{ field.label_tag }}
</label> </label>
<div class="control"> <div class="control">
{{ field|bulmafy:'input' }} {{ field|bulmafy:'input' }}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>

16
elections/templates/elections/forms/other.html
View file

@ -1,19 +1,19 @@
{% if field.auto_id %} {% if field.auto_id %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}" for="{{ field.auto_id }}">
{{ field.label }} {{ field.label }}
</label> </label>
{% endif %} {% endif %}
<div class="control {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}"> <div class="control {% if field|is_multiple_checkbox %}multiple-checkbox{% endif %}">
{{ field }} {{ field }}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>

24
elections/templates/elections/forms/radio.html
View file

@ -1,24 +1,24 @@
{% if field.auto_id %} {% if field.auto_id %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
{{ field.label }} {{ field.label_tag }}
</label> </label>
{% endif %} {% endif %}
<div class="control"> <div class="control">
{% for choice in field %} {% for choice in field %}
<label class="radio"> <label class="radio">
{{ choice.tag }} {{ choice.tag }}
{{ choice.choice_label }} {{ choice.choice_label }}
</label> </label>
{% endfor %} {% endfor %}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>

12
elections/templates/elections/forms/select.html
View file

@ -1,7 +1,7 @@
{% load bulma_utils %} {% load bulma_utils %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
{{ field.label }} {{ field.label_tag }}
</label> </label>
<div class="control"> <div class="control">
@ -10,12 +10,12 @@
</span> </span>
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>

14
elections/templates/elections/forms/textarea.html
View file

@ -1,19 +1,19 @@
{% load bulma_utils %} {% load bulma_utils %}
<label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}"> <label class="label {% if field.field.required %}{{ form.required_css_class }}{% endif %}">
{{ field.label }} {{ field.label_tag }}
</label> </label>
<div class="control"> <div class="control">
{{ field|bulmafy:'textarea' }} {{ field|bulmafy:'textarea' }}
{% for error in field.errors %} {% for error in field.errors %}
<span class="help is-danger {{ form.error_css_class }}">{{ error }}</span> <span class="help is-danger {{ form.error_css_class }}">{{ error }}</span>
{% endfor %} {% endfor %}
{% if field.help_text %} {% if field.help_text %}
<p class="help"> <p class="help">
{{ field.help_text|safe }} {{ field.help_text|safe }}
</p> </p>
{% endif %} {% endif %}
</div> </div>