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] 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>