github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the code and modify the displaying of the help for label in general_fields files

Browse Source
This commit is contained in:
Maël Solard
2014-08-19 22:41:36 +02:00
parent c13f16ccbf
commit 46ba4dc2ec
2 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/templates/common/generic_field.html
+52 -11
View File
@@ -1,13 +1,54 @@
{% load i18n core_tags lib_tags %}
<div class="form-group {% if field.errors %}error{% endif %}{{ extra_classes }}"{% visirule field %}{% if hidden %}style="display: none"{% endif %}>
{% if field.label %}<label class="control-label col-lg-3 col-md-4 col-sm-4" for="id_{{ field.html_name }}">{{ field.label }}</label>{% endif %}{% if help_display_mode == "tooltip" and field.help_text %}<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>{% endif %}
<div class="col-lg-5 col-md-5 col-sm-5">
{% if appended_text %}<div class="input-group">{% endif %}
{{ field }}{% if appended_text %}<span class="input-group-addon">{{ appended_text }}</span></div>{% endif %}{% if help_display_mode == "inline" and field.help_text %}<span class="help-block pull-right">{{ field.help_text }}</span>{% endif %}{% if inline_message %}<span class="help-block pull-right">{{ inline_message }}</span>{% endif %}
{% if activator %}<div class="checkbox"><label class="checkbox-inline" for="id_{{ field.name }}_act">
<input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act" {% if activator_value %}checked='checked'{% else %}{% if deactivate_if_empty and field.value == None %}checked='checked'{% endif %}{% endif %}/>{{ activator_label }}
</label></div>{% endif %}
{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
{% block extra_controls %}{% endblock %}
</div>
<div class="form-group
{% if field.errors %}error{% endif %}
{{ extra_classes }}"{% visirule field %}
{% if hidden %}style="display: none"{% endif %}
>
{% if field.label %}
<label class="control-label col-lg-4 col-md-4 col-sm-4" for="id_{{ field.html_name }}">{{ field.label }}
{% if help_display_mode == "tooltip" and field.help_text %}
<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ field.label }}" data-content="{{ field.help_text }}" rel="popover">?</a>
{% endif %}
</label>
{% endif %}
<div class="col-lg-5 col-md-5 col-sm-5">
{% if appended_text %}
<div class="input-group">
{% endif %}
{{ field }}
{% if appended_text %}
<span class="input-group-addon">{{ appended_text }}</span></div>
{% endif %}
{% if help_display_mode == "inline" and field.help_text %}
<span class="help-block pull-right">{{ field.help_text }}</span>
{% endif %}
{% if inline_message %}
<span class="help-block pull-right">{{ inline_message }}</span>
{% endif %}
{% if activator %}
<div class="checkbox">
<label class="checkbox-inline" for="id_{{ field.name }}_act">
<input type="checkbox" class="activator" id="id_{{ field.name }}_act" name="{{ field.name }}_act"
{% if activator_value %}checked='checked'
{% else %}
{% if deactivate_if_empty and field.value == None %}
checked='checked'
{% endif %}
{% endif %}/>
{{ activator_label }}
</label>
</div>
{% endif %}
{% if field.errors %}
<p class="help-block">
{% for error in field.errors %}
{{ error|safe }}
{% endfor %}
</p>
{% endif %}
{% block extra_controls %}
{% endblock %}
</div>
</div>
modoboa/templates/common/generic_fields_group.html
+18 -6
View File
@@ -1,9 +1,21 @@
{% load i18n %}
<div class="form-group {% if haserror %} error{% endif %}">
<label class="control-label col-lg-3 col-md-4 col-sm-4">{{ label }}</label>{% if help_text %}<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>{% endif %}
<div class="controls col-lg-5 col-md-5 col-sm-5">
{% for field in group %}
{{ field }}{% if field.errors %}<p class="help-block">{% for error in field.errors %}{{ error|safe }}{% endfor %}</p>{% endif %}
{% endfor %}
</div>
<label class="control-label col-lg-4 col-md-4 col-sm-4">
{{ label }}
{% if help_text %}
<a href="#" class="help" data-original-title="{% trans 'Help:' %} {{ label }}" data-content="{{ help_text }}" rel="popover">?</a>
{% endif %}
</label>
<div class="controls col-lg-5 col-md-5 col-sm-5">
{% for field in group %}
{{ field }}
{% if field.errors %}
<p class="help-block">
{% for error in field.errors %}
{{ error|safe }}
{% endfor %}
</p>
{% endif %}
{% endfor %}
</div>
</div>