From 5dc2308a983018d213d664070a5acf4b1beeb137 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 25 Jun 2015 17:25:29 +0100
Subject: [PATCH] Move "page type restricted" warning out of the page-results
 container

This means we don't have to duplicate it in the search results output.
---
 .../wagtailadmin/chooser/_browse_results.html          |  4 ----
 .../chooser/_page_type_restricted_warning.html         |  7 -------
 .../wagtailadmin/chooser/_search_results.html          |  4 ----
 .../templates/wagtailadmin/chooser/browse.html         | 10 +++++++++-
 wagtail/wagtailadmin/views/chooser.py                  |  4 +---
 5 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 wagtail/wagtailadmin/templates/wagtailadmin/chooser/_page_type_restricted_warning.html

diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html
index 32eb1d790..1844abd18 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_browse_results.html
@@ -1,9 +1,5 @@
 {% load i18n %}
 
-{% if page_types_restricted %}
-    {% include "wagtailadmin/chooser/_page_type_restricted_warning.html" with page_type_name=page_type.get_verbose_name %}
-{% endif %}
-
 <h2>{% trans "Explorer" %}</h2>
 {% include "wagtailadmin/shared/breadcrumb.html" with page=parent_page choosing=1 %}
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_page_type_restricted_warning.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_page_type_restricted_warning.html
deleted file mode 100644
index 949db9551..000000000
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_page_type_restricted_warning.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load i18n %}
-
-<p class="help-block help-warning">
-    {% blocktrans with type=page_type_name %}
-        Only pages of type "{{ type }}" may be chosen for this field. Search results will exclude pages of other types.
-    {% endblocktrans %}
-</p>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
index 7311f4b78..9c624c00c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
@@ -1,9 +1,5 @@
 {% load i18n %}
 
-{% if page_types_restricted %}
-    {% include "wagtailadmin/chooser/_page_type_restricted_warning.html" with page_type_name=page_type.get_verbose_name %}
-{% endif %}
-
 <h2>
     {% blocktrans count counter=pages|length %}
         There is one match
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
index f1270dc47..524d05a28 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if page_types_restricted %}
     {% trans "Choose" as choose_str %}
-    {% trans page_type.get_verbose_name as subtitle %}
+    {% trans page_type_name as subtitle %}
 {% else %}
     {% trans "Choose a page" as choose_str %}
 {% endif %}
@@ -11,6 +11,14 @@
 <div class="nice-padding">
     {% include 'wagtailadmin/chooser/_link_types.html' with current='internal' %}
 
+    {% if page_types_restricted %}
+        <p class="help-block help-warning">
+            {% blocktrans with type=page_type_name %}
+                Only pages of type "{{ type }}" may be chosen for this field. Search results will exclude pages of other types.
+            {% endblocktrans %}
+        </p>
+    {% endif %}
+
     <div class="page-results">
         {% include 'wagtailadmin/chooser/_browse_results.html' %}
     </div>
diff --git a/wagtail/wagtailadmin/views/chooser.py b/wagtail/wagtailadmin/views/chooser.py
index 282b61571..9c11a2b0b 100644
--- a/wagtail/wagtailadmin/views/chooser.py
+++ b/wagtail/wagtailadmin/views/chooser.py
@@ -57,7 +57,7 @@ def browse(request, parent_page_id=None):
         'pages': shown_pages,
         'search_form': search_form,
         'page_type_string': page_type,
-        'page_type': desired_class,
+        'page_type_name': desired_class.get_verbose_name(),
         'page_types_restricted': (page_type != 'wagtailcore.page')
     })
 
@@ -89,8 +89,6 @@ def search(request, parent_page_id=None):
         'querystring': get_querystring(request),
         'searchform': search_form,
         'pages': shown_pages,
-        'page_type': desired_class,
-        'page_types_restricted': (page_type != 'wagtailcore.page')
     })