Skip to content

Commit

Permalink
Allow html in help texts
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Lorenz committed Sep 6, 2016
1 parent 1f6d096 commit 68389e4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
=== 1.67.X ===

- Allow html in help texts
- fixed logging filter, if no user agent could be detected
- Replace request.REQUEST
- Re-arranged utils
Expand Down
2 changes: 1 addition & 1 deletion django_libs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# -*- coding: utf-8 -*-
__version__ = '1.67.5'
__version__ = '1.67.6'
6 changes: 3 additions & 3 deletions django_libs/templates/django_libs/partials/form_field.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
{{ field }}
<span {% if field.field.required %}class="required-label"{% endif %}>{% if field.field.required %}* {% endif %}{{ field.label }}</span>
{% if field.help_text %}
<small class="text-muted"><em>{{ field.help_text }}</em></small>
<small class="text-muted"><em>{{ field.help_text|safe }}</em></small>
{% endif %}
</label>
</div>
{% elif "CheckboxSelectMultiple" in field_type %}
<div class="checkbox">
{{ field }}
{% if field.help_text %}
<small class="text-muted"><em>{{ field.help_text }}</em></small>
<small class="text-muted"><em>{{ field.help_text|safe }}</em></small>
{% endif %}
</div>
{% elif "RadioSelect" in field_type %}
Expand Down Expand Up @@ -59,7 +59,7 @@
<span class="help-block">{% for error in field.errors %}{{ error }}<br/> {% endfor %}</span>
{% endif %}
{% if field.help_text %}
<small class="text-muted"><em>{{ field.help_text }}</em></small>
<small class="text-muted"><em>{{ field.help_text|safe }}</em></small>
{% endif %}
{% if horizontal %}</div>{% endif %}
</div>
Expand Down

0 comments on commit 68389e4

Please sign in to comment.