From 7d9dd30e25a9bf95a3d51456302c971c3707983b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Wed, 25 May 2022 11:58:43 +0100
Subject: [PATCH] Button tab indexes

---
 webapp_headerbuttons.py | 12 ++++++------
 webapp_timeline.py      | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/webapp_headerbuttons.py b/webapp_headerbuttons.py
index fe3eb1073..5b38b1bcc 100644
--- a/webapp_headerbuttons.py
+++ b/webapp_headerbuttons.py
@@ -269,7 +269,7 @@ def header_buttons_timeline(default_timeline: str,
             tl_str += \
                 '<a class="imageAnchor" href="' + users_path + \
                 '/search" accesskey="' + access_keys['menuSearch'] + \
-                '" tabindex="2">' + \
+                '" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/' + \
                 'icons/search.png" title="' + \
                 translate['Search and follow'] + '" alt="| ' + \
@@ -279,7 +279,7 @@ def header_buttons_timeline(default_timeline: str,
             # the search button
             tl_str += \
                 '<a href="' + users_path + \
-                '/search" tabindex="2">' + \
+                '/search" tabindex="3">' + \
                 '<button class="button" ' + \
                 'accesskey="' + access_keys['menuSearch'] + '>' + \
                 '<span>' + translate['Search'] + \
@@ -301,7 +301,7 @@ def header_buttons_timeline(default_timeline: str,
                 '      <a class="imageAnchor" href="' + \
                 users_path + calendar_path + \
                 '" accesskey="' + access_keys['menuCalendar'] + \
-                '" tabindex="2">' + \
+                '" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/icons/' + \
                 calendar_image + '" title="' + translate['Calendar'] + \
                 '" alt="| ' + calendar_alt_text + \
@@ -309,7 +309,7 @@ def header_buttons_timeline(default_timeline: str,
         else:
             tl_str += \
                 '<a href="' + users_path + calendar_path + \
-                '" tabindex="2"><button class="button" accesskey="' + \
+                '" tabindex="3"><button class="button" accesskey="' + \
                 access_keys['menuCalendar'] + '">' + \
                 '<span>' + translate['Calendar'] + \
                 '</span></button></a>'
@@ -319,7 +319,7 @@ def header_buttons_timeline(default_timeline: str,
         if not icons_as_buttons:
             tl_str += \
                 '      <a class="imageAnchor" href="' + \
-                users_path + '/minimal" tabindex="2">' + \
+                users_path + '/minimal" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/icons' + \
                 '/showhide.png" title="' + translate['Show/Hide Buttons'] + \
                 '" alt="| ' + translate['Show/Hide Buttons'] + \
@@ -327,7 +327,7 @@ def header_buttons_timeline(default_timeline: str,
         else:
             tl_str += \
                 '<a href="' + users_path + '/minimal' + \
-                '" tabindex="2"><button class="button">' + \
+                '" tabindex="3"><button class="button">' + \
                 '<span>' + translate['Show/Hide Buttons'] + \
                 '</span></button></a>'
 
diff --git a/webapp_timeline.py b/webapp_timeline.py
index ef6674aeb..2145b7eef 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -107,7 +107,7 @@ def _html_timeline_new_post(manually_approve_followers: bool,
         if not icons_as_buttons:
             new_post_button_str += \
                 '<a class="imageAnchor" href="' + users_path + \
-                '/newdm?nodropdown" tabindex="9"><img loading="lazy" ' + \
+                '/newdm?nodropdown" tabindex="3"><img loading="lazy" ' + \
                 'decoding="async" src="/' + \
                 'icons/newpost.png" title="' + \
                 translate['Create a new DM'] + \
@@ -116,14 +116,14 @@ def _html_timeline_new_post(manually_approve_followers: bool,
         else:
             new_post_button_str += \
                 '<a href="' + users_path + \
-                '/newdm?nodropdown" tabindex="9">' + \
+                '/newdm?nodropdown" tabindex="3">' + \
                 '<button class="button"><span>' + \
                 translate['Post'] + ' </span></button></a>'
     elif box_name in ('tlblogs', 'tlnews', 'tlfeatures'):
         if not icons_as_buttons:
             new_post_button_str += \
                 '<a class="imageAnchor" href="' + users_path + \
-                '/newblog" tabindex="9">' + \
+                '/newblog" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/' + \
                 'icons/newpost.png" title="' + \
                 translate['Create a new post'] + '" alt="| ' + \
@@ -131,14 +131,14 @@ def _html_timeline_new_post(manually_approve_followers: bool,
                 '" class="timelineicon"/></a>\n'
         else:
             new_post_button_str += \
-                '<a href="' + users_path + '/newblog" tabindex="9">' + \
+                '<a href="' + users_path + '/newblog" tabindex="3">' + \
                 '<button class="button"><span>' + \
                 translate['Post'] + '</span></button></a>'
     elif box_name == 'tlshares':
         if not icons_as_buttons:
             new_post_button_str += \
                 '<a class="imageAnchor" href="' + users_path + \
-                '/newshare?nodropdown" tabindex="9">' + \
+                '/newshare?nodropdown" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/' + \
                 'icons/newpost.png" title="' + \
                 translate['Create a new shared item'] + '" alt="| ' + \
@@ -147,14 +147,14 @@ def _html_timeline_new_post(manually_approve_followers: bool,
         else:
             new_post_button_str += \
                 '<a href="' + users_path + \
-                '/newshare?nodropdown" tabindex="9">' + \
+                '/newshare?nodropdown" tabindex="3">' + \
                 '<button class="button"><span>' + \
                 translate['Post'] + '</span></button></a>'
     elif box_name == 'tlwanted':
         if not icons_as_buttons:
             new_post_button_str += \
                 '<a class="imageAnchor" href="' + users_path + \
-                '/newwanted?nodropdown" tabindex="9">' + \
+                '/newwanted?nodropdown" tabindex="3">' + \
                 '<img loading="lazy" decoding="async" src="/' + \
                 'icons/newpost.png" title="' + \
                 translate['Create a new wanted item'] + '" alt="| ' + \
@@ -163,7 +163,7 @@ def _html_timeline_new_post(manually_approve_followers: bool,
         else:
             new_post_button_str += \
                 '<a href="' + users_path + \
-                '/newwanted?nodropdown" tabindex="9">' + \
+                '/newwanted?nodropdown" tabindex="3">' + \
                 '<button class="button"><span>' + \
                 translate['Post'] + '</span></button></a>'
     else:
@@ -171,7 +171,7 @@ def _html_timeline_new_post(manually_approve_followers: bool,
             if not icons_as_buttons:
                 new_post_button_str += \
                     '<a class="imageAnchor" href="' + users_path + \
-                    '/newpost" tabindex="9">' + \
+                    '/newpost" tabindex="3">' + \
                     '<img loading="lazy" decoding="async" src="/' + \
                     'icons/newpost.png" title="' + \
                     translate['Create a new post'] + '" alt="| ' + \
@@ -179,14 +179,14 @@ def _html_timeline_new_post(manually_approve_followers: bool,
                     '" class="timelineicon"/></a>\n'
             else:
                 new_post_button_str += \
-                    '<a href="' + users_path + '/newpost" tabindex="9">' + \
+                    '<a href="' + users_path + '/newpost" tabindex="3">' + \
                     '<button class="button"><span>' + \
                     translate['Post'] + '</span></button></a>'
         else:
             if not icons_as_buttons:
                 new_post_button_str += \
                     '<a class="imageAnchor" href="' + users_path + \
-                    '/newfollowers" tabindex="9">' + \
+                    '/newfollowers" tabindex="3">' + \
                     '<img loading="lazy" decoding="async" src="/' + \
                     'icons/newpost.png" title="' + \
                     translate['Create a new post'] + \
@@ -195,7 +195,7 @@ def _html_timeline_new_post(manually_approve_followers: bool,
             else:
                 new_post_button_str += \
                     '<a href="' + users_path + \
-                    '/newfollowers" tabindex="9">' + \
+                    '/newfollowers" tabindex="3">' + \
                     '<button class="button"><span>' + \
                     translate['Post'] + '</span></button></a>'
     return new_post_button_str