From d2ad85d0d2193036e867994b8632f7d37b4ba37b Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 30 Oct 2015 00:41:47 +0000 Subject: [PATCH 1/4] querystring tag provides the '?' character itself, so no need to duplicate it --- .../wagtailadmin/templates/wagtailadmin/chooser/email_link.html | 2 +- .../templates/wagtailadmin/chooser/external_link.html | 2 +- .../wagtailadmin/pages/listing/_navigation_choose.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html index 51960294ac..eb6c0ead42 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/email_link.html @@ -5,7 +5,7 @@
{% include 'wagtailadmin/chooser/_link_types.html' with current='email' %} -
+ {% csrf_token %}
    {% for field in form %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html index ec131d48ce..d1f12b923f 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/external_link.html @@ -5,7 +5,7 @@
    {% include 'wagtailadmin/chooser/_link_types.html' with current='external' %} - + {% csrf_token %}
      {% for field in form %} diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html index 803f8214b8..5287bc8bc9 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html @@ -6,6 +6,6 @@ Navigation controls for the page listing in 'choose' mode {% if allow_navigation and page.can_descend %} - {% trans 'Explore' %} + {% trans 'Explore' %} {% endif %} From 52cf28429f2eb93225b507043ee67f10a275ab0f Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 30 Oct 2015 00:54:39 +0000 Subject: [PATCH 2/4] Use {% querystring %} tag to propagate querystring in the link chooser 'link type' nav links. This is necessary now that we don't pass a 'querystring' context var any more. We set p (the page number param) to None because the tree browser's parent page ID is not preserved in this navigation (it's part of the URL path rather than the querystring), so there's no point preserving the page number. --- .../templates/wagtailadmin/chooser/_link_types.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html index 07e0d84adb..158e8aa226 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/chooser/_link_types.html @@ -1,22 +1,22 @@ -{% load i18n %} +{% load i18n wagtailadmin_tags %} {% if allow_external_link or allow_email_link or current == 'external' or current == 'email' %}

      {% if current == 'internal' %} {% trans "Internal link" %} {% else %} - {% trans "Internal link" %} + {% trans "Internal link" %} {% endif %} {% if current == 'external' %} | {% trans "External link" %} {% elif allow_external_link %} - | {% trans "External link" %} + | {% trans "External link" %} {% endif %} {% if current == 'email' %} | {% trans "Email link" %} {% elif allow_email_link %} - | {% trans "Email link" %} + | {% trans "Email link" %} {% endif %}

      {% endif %} From 7df701e88dcb1ad02f75c3511fd6274e1846ffd7 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 30 Oct 2015 01:01:08 +0000 Subject: [PATCH 3/4] Nullify the 'p' parameter in child navigation links in the page chooser The correct querystring param to nullify is 'p', not 'page'; failure to set this to none means that e.g. viewing page 2 of a listing then browsing to a child page will wrongly take you to page 2 of the child page's listing. --- .../wagtailadmin/pages/listing/_navigation_choose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html index 5287bc8bc9..f389d4ef13 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_choose.html @@ -6,6 +6,6 @@ Navigation controls for the page listing in 'choose' mode {% if allow_navigation and page.can_descend %} - {% trans 'Explore' %} + {% trans 'Explore' %} {% endif %} From 20655941e903179ec64238be1c2a45e725f29cb2 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 30 Oct 2015 01:09:16 +0000 Subject: [PATCH 4/4] Use {% querystring %} tag for breadcrumb links in the page chooser We can't use {{ querystring }} any more, as that context var has been removed. We nullify the p (page number) parameter in this link as it doesn't make sense to persist this when navigating up/down the tree. --- .../templates/wagtailadmin/shared/breadcrumb.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html index 50bfb186ea..0b2458e7ba 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/shared/breadcrumb.html @@ -1,14 +1,14 @@ -{% load i18n %} +{% load i18n wagtailadmin_tags %}