From 658071cb592794bd9c041f9cea2ae91e32a8bbe6 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 16:15:49 +0100
Subject: [PATCH 1/9] move parent page title field out of list.html into
 includes

---
 .../templates/wagtailadmin/pages/list.html    | 65 +------------------
 .../listing/_parent_page_title_choose.html    | 17 +++++
 .../listing/_parent_page_title_explore.html   | 43 ++++++++++++
 .../listing/_parent_page_title_move.html      | 17 +++++
 4 files changed, 80 insertions(+), 62 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 4f578d738..96bb0711e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -33,70 +33,11 @@
             <tr class="index {% if not parent_page.live %} unpublished{% endif %} {% if moving or choosing %}{% if parent_page.can_choose %}can-disabled{% endif %}{% endif %}">
                 <td class="title" {% if orderable %}colspan="2"{% endif %}>
                     {% if moving %}
-                        <h2>
-                            {% if parent_page.can_choose %}
-                                <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a>
-                            {% else %}
-                                {{ parent_page.title }}
-                            {% endif %}
-
-                            {% test_page_is_public parent_page as is_public %}
-                            {% if not is_public %}
-                                <span class="indicator privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
-                            {% endif %}
-                        </h2>
+                        {% include "wagtailadmin/pages/listing/_parent_page_title_move.html" %}
                     {% elif choosing %}
-                        <h2>
-                            {% if parent_page.can_choose %}
-                                <a class="choose-page" href="#{{ parent_page.id }}" data-id="{{ parent_page.id }}" data-title="{{ parent_page.title }}" data-url="{{ parent_page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
-                            {% else %}
-                                {{ parent_page.title }}
-                            {% endif %}
-
-                            {% test_page_is_public parent_page as is_public %}
-                            {% if not is_public %}
-                                <span class="indicator privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
-                            {% endif %}
-                        </h2>
+                        {% include "wagtailadmin/pages/listing/_parent_page_title_choose.html" %}
                     {% else %}
-                        <h2>
-                            {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                <a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
-                            {% else %}
-                                {{ parent_page.title }}
-                            {% endif %}
-
-                            {% if parent_page.locked %}
-                                <span class="indicator locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
-                            {% endif %}
-                        </h2>
-                        
-                        {% include "wagtailadmin/pages/_privacy_indicator.html" with page=parent_page %}
-
-                        <ul class="actions">
-                            {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
-                            {% endif %}
-                            {% if parent_page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
-                            {% endif %}
-
-                            {% if parent_page.live and not parent_page.is_root and 'view_live' not in hide_actions|default:'' %}
-                                <li><a {% if parent_page.url %}href="{{ parent_page.url }}"{% endif %} class="button button-small button-secondary {% if not parent_page.url %}disabled{% endif %}" target="_blank" {% if not parent_page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
-                            {% endif %}
-                            {% if parent_page_perms.can_move and 'move' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_move' parent_page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
-                            {% endif %}
-                            {% if parent_page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_delete' parent_page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
-                            {% endif %}
-                            {% if parent_page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_unpublish' parent_page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
-                            {% endif %}
-                            {% if parent_page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
-                                <li><a href="{% url 'wagtailadmin_pages_add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">{% trans 'Add child page' %}</a></li>
-                            {% endif %}
-                        </ul>
+                        {% include "wagtailadmin/pages/listing/_parent_page_title_explore.html" %}
                     {% endif %}
                 </td>
                 <td class="updated" valign="bottom">{% if parent_page.latest_revision_created_at %}<div class="human-readable-date" title="{{ parent_page.latest_revision_created_at|date:"d M Y H:i" }}">{{ parent_page.latest_revision_created_at|timesince }} ago</div>{% endif %}</td>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
new file mode 100644
index 000000000..cf82bb8c7
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+{% load wagtailadmin_tags %}
+
+{# The title field for a parent page when the listing is in 'choose' mode #}
+
+<h2>
+    {% if parent_page.can_choose %}
+        <a class="choose-page" href="#{{ parent_page.id }}" data-id="{{ parent_page.id }}" data-title="{{ parent_page.title }}" data-url="{{ parent_page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
+    {% else %}
+        {{ parent_page.title }}
+    {% endif %}
+
+    {% test_page_is_public parent_page as is_public %}
+    {% if not is_public %}
+        <span class="indicator privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
+    {% endif %}
+</h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
new file mode 100644
index 000000000..e062f0477
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
@@ -0,0 +1,43 @@
+{% load i18n %}
+{% load wagtailadmin_tags %}
+
+{# The title field for a parent page when the listing is in 'explore' mode #}
+
+<h2>
+    {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
+        <a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
+    {% else %}
+        {{ parent_page.title }}
+    {% endif %}
+
+    {% if parent_page.locked %}
+        <span class="indicator locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
+    {% endif %}
+</h2>
+
+{% include "wagtailadmin/pages/_privacy_indicator.html" with page=parent_page %}
+
+<ul class="actions">
+    {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
+    {% endif %}
+    {% if parent_page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
+    {% endif %}
+
+    {% if parent_page.live and not parent_page.is_root and 'view_live' not in hide_actions|default:'' %}
+        <li><a {% if parent_page.url %}href="{{ parent_page.url }}"{% endif %} class="button button-small button-secondary {% if not parent_page.url %}disabled{% endif %}" target="_blank" {% if not parent_page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
+    {% endif %}
+    {% if parent_page_perms.can_move and 'move' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_move' parent_page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
+    {% endif %}
+    {% if parent_page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_delete' parent_page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
+    {% endif %}
+    {% if parent_page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_unpublish' parent_page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
+    {% endif %}
+    {% if parent_page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">{% trans 'Add child page' %}</a></li>
+    {% endif %}
+</ul>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
new file mode 100644
index 000000000..ed5d38ce7
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+{% load wagtailadmin_tags %}
+
+{# The title field for a parent page when the listing is in 'move' mode #}
+
+<h2>
+    {% if parent_page.can_choose %}
+        <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a>
+    {% else %}
+        {{ parent_page.title }}
+    {% endif %}
+
+    {% test_page_is_public parent_page as is_public %}
+    {% if not is_public %}
+        <span class="indicator privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
+    {% endif %}
+</h2>

From 0072f60c3a3d764627bbce366041750f1cdafd38 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 16:25:13 +0100
Subject: [PATCH 2/9] Rename 'lock_indicator' and 'privacy_indicator' widgets
 to 'lock_switch' and 'privacy_switch'

This distinguishes them from the read-only indicators that appear elsewhere, which also use those classnames for styling.
---
 .../js/{privacy-indicator.js => privacy-switch.js}   |  0
 .../templates/wagtailadmin/pages/_editor_js.html     |  2 +-
 .../{_lock_indicator.html => _lock_switch.html}      |  0
 ...{_privacy_indicator.html => _privacy_switch.html} |  0
 .../templates/wagtailadmin/pages/edit.html           |  4 ++--
 .../templates/wagtailadmin/pages/index.html          |  2 +-
 .../pages/listing/_parent_page_title_explore.html    |  2 +-
 wagtail/wagtailadmin/tests/test_privacy.py           | 12 ++++++------
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename wagtail/wagtailadmin/static/wagtailadmin/js/{privacy-indicator.js => privacy-switch.js} (100%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/pages/{_lock_indicator.html => _lock_switch.html} (100%)
 rename wagtail/wagtailadmin/templates/wagtailadmin/pages/{_privacy_indicator.html => _privacy_switch.html} (100%)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js b/wagtail/wagtailadmin/static/wagtailadmin/js/privacy-switch.js
similarity index 100%
rename from wagtail/wagtailadmin/static/wagtailadmin/js/privacy-indicator.js
rename to wagtail/wagtailadmin/static/wagtailadmin/js/privacy-switch.js
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
index ee9eff8ad..c2c50b603 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html
@@ -22,7 +22,7 @@
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-editor.js"></script>
     <script src="{{ STATIC_URL }}wagtailadmin/js/page-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-indicator.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-switch.js"></script>
 
     {% hook_output 'insert_editor_js' %}
 {% endcompress %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_indicator.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_switch.html
similarity index 100%
rename from wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html
rename to wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_switch.html
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
index f7f0bd9e8..e525d028f 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
@@ -22,8 +22,8 @@
                     <span class="status-tag">{{ page.status_string }}</span>
                 {% endif %}
 
-                {% include "wagtailadmin/pages/_privacy_indicator.html" with page=page page_perms=page_perms only %}
-                {% include "wagtailadmin/pages/_lock_indicator.html" %}
+                {% include "wagtailadmin/pages/_privacy_switch.html" with page=page page_perms=page_perms only %}
+                {% include "wagtailadmin/pages/_lock_switch.html" %}
             </div>
         </div>
     </header>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
index 0f1011f1d..23a31dc09 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
@@ -21,7 +21,7 @@
 {% block extra_js %}
     {% comment %} modal-workflow is required by the view restrictions interface {% endcomment %}
     <script src="{{ STATIC_URL }}wagtailadmin/js/modal-workflow.js"></script>
-    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-indicator.js"></script>
+    <script src="{{ STATIC_URL }}wagtailadmin/js/privacy-switch.js"></script>
 
     <script type="text/javascript">
         {% if ordering == 'ord' %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
index e062f0477..0da1187a3 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
@@ -15,7 +15,7 @@
     {% endif %}
 </h2>
 
-{% include "wagtailadmin/pages/_privacy_indicator.html" with page=parent_page %}
+{% include "wagtailadmin/pages/_privacy_switch.html" with page=parent_page %}
 
 <ul class="actions">
     {% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
diff --git a/wagtail/wagtailadmin/tests/test_privacy.py b/wagtail/wagtailadmin/tests/test_privacy.py
index bda4fbd8c..1a6a5639a 100644
--- a/wagtail/wagtailadmin/tests/test_privacy.py
+++ b/wagtail/wagtailadmin/tests/test_privacy.py
@@ -162,7 +162,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator public">')
         self.assertNotContains(response, '<div class="privacy-indicator private">')
 
@@ -176,7 +176,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator private">')
         self.assertNotContains(response, '<div class="privacy-indicator public">')
 
@@ -190,7 +190,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator private">')
         self.assertNotContains(response, '<div class="privacy-indicator public">')
 
@@ -228,7 +228,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator public">')
         self.assertNotContains(response, '<div class="privacy-indicator private">')
 
@@ -242,7 +242,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator private">')
         self.assertNotContains(response, '<div class="privacy-indicator public">')
 
@@ -256,6 +256,6 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
         self.assertEqual(response.status_code, 200)
 
         # Check the privacy indicator is public
-        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_indicator.html')
+        self.assertTemplateUsed(response, 'wagtailadmin/pages/_privacy_switch.html')
         self.assertContains(response, '<div class="privacy-indicator private">')
         self.assertNotContains(response, '<div class="privacy-indicator public">')

From 5b592be1c28e66694697507a4c171534d3521ab5 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 16:51:43 +0100
Subject: [PATCH 3/9] Move 'This page is protected' indicator into an include

---
 .../wagtailadmin/home/pages_for_moderation.html      |  5 +----
 .../templates/wagtailadmin/home/recent_edits.html    |  5 +----
 .../templates/wagtailadmin/pages/list.html           |  5 +----
 .../pages/listing/_parent_page_title_choose.html     |  5 +----
 .../pages/listing/_parent_page_title_move.html       |  5 +----
 .../pages/listing/_privacy_indicator.html            | 12 ++++++++++++
 6 files changed, 17 insertions(+), 20 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
index d0dd04793..5e535ac8a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
@@ -23,10 +23,7 @@
                                 <h2>
                                     <a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
 
-                                    {% test_page_is_public revision.page as is_public %}
-                                    {% if not is_public %}
-                                        <span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
-                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
 
                                     {% if revision.page.locked %}
                                         <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
index f23e5f568..3b9f1bc0e 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
@@ -21,10 +21,7 @@
                                 <h2>
                                     <a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
 
-                                    {% test_page_is_public revision.page as is_public %}
-                                    {% if not is_public %}
-                                        <span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
-                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
 
                                     {% if revision.page.locked %}
                                         <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 96bb0711e..b777c7ba2 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -137,10 +137,7 @@
                                 {% endif %}
                             {% endif %}
 
-                            {% test_page_is_public page as is_public %}
-                            {% if not is_public %}
-                                <span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
-                            {% endif %}
+                            {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
 
                             {% if page.locked %}
                                 <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
index cf82bb8c7..2b831fc8d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
@@ -10,8 +10,5 @@
         {{ parent_page.title }}
     {% endif %}
 
-    {% test_page_is_public parent_page as is_public %}
-    {% if not is_public %}
-        <span class="indicator privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
-    {% endif %}
+    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=parent_page %}
 </h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
index ed5d38ce7..c97fc026c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
@@ -10,8 +10,5 @@
         {{ parent_page.title }}
     {% endif %}
 
-    {% test_page_is_public parent_page as is_public %}
-    {% if not is_public %}
-        <span class="indicator privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
-    {% endif %}
+    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=parent_page %}
 </h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html
new file mode 100644
index 000000000..67718af44
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_privacy_indicator.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load wagtailadmin_tags %}
+
+{% comment %}
+    Expects a variable 'page', a page object.
+    Tests whether that page is protected from public view, and if so, outputs a 'protected' icon.
+{% endcomment %}
+
+{% test_page_is_public page as is_public %}
+{% if not is_public %}
+    <span class="indicator privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
+{% endif %}

From ed99f86f01e526baef37b5de7c30e4823528f73b Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 17:01:33 +0100
Subject: [PATCH 4/9] Move 'page locked' indicator into an include

---
 .../wagtailadmin/home/pages_for_moderation.html       |  5 +----
 .../templates/wagtailadmin/home/recent_edits.html     |  5 +----
 .../templates/wagtailadmin/pages/list.html            |  5 +----
 .../wagtailadmin/pages/listing/_locked_indicator.html | 11 +++++++++++
 .../pages/listing/_parent_page_title_choose.html      |  3 ---
 .../pages/listing/_parent_page_title_explore.html     |  4 +---
 .../pages/listing/_parent_page_title_move.html        |  3 ---
 7 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
index 5e535ac8a..9fa5923d1 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
@@ -24,10 +24,7 @@
                                     <a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
 
                                     {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
-
-                                    {% if revision.page.locked %}
-                                        <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
-                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
                                 </h2>
                                 <ul class="actions">
                                     <li>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
index 3b9f1bc0e..7fddfbb30 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
@@ -22,10 +22,7 @@
                                     <a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
 
                                     {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
-
-                                    {% if revision.page.locked %}
-                                        <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
-                                    {% endif %}
+                                    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
                                 </h2>
                                 <ul class="actions">
                                     <li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index b777c7ba2..2d97d992b 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -138,10 +138,7 @@
                             {% endif %}
 
                             {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-
-                            {% if page.locked %}
-                                <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
-                            {% endif %}
+                            {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
                         </h2>
                         {% if not moving and not choosing %}
                             <ul class="actions">
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html
new file mode 100644
index 000000000..3b4f4cbbb
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_locked_indicator.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+{% load wagtailadmin_tags %}
+
+{% comment %}
+    Expects a variable 'page', a page object.
+    Tests whether that page is locked for editing, and if so, outputs a 'locked' icon.
+{% endcomment %}
+
+{% if page.locked %}
+    <span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
+{% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
index 2b831fc8d..e6fbec5ad 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
@@ -1,6 +1,3 @@
-{% load i18n %}
-{% load wagtailadmin_tags %}
-
 {# The title field for a parent page when the listing is in 'choose' mode #}
 
 <h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
index 0da1187a3..099572eba 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
@@ -10,9 +10,7 @@
         {{ parent_page.title }}
     {% endif %}
 
-    {% if parent_page.locked %}
-        <span class="indicator locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
-    {% endif %}
+    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=parent_page %}
 </h2>
 
 {% include "wagtailadmin/pages/_privacy_switch.html" with page=parent_page %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
index c97fc026c..30b1d7c26 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
@@ -1,6 +1,3 @@
-{% load i18n %}
-{% load wagtailadmin_tags %}
-
 {# The title field for a parent page when the listing is in 'move' mode #}
 
 <h2>

From 1b1a997a76d373c8c8ecb5a02d48c6ac778ebbd4 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 17:27:12 +0100
Subject: [PATCH 5/9] refactor title field in page listing to separate out the
 move/choose/explore cases

---
 .../templates/wagtailadmin/pages/list.html    | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 2d97d992b..9c7ef2b62 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -116,31 +116,40 @@
                         <td class="ord">{% if ordering == "ord" %}<div class="handle icon icon-grip text-replace">{% trans 'Drag' %}</div>{% endif %}</td>
                     {% endif %}
                     <td class="title" valign="top">
-                        <h2>
-                            {% if moving %}
+                        {% if moving %}
+                            <h2>
                                 {% if page.can_choose %}
                                     <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id page.id %}">{{ page.title }}</a>
                                 {% else %}
                                     {{ page.title }}
                                 {% endif %}
-                            {% elif choosing %}
+
+                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                            </h2>
+                        {% elif choosing %}
+                            <h2>
                                 {% if page.can_choose %}
                                     <a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' page.id %}">{{ page.title }}</a>
                                 {% else %}
                                     {{ page.title }}
                                 {% endif %}
-                            {% else %}
+
+                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                            </h2>
+                        {% else %}
+                            <h2>
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                     <a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
                                 {% else %}
                                     {{ page.title }}
                                 {% endif %}
-                            {% endif %}
 
-                            {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                            {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                        </h2>
-                        {% if not moving and not choosing %}
+                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+                            </h2>
+
                             <ul class="actions">
                                 {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
                                     <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>

From 81f2f29383ea9ccb845df36cc5d2726feb1f7763 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 17:49:44 +0100
Subject: [PATCH 6/9] move page title field out of list.html into includes

---
 .../templates/wagtailadmin/pages/list.html    | 60 +------------------
 .../pages/listing/_page_title_choose.html     | 12 ++++
 .../pages/listing/_page_title_explore.html    | 41 +++++++++++++
 .../pages/listing/_page_title_move.html       | 12 ++++
 4 files changed, 68 insertions(+), 57 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 9c7ef2b62..771d654cf 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -117,65 +117,11 @@
                     {% endif %}
                     <td class="title" valign="top">
                         {% if moving %}
-                            <h2>
-                                {% if page.can_choose %}
-                                    <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id page.id %}">{{ page.title }}</a>
-                                {% else %}
-                                    {{ page.title }}
-                                {% endif %}
-
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                            </h2>
+                            {% include "wagtailadmin/pages/listing/_page_title_move.html" %}
                         {% elif choosing %}
-                            <h2>
-                                {% if page.can_choose %}
-                                    <a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' page.id %}">{{ page.title }}</a>
-                                {% else %}
-                                    {{ page.title }}
-                                {% endif %}
-
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                            </h2>
+                            {% include "wagtailadmin/pages/listing/_page_title_choose.html" %}
                         {% else %}
-                            <h2>
-                                {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                    <a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
-                                {% else %}
-                                    {{ page.title }}
-                                {% endif %}
-
-                                {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
-                                {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
-                            </h2>
-
-                            <ul class="actions">
-                                {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
-                                {% endif %}
-                                {% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
-                                {% endif %}
-                                {% if page.live and 'view_live' not in hide_actions|default:'' %}
-                                    <li><a {% if page.url %}href="{{ page.url }}"{% endif %} class="button button-small button-secondary {% if not page.url %}disabled{% endif %}" target="_blank" {% if not page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
-                                {% endif %}
-                                {% if page_perms.can_move and 'move' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_move' page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
-                                {% endif %}
-                                {% if parent_page_perms.can_add_subpage and 'copy' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_copy' page.id %}" class="button button-small button-secondary">{% trans 'Copy' %}</a></li>
-                                {% endif %}
-                                {% if page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
-                                {% endif %}
-                                {% if page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
-                                {% endif %}
-                                {% if page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
-                                    <li><a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="button button-small button-secondary">{% trans 'Add child page' %}</a></li>
-                                {% endif %}
-                            </ul>
+                            {% include "wagtailadmin/pages/listing/_page_title_explore.html" %}
                         {% endif %}
                     </td>
                     {% if show_parent %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
new file mode 100644
index 000000000..12aa68d27
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
@@ -0,0 +1,12 @@
+{# The title field for a page in the page listing, when in 'choose' mode #}
+
+<h2>
+    {% if page.can_choose %}
+        <a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' page.id %}">{{ page.title }}</a>
+    {% else %}
+        {{ page.title }}
+    {% endif %}
+
+    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+</h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html
new file mode 100644
index 000000000..82cac911b
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html
@@ -0,0 +1,41 @@
+{% load i18n %}
+
+{# The title field for a page in the page listing, when in 'explore' mode #}
+
+<h2>
+    {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
+        <a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
+    {% else %}
+        {{ page.title }}
+    {% endif %}
+
+    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+</h2>
+
+<ul class="actions">
+    {% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
+    {% endif %}
+    {% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
+    {% endif %}
+    {% if page.live and 'view_live' not in hide_actions|default:'' %}
+        <li><a {% if page.url %}href="{{ page.url }}"{% endif %} class="button button-small button-secondary {% if not page.url %}disabled{% endif %}" target="_blank" {% if not page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
+    {% endif %}
+    {% if page_perms.can_move and 'move' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_move' page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
+    {% endif %}
+    {% if parent_page_perms.can_add_subpage and 'copy' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_copy' page.id %}" class="button button-small button-secondary">{% trans 'Copy' %}</a></li>
+    {% endif %}
+    {% if page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
+    {% endif %}
+    {% if page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
+    {% endif %}
+    {% if page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
+        <li><a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="button button-small button-secondary">{% trans 'Add child page' %}</a></li>
+    {% endif %}
+</ul>
\ No newline at end of file
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
new file mode 100644
index 000000000..c79f3e635
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
@@ -0,0 +1,12 @@
+{# The title field for a page in the page listing, when in 'move' mode #}
+
+<h2>
+    {% if page.can_choose %}
+        <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id page.id %}">{{ page.title }}</a>
+    {% else %}
+        {{ page.title }}
+    {% endif %}
+
+    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=page %}
+    {% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=page %}
+</h2>

From 3073940cfbd6eac52c7140a621b58fdf5c12a491 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 18:08:14 +0100
Subject: [PATCH 7/9] Eliminate _parent_page_title_choose and
 _parent_page_title_move templates.

They are identical to the page_title_* templates, except for not having a 'locked' indicator (which was presumably an oversight rather than a deliberate decision).
---
 .../templates/wagtailadmin/pages/list.html            |  8 ++++----
 .../pages/listing/_page_title_choose.html             |  6 +++++-
 .../wagtailadmin/pages/listing/_page_title_move.html  |  6 +++++-
 .../pages/listing/_parent_page_title_choose.html      | 11 -----------
 .../pages/listing/_parent_page_title_move.html        | 11 -----------
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 771d654cf..4582265e6 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -33,9 +33,9 @@
             <tr class="index {% if not parent_page.live %} unpublished{% endif %} {% if moving or choosing %}{% if parent_page.can_choose %}can-disabled{% endif %}{% endif %}">
                 <td class="title" {% if orderable %}colspan="2"{% endif %}>
                     {% if moving %}
-                        {% include "wagtailadmin/pages/listing/_parent_page_title_move.html" %}
+                        {% include "wagtailadmin/pages/listing/_page_title_move.html" with page=parent_page %}
                     {% elif choosing %}
-                        {% include "wagtailadmin/pages/listing/_parent_page_title_choose.html" %}
+                        {% include "wagtailadmin/pages/listing/_page_title_choose.html" with page=parent_page %}
                     {% else %}
                         {% include "wagtailadmin/pages/listing/_parent_page_title_explore.html" %}
                     {% endif %}
@@ -117,9 +117,9 @@
                     {% endif %}
                     <td class="title" valign="top">
                         {% if moving %}
-                            {% include "wagtailadmin/pages/listing/_page_title_move.html" %}
+                            {% include "wagtailadmin/pages/listing/_page_title_move.html" with page=page %}
                         {% elif choosing %}
-                            {% include "wagtailadmin/pages/listing/_page_title_choose.html" %}
+                            {% include "wagtailadmin/pages/listing/_page_title_choose.html" with page=page %}
                         {% else %}
                             {% include "wagtailadmin/pages/listing/_page_title_explore.html" %}
                         {% endif %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
index 12aa68d27..1d016bf40 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
@@ -1,4 +1,8 @@
-{# The title field for a page in the page listing, when in 'choose' mode #}
+{% comment %}
+The title field for a page in the page listing, when in 'choose' mode.
+
+Expects a variable 'page', the page instance.
+{% endcomment %}
 
 <h2>
     {% if page.can_choose %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
index c79f3e635..4c257d965 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
@@ -1,4 +1,8 @@
-{# The title field for a page in the page listing, when in 'move' mode #}
+{% comment %}
+The title field for a page in the page listing, when in 'move' mode.
+
+Expects a variable 'page', the page instance.
+{% endcomment %}
 
 <h2>
     {% if page.can_choose %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
deleted file mode 100644
index e6fbec5ad..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_choose.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{# The title field for a parent page when the listing is in 'choose' mode #}
-
-<h2>
-    {% if parent_page.can_choose %}
-        <a class="choose-page" href="#{{ parent_page.id }}" data-id="{{ parent_page.id }}" data-title="{{ parent_page.title }}" data-url="{{ parent_page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
-    {% else %}
-        {{ parent_page.title }}
-    {% endif %}
-
-    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=parent_page %}
-</h2>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
deleted file mode 100644
index 30b1d7c26..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_move.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{# The title field for a parent page when the listing is in 'move' mode #}
-
-<h2>
-    {% if parent_page.can_choose %}
-        <a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id parent_page.id %}">{{ parent_page.title }}</a>
-    {% else %}
-        {{ parent_page.title }}
-    {% endif %}
-
-    {% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=parent_page %}
-</h2>

From 455a40e80cbeed810c2edda2a49986baf25c929f Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 19:16:39 +0100
Subject: [PATCH 8/9] move 'explore' table headers into their own include

---
 .../templates/wagtailadmin/pages/list.html    | 52 +-------------
 .../pages/listing/_table_headers_explore.html | 67 +++++++++++++++++++
 2 files changed, 68 insertions(+), 51 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index 4582265e6..fbcea3d18 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -54,57 +54,7 @@
         {% endif %}
     
         {% if not moving and not choosing %}
-            <tr class="table-headers">
-                {% if orderable %}
-                    <th class="ord">
-                        {% if ordering == "ord" %}
-                            <a href="{% url 'wagtailadmin_explore' parent_page.id %}" class="icon icon-order text-replace" title="{% trans 'Disable ordering of child pages' %}">{% trans 'Order' %}</a></th> 
-                        {% else %}
-                            <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering=ord" class="icon icon-order text-replace" title="{% trans 'Enable ordering of child pages' %}">{% trans 'Order' %}</a></th>
-                        {% endif %}
-                    </th>
-                {% endif %}
-                <th class="title">
-                    {% if sortable %}
-                        <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "title" %}-{% endif %}title" class="icon icon-arrow-{% if ordering == "title" %}down-after{% elif ordering == "-title" %}up-after{% else %}down-after{% endif %} {% if ordering == "title" or ordering == "-title" %}teal{% endif %}">
-                            {% trans 'Title' %}
-                        </a>
-                    {% else %}
-                        {% trans 'Title' %}
-                    {% endif %}
-                </th>
-                {% if show_parent %}
-                <th class="parent">{% trans 'Parent' %}</th>
-                {% endif %}
-                 <th class="updated">
-                    {% if sortable %}
-                        <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "latest_revision_created_at" %}-{% endif %}latest_revision_created_at" class="icon icon-arrow-{% if ordering == "-latest_revision_created_at" %}up-after{% else %}down-after{% endif %} {% if ordering == "latest_revision_created_at" or ordering == "-latest_revision_created_at" %}teal {% endif %}">
-                            {% trans 'Updated' %}
-                        </a>
-                    {% else %}
-                        {% trans 'Updated' %}
-                    {% endif %}                   
-                </th>
-                <th class="type">
-                    {% if sortable %}
-                        <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "content_type" %}-{% endif %}content_type" class="icon icon-arrow-{% if ordering == "-content_type" %}up-after{% else %}down-after{% endif %} {% if ordering == "content_type" or ordering == "-content_type" %}teal {% endif %}">
-                            {% trans 'Type' %}
-                        </a>
-                    {% else %}
-                        {% trans 'Type' %}
-                    {% endif %}                   
-                </th>
-                <th class="status">
-                    {% if sortable %}
-                        <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "live" %}-{% endif %}live" class="icon icon-arrow-{% if ordering == "-live" %}up-after{% else %}down-after{% endif %} {% if ordering == "live" or ordering == "-live" %}teal {% endif %}">
-                            {% trans 'Status' %}
-                        </a>
-                    {% else %}
-                        {% trans 'Status' %}
-                    {% endif %}
-                </th>
-                <th></th>
-            </tr>
+            {% include "wagtailadmin/pages/listing/_table_headers_explore.html" %}
         {% endif %}
     </thead>
     <tbody>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html
new file mode 100644
index 000000000..9f2850134
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_table_headers_explore.html
@@ -0,0 +1,67 @@
+{% load i18n %}
+
+{% comment %}
+
+Table headers for the page listing, when in 'explore' mode. Expects the following variables:
+
+sortable: if true, headings are links to wagtailadmin_explore with sort parameters applied.
+orderable: if true, an 'ordering' column is added (again with links to wagtailadmin_explore).
+
+If either sortable or orderable is true, the following variables are also required:
+
+parent_page: The page instance currently being browsed (used to generate the correct wagtailadmin_explore urls)
+ordering: the current sort parameter
+
+{% endcomment %}
+
+<tr class="table-headers">
+    {% if orderable %}
+        <th class="ord">
+            {% if ordering == "ord" %}
+                <a href="{% url 'wagtailadmin_explore' parent_page.id %}" class="icon icon-order text-replace" title="{% trans 'Disable ordering of child pages' %}">{% trans 'Order' %}</a></th> 
+            {% else %}
+                <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering=ord" class="icon icon-order text-replace" title="{% trans 'Enable ordering of child pages' %}">{% trans 'Order' %}</a></th>
+            {% endif %}
+        </th>
+    {% endif %}
+    <th class="title">
+        {% if sortable %}
+            <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "title" %}-{% endif %}title" class="icon icon-arrow-{% if ordering == "title" %}down-after{% elif ordering == "-title" %}up-after{% else %}down-after{% endif %} {% if ordering == "title" or ordering == "-title" %}teal{% endif %}">
+                {% trans 'Title' %}
+            </a>
+        {% else %}
+            {% trans 'Title' %}
+        {% endif %}
+    </th>
+    {% if show_parent %}
+    <th class="parent">{% trans 'Parent' %}</th>
+    {% endif %}
+     <th class="updated">
+        {% if sortable %}
+            <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "latest_revision_created_at" %}-{% endif %}latest_revision_created_at" class="icon icon-arrow-{% if ordering == "-latest_revision_created_at" %}up-after{% else %}down-after{% endif %} {% if ordering == "latest_revision_created_at" or ordering == "-latest_revision_created_at" %}teal {% endif %}">
+                {% trans 'Updated' %}
+            </a>
+        {% else %}
+            {% trans 'Updated' %}
+        {% endif %}                   
+    </th>
+    <th class="type">
+        {% if sortable %}
+            <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "content_type" %}-{% endif %}content_type" class="icon icon-arrow-{% if ordering == "-content_type" %}up-after{% else %}down-after{% endif %} {% if ordering == "content_type" or ordering == "-content_type" %}teal {% endif %}">
+                {% trans 'Type' %}
+            </a>
+        {% else %}
+            {% trans 'Type' %}
+        {% endif %}                   
+    </th>
+    <th class="status">
+        {% if sortable %}
+            <a href="{% url 'wagtailadmin_explore' parent_page.id %}?ordering={% if ordering == "live" %}-{% endif %}live" class="icon icon-arrow-{% if ordering == "-live" %}up-after{% else %}down-after{% endif %} {% if ordering == "live" or ordering == "-live" %}teal {% endif %}">
+                {% trans 'Status' %}
+            </a>
+        {% else %}
+            {% trans 'Status' %}
+        {% endif %}
+    </th>
+    <th></th>
+</tr>
\ No newline at end of file

From ff85146426a677f24d9c9e71592dab865ae68fc4 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 14 Apr 2015 23:42:09 +0100
Subject: [PATCH 9/9] move navigation field for choose/explore/move into
 separate includes

---
 .../templates/wagtailadmin/pages/list.html    | 26 +++++--------------
 .../pages/listing/_navigation_choose.html     | 11 ++++++++
 .../pages/listing/_navigation_explore.html    | 15 +++++++++++
 .../pages/listing/_navigation_move.html       | 11 ++++++++
 4 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html
 create mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
index fbcea3d18..aac89c497 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
@@ -92,25 +92,13 @@
                              <span class="status-tag {% if page.status_string != "draft" %}primary{% endif %}">{{ page.status_string }}</span>
                         {% endif %}
                     </td>
-                    <td class="{% if allow_navigation %}{% if choosing %}{% if page.can_descend %} children{% endif%}{% elif moving %}{% if page.can_descend %} children{% endif%}{% elif allow_navigation and page.is_navigable %} children{% else %}no-children{% endif %}{% endif %}">
-                        {% if allow_navigation %}
-                            {% if moving %}
-                                {% if page.can_descend %}
-                                    <a href="{% url 'wagtailadmin_pages_move_choose_destination' page_to_move.id page.id %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explorer subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
-                                {% endif %}
-                            {% elif choosing %}
-                                {% if page.can_descend %}
-                                    <a href="{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explorer subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
-                                {% endif %}
-                            {% else %}
-                                {% if page.is_navigable %}
-                                    <a href="{% url 'wagtailadmin_explore' page.id %}" class="icon text-replace icon-arrow-right" title="{% blocktrans with title=page.title %}Explore child pages of '{{ title }}'{% endblocktrans %}">{% trans "Explore" %}</a>
-                                {% elif page_perms.can_add_subpage %}
-                                    <a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="icon text-replace icon-plus-inverse" title="{% blocktrans with title=page.title %}Add a child page to '{{ title }}'{% endblocktrans %}">{% trans 'Add subpage' %}</a>
-                                {% endif %}
-                            {% endif %}
-                        {% endif %}
-                     </td>
+                    {% if moving %}
+                        {% include "wagtailadmin/pages/listing/_navigation_move.html" %}
+                    {% elif choosing %}
+                        {% include "wagtailadmin/pages/listing/_navigation_choose.html" %}
+                    {% else %}
+                        {% include "wagtailadmin/pages/listing/_navigation_explore.html" %}
+                    {% endif %}
                 </tr>
             {% endfor %}
         {% else %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html
new file mode 100644
index 000000000..62d8751bc
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% comment %}
+Navigation controls for the page listing in 'choose' mode
+{% endcomment %}
+
+<td class="{% if allow_navigation and page.can_descend %}children{% endif %}">
+    {% if allow_navigation and page.can_descend %}
+        <a href="{% url 'wagtailadmin_choose_page_child' page.id %}?{{ querystring }}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
+    {% endif %}
+</td>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html
new file mode 100644
index 000000000..344d58bb5
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+{% comment %}
+Navigation controls for the page listing in 'explore' mode
+{% endcomment %}
+
+<td class="{% if allow_navigation %}{% if page.is_navigable %}children{% else %}no-children{% endif %}{% endif %}">
+    {% if allow_navigation %}
+        {% if page.is_navigable %}
+            <a href="{% url 'wagtailadmin_explore' page.id %}" class="icon text-replace icon-arrow-right" title="{% blocktrans with title=page.title %}Explore child pages of '{{ title }}'{% endblocktrans %}">{% trans "Explore" %}</a>
+        {% elif page_perms.can_add_subpage %}
+            <a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="icon text-replace icon-plus-inverse" title="{% blocktrans with title=page.title %}Add a child page to '{{ title }}'{% endblocktrans %}">{% trans 'Add subpage' %}</a>
+        {% endif %}
+    {% endif %}
+</td>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html
new file mode 100644
index 000000000..25572dbcf
--- /dev/null
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+
+{% comment %}
+Navigation controls for the page listing in 'move' mode
+{% endcomment %}
+
+<td class="{% if allow_navigation and page.can_descend %}children{% endif %}">
+    {% if allow_navigation and page.can_descend %}
+        <a href="{% url 'wagtailadmin_pages_move_choose_destination' page_to_move.id page.id %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
+    {% endif %}
+</td>