Improve custom templates compatibility

jet/static/jet/css/_changeform.scss

@@ -1,6 +1,10 @@
 @import "globals";
 
 .module {
+  &-separator {
+    height: 1em;
+  }
+
   .form-row {
     padding: 6px 0;
     overflow: hidden;
@@ -18,6 +22,10 @@
       }
     }
 
+    br {
+      clear: both;
+    }
+
     &.errors label {
       color: $error-text-color;
     }
@@ -96,6 +104,23 @@
       }
     }
   }
+
+  &.aligned {
+    background-color: $content-background-color;
+    border-radius: 4px;
+    padding: 20px;
+
+    ul label {
+      display: inline;
+      float: none;
+      width: auto;
+    }
+
+    ul {
+      margin: 0 0 0 160px;
+      padding: 0;
+    }
+  }
 }
 
 .submit-row {
@@ -170,10 +195,6 @@
   }
 
   .module {
-    padding: 0;
-    background: none;
-    border-radius: 0;
-
     .form-row {
       .select2 {
         max-width: 800px - 20px * 2 - 150px - 24px;
@@ -181,10 +202,6 @@
     }
   }
 
-  .aligned {
-    padding: 20px 20px 0 20px;
-  }
-
   .inline-group {
     .errornote {
       color: $error-text-color;

jet/templates/admin/change_form.html

@@ -45,6 +45,7 @@
         <form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>
             {% csrf_token %}
             {% block form_top %}{% endblock %}
+            {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
             {% filter_fieldsets_with_errors adminform as fieldsets_with_errors %}
             <div class="changeform">
                 {% if adminform.fieldsets|length > 1 or inline_admin_formsets|length > 0 %}
@@ -77,7 +78,6 @@
 
                 {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %}
                 {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %}
-                {% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
                 {% if errors %}
                     {{ adminform.form.non_field_errors }}
                 {% endif %}
@@ -103,8 +103,6 @@
 
                 {% block after_related_objects %}{% endblock %}
 
-                {% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
-
                 {% block admin_change_form_document_ready %}
                     <script type="text/javascript">
                         (function($) {
@@ -128,6 +126,7 @@
                 {# JavaScript for prepopulated fields #}
                 {% prepopulated_fields_js %}
             </div>
+            {% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
         </form>
     </div>
 {% endblock %}

jet/templates/registration/password_change_form.html

@@ -46,12 +46,11 @@
                     </div>
                 </fieldset>
 
-                <div class="submit-row">
-                    <input type="submit" value="{% trans 'Change my password' %}" class="default" />
-                </div>
-
                 <script type="text/javascript">document.getElementById("id_old_password").focus();</script>
             </div>
+            <div class="submit-row">
+                <input type="submit" value="{% trans 'Change my password' %}" class="default" />
+            </div>
         </form>
     </div>
 {% endblock %}