Remove buggy tab order customisations in CMS admin (#5383, #5351)

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)

CONTRIBUTORS.rst

@@ -377,6 +377,7 @@ Contributors
 * Dillen Meijboom
 * George Hickman
 * Eric Dyken
+* Jordan Bauer
 
 Translators
 ===========

client/src/components/Explorer/PageCount.js

@@ -11,7 +11,6 @@ const PageCount = ({ page }) => {
     <a
       href={`${ADMIN_URLS.PAGES}${page.id}/`}
       className="c-explorer__see-more"
-      tabIndex={0}
     >
       {STRINGS.SEE_ALL}
       <span>{` ${count} ${count === 1 ? STRINGS.PAGE.toLowerCase() : STRINGS.PAGES.toLowerCase()}`}</span>

client/src/components/Explorer/__snapshots__/PageCount.test.js.snap

@@ -4,7 +4,6 @@ exports[`PageCount plural 1`] = `
 <a
   className="c-explorer__see-more"
   href="/admin/pages/1/"
-  tabIndex={0}
 >
   See all
   <span>
@@ -22,7 +21,6 @@ exports[`PageCount works 1`] = `
 <a
   className="c-explorer__see-more"
   href="/admin/pages/1/"
-  tabIndex={0}
 >
   See all
   <span>

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 }}
-        <a href="{% url 'signup' %}"><button type="button" class="button" tabindex="4">{% trans 'Sign up' %}</button></a>
+        <a href="{% url 'signup' %}"><button type="button" class="button">{% trans 'Sign up' %}</button></a>
     {% endblock %}
 
 ``login_form``

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

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",

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"),
         }))
 

wagtail/admin/templates/wagtailadmin/login.html

@@ -79,7 +79,7 @@
                 {% endblock %}
                 <li class="submit">
                     {% block submit_buttons %}
-                    <button type="submit" class="button button-longrunning" tabindex="3" data-clicked-text="{% trans 'Signing in…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Sign in' %}</em></button>
+                    <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Signing in…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Sign in' %}</em></button>
                     {% endblock %}
                 </li>
             </ul>

wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html

@@ -1,4 +1,4 @@
 {% load i18n %}
 <li>
-    <button type="submit" name="action-publish" value="action-publish" class="button button-longrunning {% if is_revision %}warning{% endif %}" tabindex="3" data-clicked-text="{% trans 'Publishing…' %}"><span class="icon icon-spinner"></span><em>{% if is_revision %}{% trans 'Publish this revision' %}{% else %}{% trans 'Publish' %}{% endif %}</em></button>
+    <button type="submit" name="action-publish" value="action-publish" class="button button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Publishing…' %}"><span class="icon icon-spinner"></span><em>{% if is_revision %}{% trans 'Publish this revision' %}{% else %}{% trans 'Publish' %}{% endif %}</em></button>
 </li>

wagtail/admin/templates/wagtailadmin/pages/create.html

@@ -28,7 +28,7 @@
                 <ul>
                     <li class="actions">
                         <div class="dropdown dropup dropdown-button match-width">
-                            <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save draft' %}</em></button>
+                            <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save draft' %}</em></button>
                             {{ action_menu.render_html }}
                         </div>
                     </li>

wagtail/admin/templates/wagtailadmin/pages/edit.html

@@ -39,7 +39,7 @@
                 <ul>
                     <li class="actions">
                         <div class="dropdown dropup dropdown-button match-width {% if is_revision %}warning{% endif %}">
-                            <button type="submit" class="button action-save button-longrunning {% if is_revision %}warning{% endif %}" tabindex="3" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}><span class="icon icon-spinner"></span><em>{% if page.locked %}{% trans 'Page locked' %}{% else %}{% if is_revision %}{% trans 'Replace current draft' %}{% else %}{% trans 'Save draft' %}{% endif %}{% endif %}</em></button>
+                            <button type="submit" class="button action-save button-longrunning {% if is_revision %}warning{% endif %}" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}><span class="icon icon-spinner"></span><em>{% if page.locked %}{% trans 'Page locked' %}{% else %}{% if is_revision %}{% trans 'Replace current draft' %}{% else %}{% trans 'Save draft' %}{% endif %}{% endif %}</em></button>
 
                             {{ action_menu.render_html }}
                         </div>

wagtail/contrib/modeladmin/templates/modeladmin/create.html

@@ -35,7 +35,7 @@
                     <li class="actions">
                         {% block form_actions %}
                             <div class="dropdown dropup dropdown-button match-width">
-                                <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}">
+                                <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}">
                                     <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
                                 </button>
                             </div>

wagtail/contrib/modeladmin/templates/modeladmin/edit.html

@@ -5,7 +5,7 @@
 
 {% block form_actions %}
     <div class="dropdown dropup dropdown-button match-width">
-        <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}>
+        <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}>
             <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
         </button>
 

wagtail/contrib/settings/templates/wagtailsettings/edit.html

@@ -33,7 +33,7 @@
         <footer role="contentinfo">
             <ul>
                 <li class="actions dropdown dropup match-width">
-                    <button type="submit" class="button button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em></button>
+                    <button type="submit" class="button button-longrunning" data-clicked-text="{% trans 'Saving…' %}"><span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em></button>
                 </li>
             </ul>
         </footer>

wagtail/snippets/templates/wagtailsnippets/snippets/create.html

@@ -13,7 +13,7 @@
             <ul>
                 <li class="actions">
                     <div class="dropdown dropup dropdown-button match-width">
-                        <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}">
+                        <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}">
                             <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
                         </button>
                     </div>

wagtail/snippets/templates/wagtailsnippets/snippets/edit.html

@@ -17,7 +17,7 @@
                     <ul>
                         <li class="actions">
                             <div class="dropdown dropup dropdown-button match-width">
-                                <button type="submit" class="button action-save button-longrunning" tabindex="3" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}>
+                                <button type="submit" class="button action-save button-longrunning" data-clicked-text="{% trans 'Saving…' %}" {% if page.locked %}disabled {% endif %}>
                                     <span class="icon icon-spinner"></span><em>{% trans 'Save' %}</em>
                                 </button>
                                 <div class="dropdown-toggle icon icon-arrow-up"></div>