From 548c63d6043b9b853fa59270d47474f01d5e9acd Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 15 Apr 2015 19:47:10 +0100
Subject: [PATCH] Move remaining move/choose conditionals from _list.html into
 _list_move / _list_choose

---
 .../templates/wagtailadmin/pages/listing/_list.html    | 10 +++-------
 .../wagtailadmin/pages/listing/_list_choose.html       |  6 ++++++
 .../wagtailadmin/pages/listing/_list_move.html         |  6 ++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html
index 81b9ec2325..61d12c673c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list.html
@@ -43,7 +43,7 @@
         {% if pages %}
             {% for page in pages %}
                 {% page_permissions page as page_perms %}
-                <tr {% if ordering == "ord" %}id="page_{{ page.id }}" data-page-title="{{ page.title }}"{% endif %} class="{% if not page.live %} unpublished{% endif %}{% if moving or choosing %}{% if not page.can_choose %}disabled{% endif %}{% endif %}">
+                <tr {% if ordering == "ord" %}id="page_{{ page.id }}" data-page-title="{{ page.title }}"{% endif %} class="{% if not page.live %}unpublished{% endif %} {% block page_row_classname %}{% endblock %}">
                     {% if orderable %}
                         <td class="ord">{% if ordering == "ord" %}<div class="handle icon icon-grip text-replace">{% trans 'Drag' %}</div>{% endif %}</td>
                     {% endif %}
@@ -66,13 +66,9 @@
                     <td class="status" valign="top">
                         {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
                     </td>
-                    {% if moving %}
-                        {% include "wagtailadmin/pages/listing/_navigation_move.html" %}
-                    {% elif choosing %}
-                        {% include "wagtailadmin/pages/listing/_navigation_choose.html" %}
-                    {% else %}
+                    {% block page_navigation %}
                         {% include "wagtailadmin/pages/listing/_navigation_explore.html" %}
-                    {% endif %}
+                    {% endblock %}
                 </tr>
             {% endfor %}
         {% else %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html
index 6edb3be8e1..f5809d1f9d 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_choose.html
@@ -30,6 +30,12 @@
 
 {% block post_parent_page_headers %}{% endblock %}
 
+{% block page_row_classname %}{% if not page.can_choose %}disabled{% endif %}{% endblock %}
+
 {% block page_title %}
     {% include "wagtailadmin/pages/listing/_page_title_choose.html" with page=page %}
 {% endblock %}
+
+{% block page_navigation %}
+    {% include "wagtailadmin/pages/listing/_navigation_choose.html" %}
+{% endblock %}
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html
index fb7ed92187..b7a416dcc8 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_move.html
@@ -30,6 +30,12 @@
 
 {% block post_parent_page_headers %}{% endblock %}
 
+{% block page_row_classname %}{% if not page.can_choose %}disabled{% endif %}{% endblock %}
+
 {% block page_title %}
     {% include "wagtailadmin/pages/listing/_page_title_move.html" with page=page %}
 {% endblock %}
+
+{% block page_navigation %}
+    {% include "wagtailadmin/pages/listing/_navigation_move.html" %}
+{% endblock %}