diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 6a89c6b454..472a5246af 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -9,9 +9,9 @@ {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block breadcrumbs %}{% if not is_popup %} {% endif %}{% endblock %} {% block content %}
diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index b2f1a9cf6e..66e5afd334 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -2,7 +2,7 @@ {% load adminmedia admin_list i18n breadcrumbs %} {% block bodyclass %}change-list{% endblock %} {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% if not is_popup %}{% block breadcrumbs %}{% endblock %}{% endif %} +{% if not is_popup %}{% block breadcrumbs %}{% endblock %}{% endif %} {% block coltype %}flex{% endblock %} {% block content %}
diff --git a/django/contrib/admin/templates/admin/submit_line.html b/django/contrib/admin/templates/admin/submit_line.html index cf6376eb21..25f581963e 100644 --- a/django/contrib/admin/templates/admin/submit_line.html +++ b/django/contrib/admin/templates/admin/submit_line.html @@ -1,6 +1,6 @@ {% load i18n %}
-{% if show_delete_link %}

{% trans "Delete" %}

{% endif %} +{% if show_delete_link %}

{% trans "Delete" %}

{% endif %} {% if show_save_as_new %}{%endif%} {% if show_save_and_add_another %}{% endif %} {% if show_save_and_continue %}{% endif %} diff --git a/django/contrib/admin/templatetags/breadcrumbs.py b/django/contrib/admin/templatetags/breadcrumbs.py deleted file mode 100644 index a8a48f2ea2..0000000000 --- a/django/contrib/admin/templatetags/breadcrumbs.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.template import Library - -register = Library() - -def path_breadcrumbs(path, overrides="", front=0, back=0): - overs = overrides.split('/') - comps = [""] * int(front) + path.split('/')[:-1] - backs = int(back) + len(comps) - overs.extend([None for x in range(len(overs) -1, len(comps))]) - text = [] - for comp, ov in zip(comps, overs): - label = ov or comp - text.append("%s › \n" % ("../" * backs, label)) - backs -= 1 - return "".join(text) -path_breadcrumbs = register.simple_tag(path_breadcrumbs)