Upgrade crispy to 1.4.0

requirements.txt

@@ -1,2 +1,2 @@
 django>=1.4
-django-crispy-forms>=1.2.3
+django-crispy-forms>=1.4.0

xadmin/layout.py

@@ -61,7 +61,7 @@ class Container(layout.Div):
 # Override bootstrap3
 class InputGroup(layout.Field):
 
-    template = "bootstrap3/layout/input_group.html"
+    template = "xadmin/layout/input_group.html"
 
     def __init__(self, field, *args, **kwargs):
         self.field = field

xadmin/static/xadmin/css/xadmin.form.css

@@ -7,25 +7,44 @@ select.selectmultiple {
 .select2-container{
   width: 100%;
 }
+.select2-container.form-control{
+  padding: 0px;
+  border: 0px;
+}
 .select2-container .select2-choice {
   height: 35px;
   padding-top: 3px;
 }
 
 /* form css */
+.form-container .column{
+  min-height: 60px;
+}
+.form-group {
+  margin-right: -15px;
+  margin-left: -15px;
+}
 .control-label {
   padding: 6px 10px;
   font-weight: bold;
 }
 .controls {
   padding: 0px 15px 0px 15px;
 }
+.controls:before,
+.controls:after {
+  display: table;
+  content: " ";
+}
+.controls:after {
+  clear: both;
+}
 .control-wrap {
   display: block;
   width: 100%;
   padding-right: 45px;
 }
-.asterisk_field {
+.asteriskField, .asterisk-field {
   color: red;
 }
 
@@ -34,10 +53,6 @@ select.selectmultiple {
   display: inline-block;
 }
 
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  margin-top: 0px;
-}
 .help-block {
   margin-bottom: 0px;
 }

xadmin/templates/bootstrap3/field.html

@@ -1,39 +1,36 @@
 {% load crispy_forms_field %}
 
 {% if field.is_hidden %}
-	{{ field }}
+    {{ field }}
 {% else %}
-	<div id="div_{{ field.auto_id }}" class="form-group row{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if form_show_errors%}{% if field.errors %} has-error{% endif %}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
-
-		{% if field.label and not field|is_checkbox %}
-			<label for="{{ field.id_for_label }}" class="control-label">
-				{{ field.label|safe }}{% if field.field.required %}<span class="asterisk_field">*</span>{% endif %}
-			</label>
-		{% endif %}
+    <{% if tag %}{{ tag }}{% else %}div{% endif %} id="div_{{ field.auto_id }}" class="form-group{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if form_show_errors%}{% if field.errors %} has-error{% endif %}{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
+        {% if field.label and not field|is_checkbox and form_show_labels %}
+            <label for="{{ field.id_for_label }}" class="control-label {{ label_class }}{% if field.field.required %} requiredField{% endif %}">
+                {{ field.label|safe }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+            </label>
+        {% endif %}
 
-        {% if field|css_class == "checkboxselectmultiple" %}
+        {% if field|is_checkboxselectmultiple %}
             {% include 'bootstrap3/layout/checkboxselectmultiple.html' %}
         {% endif %}
 
-        {% if field|css_class == "radioselect" %}
+        {% if field|is_radioselect %}
             {% include 'bootstrap3/layout/radioselect.html' %}
         {% endif %}
 
-        {% if field|css_class != "checkboxselectmultiple" and field|css_class != "radioselect" %}
-            <div class="controls clearfix">
+        {% if not field|is_checkboxselectmultiple and not field|is_radioselect %}
+            <div class="controls {{ field_class }}">
                 {% if field|is_checkbox %}
-                    <label for="{{ field.id_for_label }}" class="checkbox {% if field.field.required %}requiredField{% endif %}">
+                    <label for="{{ field.id_for_label }}" class="checkbox {% if field.field.required %} requiredField{% endif %}">
                         {% crispy_field field %}
                         {{ field.label|safe }}
                         {% include 'bootstrap3/layout/help_text_and_errors.html' %}
                     </label>
                 {% else %}
-                    {% block normal_field %}
                     {% crispy_field field %}
-                    {% endblock normal_field %}
                     {% include 'bootstrap3/layout/help_text_and_errors.html' %}
                 {% endif %}
             </div>
         {% endif %}
-	</div>
+    </{% if tag %}{{ tag }}{% else %}div{% endif %}>
 {% endif %}