Update recover form breadcrumbs and tidy object-tools/submit buttons to match Reversion 2.0 template

Daniel Jowett · Daniel Jowett · commit 103265ec2754 · 2017-11-30T15:56:20.000Z
diff --git a/feincms/templates/admin/feincms/recover_form.html b/feincms/templates/admin/feincms/recover_form.html
@@ -1,17 +1,22 @@
 {% extends "admin/feincms/item_editor.html" %}
 
-{% load i18n %}
+{% load i18n admin_urls %}
 
 {% block breadcrumbs %}
         <div class="breadcrumbs">
-                <a href="{% url "admin:index" %}">{% trans "Home" %}</a> &rsaquo;
-                <a href="{% url "admin:app_list" app_label %}">{{app_label|capfirst|escape}}</a> &rsaquo;
-                <a href="{{changelist_url}}">{{opts.verbose_name_plural|capfirst}}</a> &rsaquo;
-                <a href="{{recoverlist_url}}">{% blocktrans with opts.verbose_name as verbose_name %}Recover deleted {{verbose_name}}{% endblocktrans %}</a> &rsaquo;
+                <a href="{% url 'admin:index' %}">{% trans "Home" %}</a> &rsaquo;
+                <a href="{% url 'admin:app_list' opts.app_label %}">{{opts.app_config.verbose_name}}</a> &rsaquo;
+                <a href="{% url opts|admin_urlname:'changelist' %}">{{opts.verbose_name_plural|capfirst}}</a> &rsaquo;
+                <a href="{% url opts|admin_urlname:'recoverlist' %}">{% blocktrans with opts.verbose_name as verbose_name %}Recover deleted {{verbose_name}}{% endblocktrans %}</a> &rsaquo;
                 {{title}}
         </div>
 {% endblock %}
 
+{% block object-tools %}{% endblock %}
+
 {% block form_top %}
         <p>{% blocktrans %}Press the save button below to recover this version of the object.{% endblocktrans %}</p>
 {% endblock %}
+
+{% block submit_buttons_top %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}
+{% block submit_buttons_bottom %}{% with is_popup=1 %}{{block.super}}{% endwith %}{% endblock %}
