From 998440cfa9c40e73f5530243f7230d3e73ac1f22 Mon Sep 17 00:00:00 2001 From: jordan-bauer <31709951+jordan-bauer@users.noreply.github.com> Date: Tue, 18 Jun 2019 06:49:16 -0500 Subject: [PATCH] Remove buggy tab order customisations in CMS admin (#5383, #5351) --- CHANGELOG.txt | 1 + CONTRIBUTORS.rst | 1 + client/src/components/Explorer/PageCount.js | 1 - .../__snapshots__/PageCount.test.js.snap | 2 -- .../customisation/admin_templates.rst | 2 +- docs/releases/2.6.rst | 2 +- package-lock.json | 28 ++++++++++++++----- wagtail/admin/forms/auth.py | 3 +- .../admin/templates/wagtailadmin/login.html | 2 +- .../pages/action_menu/publish.html | 2 +- .../templates/wagtailadmin/pages/create.html | 2 +- .../templates/wagtailadmin/pages/edit.html | 2 +- .../templates/modeladmin/create.html | 2 +- .../modeladmin/templates/modeladmin/edit.html | 2 +- .../templates/wagtailsettings/edit.html | 2 +- .../wagtailsnippets/snippets/create.html | 2 +- .../wagtailsnippets/snippets/edit.html | 2 +- 17 files changed, 35 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 026de0af33..480a9c5561 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -48,6 +48,7 @@ Changelog * Fix: Added missing form media to user edit form template (Matt Westcott) * Fix: Add a label to the modals’ “close” button for screen reader users (Helen Chapman, Katie Locke) * Fix: Ensure the 'add child page' button displays when focused (Helen Chapman, Katie Locke) + * Fix: Remove tab order customisations in CMS admin (Jordan Bauer) 2.5.1 (07.05.2019) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index e2cf312cea..badf7a942a 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -377,6 +377,7 @@ Contributors * Dillen Meijboom * George Hickman * Eric Dyken +* Jordan Bauer Translators =========== diff --git a/client/src/components/Explorer/PageCount.js b/client/src/components/Explorer/PageCount.js index 592e234521..5b769329d0 100644 --- a/client/src/components/Explorer/PageCount.js +++ b/client/src/components/Explorer/PageCount.js @@ -11,7 +11,6 @@ const PageCount = ({ page }) => { {STRINGS.SEE_ALL} {` ${count} ${count === 1 ? STRINGS.PAGE.toLowerCase() : STRINGS.PAGES.toLowerCase()}`} diff --git a/client/src/components/Explorer/__snapshots__/PageCount.test.js.snap b/client/src/components/Explorer/__snapshots__/PageCount.test.js.snap index 4aa3fa98fc..48ae5aa640 100644 --- a/client/src/components/Explorer/__snapshots__/PageCount.test.js.snap +++ b/client/src/components/Explorer/__snapshots__/PageCount.test.js.snap @@ -4,7 +4,6 @@ exports[`PageCount plural 1`] = ` See all @@ -22,7 +21,6 @@ exports[`PageCount works 1`] = ` See all diff --git a/docs/advanced_topics/customisation/admin_templates.rst b/docs/advanced_topics/customisation/admin_templates.rst index 55887b5032..6372092b8a 100644 --- a/docs/advanced_topics/customisation/admin_templates.rst +++ b/docs/advanced_topics/customisation/admin_templates.rst @@ -163,7 +163,7 @@ To add extra buttons to the login form, override the ``submit_buttons`` block. Y {% block submit_buttons %} {{ block.super }} - + {% endblock %} ``login_form`` diff --git a/docs/releases/2.6.rst b/docs/releases/2.6.rst index 514952591e..4d4b5f1849 100644 --- a/docs/releases/2.6.rst +++ b/docs/releases/2.6.rst @@ -62,7 +62,7 @@ Bug fixes * Added missing form media to user edit form template (Matt Westcott) * Added a label to the modals’ “close” button for screen reader users (Helen Chapman, Katie Locke) * Ensured the 'add child page' button displays when focused (Helen Chapman, Katie Locke) - + * Removed buggy tab order customisations in the CMS admin (Jordan Bauer) Upgrade considerations ====================== diff --git a/package-lock.json b/package-lock.json index d869647638..08039264e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5050,12 +5050,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5070,17 +5072,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5197,7 +5202,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5209,6 +5215,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5223,6 +5230,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5230,12 +5238,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5254,6 +5264,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5334,7 +5345,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5346,6 +5358,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5467,6 +5480,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/wagtail/admin/forms/auth.py b/wagtail/admin/forms/auth.py index 75d81f14f1..fbfc9b12e6 100644 --- a/wagtail/admin/forms/auth.py +++ b/wagtail/admin/forms/auth.py @@ -5,11 +5,10 @@ from django.utils.translation import ugettext_lazy class LoginForm(AuthenticationForm): username = forms.CharField( - max_length=254, widget=forms.TextInput(attrs={'tabindex': '1'})) + max_length=254, widget=forms.TextInput()) password = forms.CharField( widget=forms.PasswordInput(attrs={ - 'tabindex': '2', 'placeholder': ugettext_lazy("Enter password"), })) diff --git a/wagtail/admin/templates/wagtailadmin/login.html b/wagtail/admin/templates/wagtailadmin/login.html index 1933be8fd4..db2b0a3692 100644 --- a/wagtail/admin/templates/wagtailadmin/login.html +++ b/wagtail/admin/templates/wagtailadmin/login.html @@ -79,7 +79,7 @@ {% endblock %}
  • {% block submit_buttons %} - + {% endblock %}
    • diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html index 34f01b3a71..a5868e96a7 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html +++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html @@ -1,4 +1,4 @@ {% load i18n %}
  • - +
    • diff --git a/wagtail/admin/templates/wagtailadmin/pages/create.html b/wagtail/admin/templates/wagtailadmin/pages/create.html index 6de76c0cfe..d6ed83e96d 100644 --- a/wagtail/admin/templates/wagtailadmin/pages/create.html +++ b/wagtail/admin/templates/wagtailadmin/pages/create.html @@ -28,7 +28,7 @@