diff --git a/src/unfold/templates/admin/edit_inline/stacked.html b/src/unfold/templates/admin/edit_inline/stacked.html index 0bea94d1..0550a7cd 100644 --- a/src/unfold/templates/admin/edit_inline/stacked.html +++ b/src/unfold/templates/admin/edit_inline/stacked.html @@ -13,82 +13,75 @@

-

- {% trans "No records found." %} -

- - {% else %} -
- {% for inline_admin_form in inline_admin_formset %} - - {% endfor %} -
- {% endif %} + {% if inline_admin_form.fk_field %}{{ inline_admin_form.fk_field.field }}{% endif %} + + {% endfor %} + diff --git a/src/unfold/templates/admin/edit_inline/tabular.html b/src/unfold/templates/admin/edit_inline/tabular.html index 98367f5c..9861108d 100644 --- a/src/unfold/templates/admin/edit_inline/tabular.html +++ b/src/unfold/templates/admin/edit_inline/tabular.html @@ -15,154 +15,146 @@

- {% trans "No records found." %} -

- {% else %} -
- - - - {% for field in inline_admin_formset.fields %} - {% if not field.widget.is_hidden %} - - {% endif %} - {% endfor %} - - {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %} - - {% endif %} +
+
+ + + {% for field in inline_admin_formset.fields %} + {% if not field.widget.is_hidden %} + + {% endif %} + {% endfor %} + + {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %} + + {% endif %} + + + + + {% for inline_admin_form in inline_admin_formset %} + {% if inline_admin_form.form.non_field_errors %} + + - - - - {% for inline_admin_form in inline_admin_formset %} - {% if inline_admin_form.form.non_field_errors %} - - - - {% endif %} + {% endif %} - {% if inline_admin_form.original or inline_admin_form.show_url %} - - + + + {% endif %} + + + {% spaceless %} + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + {% if not field.is_readonly and field.field.is_hidden %} + {{ field.field }} {% endif %} - - - {% endif %} - - - {% spaceless %} - {% for fieldset in inline_admin_form %} - {% for line in fieldset %} - {% for field in line %} - {% if not field.is_readonly and field.field.is_hidden %} - {{ field.field }} - {% endif %} - {% endfor %} - {% endfor %} {% endfor %} - {% endspaceless %} - - {% with is_last_row=forloop.last %} - {% for fieldset in inline_admin_form %} - {% for line in fieldset %} - {% with is_last_col=forloop.last %} - {% for field in line %} - {% if field.is_readonly or not field.field.is_hidden %} - - {% if field.is_readonly %} - {% include "unfold/helpers/field_readonly_value.html" with tabular=1 %} - {% else %} - {{ field.field }} - - {% if field.field.errors|length > 0 %} -
- {% for error in field.field.errors %} - {{ error }} - {% endfor %} -
- {% endif %} - {% endif %} - + {% endfor %} + {% endfor %} + {% endspaceless %} + + {% with is_last_row=forloop.last %} + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% with is_last_col=forloop.last %} + {% for field in line %} + {% if field.is_readonly or not field.field.is_hidden %} + + {% if field.is_readonly %} + {% include "unfold/helpers/field_readonly_value.html" with tabular=1 %} + {% else %} + {{ field.field }} + + {% if field.field.errors|length > 0 %} +
+ {% for error in field.field.errors %} + {{ error }} + {% endfor %} +
+ {% endif %} {% endif %} - {% endfor %} - {% endwith %} + + {% endif %} {% endfor %} - {% endfor %} + {% endwith %} + {% endfor %} + {% endfor %} - {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %} -
+ {% if inline_admin_formset.formset.can_delete and inline_admin_formset.has_delete_permission %} + - {% endfor %} - -
+ {% include "unfold/helpers/messages/error.html" with errors=inline_admin_form.form.non_field_errors %} +
- {% include "unfold/helpers/messages/error.html" with errors=inline_admin_form.form.non_field_errors %} -
- {% if not inline_admin_formset.opts.hide_title %} - {% if inline_admin_form.original or inline_admin_form.show_url %} -

- {% if inline_admin_form.original %} - - {% with inline_title=inline_admin_form.original.get_inline_title %} - {% if inline_title %} - {{ inline_title }} - {% else %} - {{ inline_admin_form.original }} - {% endif %} - {% endwith %} - - - {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} - - {% if inline_admin_formset.has_change_permission %} - {% translate "Change" %} - {% else %} - {% translate "View" %} - {% endif %} - + {% if inline_admin_form.original or inline_admin_form.show_url %} +

+ {% if not inline_admin_formset.opts.hide_title %} + {% if inline_admin_form.original or inline_admin_form.show_url %} +

+ {% if inline_admin_form.original %} + + {% with inline_title=inline_admin_form.original.get_inline_title %} + {% if inline_title %} + {{ inline_title }} + {% else %} + {{ inline_admin_form.original }} {% endif %} - {% endif %} + {% endwith %} + + + {% if inline_admin_form.model_admin.show_change_link and inline_admin_form.model_admin.has_registered_model %} + + {% if inline_admin_formset.has_change_permission %} + {% translate "Change" %} + {% else %} + {% translate "View" %} + {% endif %} + + {% endif %} + {% endif %} - {% if inline_admin_form.show_url %} - - {% translate "View on site" %} - - {% endif %} -

+ {% if inline_admin_form.show_url %} + + {% translate "View on site" %} + {% endif %} - {% endif %} +

+ {% endif %} + {% endif %} - {% if inline_admin_form.needs_explicit_pk_field %} - {{ inline_admin_form.pk_field.field }} - {% endif %} + {% if inline_admin_form.needs_explicit_pk_field %} + {{ inline_admin_form.pk_field.field }} + {% endif %} - {% if inline_admin_form.fk_field %} - {{ inline_admin_form.fk_field.field }} + {% if inline_admin_form.fk_field %} + {{ inline_admin_form.fk_field.field }} + {% endif %} +
- {% if inline_admin_form.original %} -
-
- {{ inline_admin_form.deletion_field.field|add_css_class:form_classes.checkbox }} -
-
- {% endif %} -
+ {% if inline_admin_form.original %} +
+
+ {{ inline_admin_form.deletion_field.field|add_css_class:form_classes.checkbox }} +
+
{% endif %} - {% endwith %} -
-
- {% endif %} + + {% endif %} + {% endwith %} + + {% endfor %} + +