Fixing StackedInline collapsible. Closes #116

douglasmiranda · Jan 29, 2018 · 4b31f1d · 4b31f1d
1 parent 741b389
commit 4b31f1d
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 37 deletions.
diff --git a/bootstrap_admin/static/admin/css/forms.css b/bootstrap_admin/static/admin/css/forms.css
@@ -112,19 +112,24 @@
   list-style: none;
 }
 
+.form-fields h2 {
+  font-size: 18px;
+}
+
+fieldset.module > h2:first-child {
+    margin-top: 0;
+}
+
+/* COLLAPSED FIELDSETS */
 #content-main .form-fields .collapse {
   display: block;
   visibility: visible;
 }
+
 .form-fields .collapsed .form-row {
   display: none;
 }
-.form-fields h2 {
-  font-size: 18px;
-}
-fieldset.module > h2:first-child {
-    margin-top: 0;
-}
+
 .form-fields .collapse h2 {
   background: #f9f9f9;
   border-bottom: 1px solid #ddd;
@@ -133,6 +138,23 @@ fieldset.module > h2:first-child {
   padding: 5px 15px;
 }
 
+fieldset.collapsed * {
+  display: none;
+}
+
+fieldset.collapsed .collapse-toggle {
+  display: inline;
+}
+
+fieldset.collapsed h2, fieldset.collapsed {
+  display: block;
+}
+
+.js-inline-admin-formset > fieldset.collapse.collapsed h2 {
+  border-bottom: 0;
+  margin-bottom: 0;
+}
+
 /*m2m filter: filter_vertical, filter_horizontal*/
 .selector {
   background: #f9f9f9;

diff --git a/bootstrap_admin/templates/admin/edit_inline/stacked.html b/bootstrap_admin/templates/admin/edit_inline/stacked.html
@@ -3,35 +3,37 @@
      id="{{ inline_admin_formset.formset.prefix }}-group"
      data-inline-type="stacked"
      data-inline-formset="{{ inline_admin_formset.inline_formset_data }}">
-  <h2 class="h4">{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
-  {{ inline_admin_formset.formset.management_form }}
-  {{ inline_admin_formset.formset.non_form_errors }}
+  <fieldset class="module {{ inline_admin_formset.classes }}">
+    <h2 class="h4">{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
+    {{ inline_admin_formset.formset.management_form }}
+    {{ inline_admin_formset.formset.non_form_errors }}
 
-  {% for inline_admin_form in inline_admin_formset %}
-    <div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
-      <h3 class="h5">
-        <div class="btn-group pull-right">
-          {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}
-            <span class="delete btn btn-default">
-              <label for="{{ inline_admin_form.deletion_field.field.id_for_label }}">
-                {{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.field.label }}
-              </label>
-            </span>
-          {% endif %}
-          {% if inline_admin_form.show_url %}
-            <a class="btn btn-default" href="{{ inline_admin_form.absolute_url }}">
-              {% trans "View on site" %}
-            </a>
-          {% endif %}
-        </div>
-        <b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span>
-      </h3>
-      {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
-      {% for fieldset in inline_admin_form %}
-        {% include "admin/includes/fieldset.html" %}
-      {% endfor %}
-      {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
-      {{ inline_admin_form.fk_field.field }}
-    </div>
-  {% endfor %}
+    {% for inline_admin_form in inline_admin_formset %}
+      <div class="inline-related{% if inline_admin_form.original or inline_admin_form.show_url %} has_original{% endif %}{% if forloop.last %} empty-form last-related{% endif %}" id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
+        <h3 class="h5">
+          <div class="btn-group pull-right">
+            {% if inline_admin_formset.formset.can_delete and inline_admin_form.original %}
+              <span class="delete btn btn-default">
+                <label for="{{ inline_admin_form.deletion_field.field.id_for_label }}">
+                  {{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.field.label }}
+                </label>
+              </span>
+            {% endif %}
+            {% if inline_admin_form.show_url %}
+              <a class="btn btn-default" href="{{ inline_admin_form.absolute_url }}">
+                {% trans "View on site" %}
+              </a>
+            {% endif %}
+          </div>
+          <b>{{ inline_admin_formset.opts.verbose_name|capfirst }}:</b>&nbsp;<span class="inline_label">{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %}#{{ forloop.counter }}{% endif %}</span>
+        </h3>
+        {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %}
+        {% for fieldset in inline_admin_form %}
+          {% include "admin/includes/fieldset.html" %}
+        {% endfor %}
+        {% if inline_admin_form.needs_explicit_pk_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+        {{ inline_admin_form.fk_field.field }}
+      </div>
+    {% endfor %}
+  </fieldset>
 </div>
diff --git a/bootstrap_admin/templates/admin/includes/fieldset.html b/bootstrap_admin/templates/admin/includes/fieldset.html
@@ -1,5 +1,5 @@
 {% load bootstrap_admin_template_tags %}
-<fieldset class="module aligned {{ fieldset.classes }} {{ inline_admin_formset.classes }}">
+<fieldset class="module aligned {{ fieldset.classes }}">
   {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
   {% if fieldset.description %}
     <div class="description">{{ fieldset.description|safe }}</div>