From 64aac99d9711cd5e5eeaf0f455d15c4d25222e60 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 7 Jul 2016 16:42:04 +0100
Subject: [PATCH] Add back buttons to page delete / unpublish confirmation
 pages

Fixes #2213
---
 .../wagtailadmin/pages/confirm_delete.html         | 14 +++++++++-----
 .../wagtailadmin/pages/confirm_unpublish.html      |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
index 121c827e45..0dc74a40da 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
@@ -17,14 +17,18 @@
                 {% endblocktrans %}
             {% endif %}
         </p>
-        {% page_permissions page as page_perms %}
-        {% if page_perms.can_unpublish %}
-            <p>{% trans "Alternatively you can unpublish the page. This removes the page from public view and you can edit or publish it again later." %}</p>
-        {% endif %}
+
         <form action="{% url 'wagtailadmin_pages:delete' page.id %}" method="POST">
             {% csrf_token %}
             <input type="hidden" name="next" value="{{ next }}">
-            <input type="submit" value="{% trans 'Delete it' %}" class="button serious {% if page.live %}button-secondary{% endif %}"> {% if page_perms.can_unpublish %}<a href="{% url 'wagtailadmin_pages:unpublish' page.id %}" class="button">{% trans 'Unpublish it' %}</a>{% endif %}
+            <input type="submit" value="{% trans 'Yes, delete it' %}" class="button serious">
+            <a href="{% if next %}{{ next }}{% else %}{% url 'wagtailadmin_explore' page.get_parent.id %}{% endif %}" class="button button-secondary">{% trans "No, don't delete it" %}</a>
         </form>
+
+        {% page_permissions page as page_perms %}
+        {% if page_perms.can_unpublish %}
+            {% url 'wagtailadmin_pages:unpublish' page.id as unpublish_url %}
+            <p style="margin-top: 1em">{% blocktrans %}Alternatively you can <a href="{{ unpublish_url }}">unpublish the page</a>. This removes the page from public view and you can edit or publish it again later.{% endblocktrans %}</p>
+        {% endif %}
     </div>
 {% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
index 3f3d364ab2..84a9afd7e0 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
@@ -11,6 +11,7 @@
             {% csrf_token %}
             <input type="hidden" name="next" value="{{ next }}">
             <input type="submit" value="{% trans 'Yes, unpublish it' %}" class="button">
+            <a href="{% if next %}{{ next }}{% else %}{% url 'wagtailadmin_explore' page.get_parent.id %}{% endif %}" class="button button-secondary">{% trans "No, don't unpublish" %}</a>
         </form>
     </div>
 {% endblock %}