mirror of
https://github.com/Hopiu/django-fobi.git
synced 2026-05-21 10:51:52 +00:00
Merge branch 'template-cleanup' into form-id
This commit is contained in:
Artur Barseghyan
GitHub
commit
9a160d929b
11 changed files with 22 additions and 20 deletions
|
|
@ -15,6 +15,17 @@ are used for versioning (schema follows below):
|
|||
0.3.4 to 0.4).
|
||||
- All backwards incompatible changes are mentioned in this document.
|
||||
|
||||
0.12.15
|
||||
--------
|
||||
2018-mm-dd (not yet released)
|
||||
|
||||
- Minor clean up of HTML templates (in some templates
|
||||
``hidden_form_element_wrapper_html_class`` was used while others
|
||||
``form_element_wrapper_hidden_html_class``). Now
|
||||
``form_element_wrapper_hidden_html_class`` is used everywhere. Some HTML
|
||||
files have been re-indented (2 spaces).
|
||||
- Minor clean up of JS.
|
||||
|
||||
0.12.14
|
||||
--------
|
||||
2018-01-10
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
{% block form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
||||
{% block hidden_form_element_error_html_class%}has-error{% endblock %}
|
||||
{% block form_element_wrapper_error_html_class %}has-error{% endblock %}
|
||||
|
||||
{% block form_checkbox_element_field_wrapper_html_class %}col-sm-offset-2 col-sm-9{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
{% block form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
||||
{% block form_element_wrapper_error_html_class%}has-error{% endblock %}
|
||||
{% block form_element_wrapper_error_html_class %}has-error{% endblock %}
|
||||
|
||||
{% block form_element_label_html_class %}col-sm-3 control-label{% endblock %}
|
||||
|
||||
|
|
@ -19,5 +19,3 @@
|
|||
{% block form_element_error_html_class %}help-block has-error{% endblock %}
|
||||
|
||||
{% block form_element_help_text_html_class %}help-block{% endblock %}
|
||||
|
||||
{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
|
||||
{% block form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
||||
{% block hidden_form_element_error_html_class%}has-error{% endblock %}
|
||||
|
||||
{% block form_checkbox_element_field_wrapper_html_class %}col-sm-offset-2 col-sm-9{% endblock %}
|
||||
|
||||
{% block form_element_label_html_class %}col-sm-3 control-label{% endblock %}
|
||||
|
|
|
|||
|
|
@ -19,5 +19,3 @@
|
|||
{% block form_element_error_html_class %}help-block has-error{% endblock %}
|
||||
|
||||
{% block form_element_help_text_html_class %}help-block{% endblock %}
|
||||
|
||||
{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
|
|
|||
|
|
@ -19,5 +19,3 @@
|
|||
{% block form_element_error_html_class %}help-block has-error{% endblock %}
|
||||
|
||||
{% block form_element_help_text_html_class %}help-block{% endblock %}
|
||||
|
||||
{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
|
|
|||
|
|
@ -19,5 +19,3 @@
|
|||
{% block form_element_error_html_class %}help-block has-error{% endblock %}
|
||||
|
||||
{% block form_element_help_text_html_class %}help-block{% endblock %}
|
||||
|
||||
{% block hidden_form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ FobiCore.prototype = {
|
|||
|
||||
};
|
||||
|
||||
|
||||
var fobiCore = new FobiCore();
|
||||
|
||||
$(document).ready(function() {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
{% for field in form %}
|
||||
{% if field.is_hidden %}
|
||||
<div class="{% block hidden_form_element_wrapper_html_class %}hidden{% endblock %}">
|
||||
<div class="{% block form_element_wrapper_hidden_html_class %}hidden{% endblock %}">
|
||||
{{ field }}
|
||||
</div>
|
||||
{% else %}
|
||||
|
|
@ -26,9 +26,11 @@
|
|||
{% endif %}
|
||||
{% endspaceless %}">
|
||||
|
||||
<label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
|
||||
{{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
|
||||
</label>
|
||||
{% if field.label %}
|
||||
<label class="{% block form_element_label_html_class %}{% endblock %}" for="{{ field.id_for_label }}">
|
||||
{{ field.label }}{% if field.field.required %}<span class="{% block form_element_required_field_sign_html_class %}required-field{% endblock %}">*</span>{% endif %}
|
||||
</label>
|
||||
{% endif %}
|
||||
|
||||
<div class="{% block form_element_field_wrapper_html_class %}{% endblock %}">
|
||||
{% get_form_field_type field as form_field_type %}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
{% get_form_field_type field as field_type %}
|
||||
<div class="{% spaceless %}
|
||||
{% block form_element_wrapper_html_class %}{% endblock %}
|
||||
{% if field.errors %} {% block hidden_form_element_error_html_class%}{% endblock %}{% endif %}
|
||||
{% if field.errors %} {% block form_element_wrapper_error_html_class %}{% endblock %}{% endif %}
|
||||
{% endspaceless %}">
|
||||
|
||||
{% if field_type.is_checkbox %}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
{% for field in form %}
|
||||
|
||||
{% if field.is_hidden %}
|
||||
<div class="{% block hidden_form_element_wrapper_html_class %}hidden{% endblock %}">{{ field }}</div>
|
||||
<div class="{% block form_element_wrapper_hidden_html_class %}hidden{% endblock %}">{{ field }}</div>
|
||||
{% else %}
|
||||
<div class="{% spaceless %}
|
||||
{% block form_element_wrapper_html_class %}form-group{% endblock %}
|
||||
|
|
@ -70,4 +70,4 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue