From 22c75245a5faf87cf1650f032ed15a2c2e152c14 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 4 May 2024 18:58:51 +0200
Subject: [PATCH 1/5] Add accesskey to Kiwix Server multiple search inputs

---
 static/templates/index.html              | 2 +-
 static/templates/no_js_library_page.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/templates/index.html b/static/templates/index.html
index dac6468a..c029f247 100644
--- a/static/templates/index.html
+++ b/static/templates/index.html
@@ -93,7 +93,7 @@
         </div>
       </div>
       <form id='kiwixSearchForm' class='kiwixNav__SearchForm'>
-        <input type="text" name="q" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
+        <input type="text" name="q" accesskey="s" placeholder="Search" id="searchFilter" class='kiwixSearch filter'>
         <span class="kiwixButton tagFilterLabel"></span>
         <input type="submit" class="kiwixButton kiwixButtonHover" id="searchButton" value="Search"/>
       </form>
diff --git a/static/templates/no_js_library_page.html b/static/templates/no_js_library_page.html
index 71c7ab6d..cb747929 100644
--- a/static/templates/no_js_library_page.html
+++ b/static/templates/no_js_library_page.html
@@ -90,7 +90,7 @@
         </div>
       </div>
       <form id='kiwixSearchForm' class='kiwixNav__SearchForm' action="{{root}}/nojs">
-        <input type="text" name="q" placeholder="{{translations.search}}" id="searchFilter" class='kiwixSearch filter' value="{{searchQuery}}">
+        <input type="text" name="q" accesskey="s" placeholder="{{translations.search}}" id="searchFilter" class='kiwixSearch filter' value="{{searchQuery}}">
         <input type="submit" class="kiwixButton kiwixButtonHover" value="{{translations.search}}"/>
       </form>
     </div>

From a0b66eae0cabdda82cbe3b6e48e57e8a2d332af8 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 4 May 2024 19:03:25 +0200
Subject: [PATCH 2/5] Add accesskey to Kiwix Server random button

---
 static/viewer.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/viewer.html b/static/viewer.html
index d0f10562..8b889378 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -53,6 +53,7 @@
                  onclick="gotoMainPageOfCurrentBook()"></a>
               <a id="kiwix_serve_taskbar_random_button"
                  title="Go to a randomly selected page"
+                 accesskey="r"
                  aria-label="Go to a randomly selected page"
                  onclick="gotoRandomPage()">
                 <button>&#x1F3B2;</button>

From 5450bcd3c2f8be2444a076dac68991fdbeba92f5 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 4 May 2024 19:10:24 +0200
Subject: [PATCH 3/5] Add accesskey to Kiwix Server library button

---
 static/viewer.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/static/viewer.html b/static/viewer.html
index 8b889378..a0d83ff7 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -45,7 +45,13 @@
           <input type="checkbox" id="kiwix_button_show_toggle">
           <label for="kiwix_button_show_toggle"><img src="./skin/caret.png?KIWIXCACHEID" alt=""></label>
           <div class="kiwix_button_cont">
-            <a id="kiwix_serve_taskbar_library_button" title="Go to welcome page" aria-label="Go to welcome page" href="./"><button>&#x1f3e0;</button></a>
+            <a id="kiwix_serve_taskbar_library_button"
+               title="Go to welcome page"
+               accesskey="w"
+               aria-label="Go to welcome page"
+               href="./">
+              <button>&#x1f3e0;</button>
+            </a>
             <span id="kiwix_serve_taskbar_book_ui_group">
               <a id="kiwix_serve_taskbar_home_button"
                  title="Go to the main page of the current book"

From 8d766335b427a320546aa405ea8c4a00d8248b6a Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 4 May 2024 19:22:15 +0200
Subject: [PATCH 4/5] Add accesskey to Kiwix Server home button

---
 static/viewer.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/viewer.html b/static/viewer.html
index a0d83ff7..bc547860 100644
--- a/static/viewer.html
+++ b/static/viewer.html
@@ -55,6 +55,7 @@
             <span id="kiwix_serve_taskbar_book_ui_group">
               <a id="kiwix_serve_taskbar_home_button"
                  title="Go to the main page of the current book"
+                 accesskey="h"
                  aria-label="Go to the main page of the current book"
                  onclick="gotoMainPageOfCurrentBook()"></a>
               <a id="kiwix_serve_taskbar_random_button"

From 2964cc5e920307701066db05d1cebb9489699002 Mon Sep 17 00:00:00 2001
From: Emmanuel Engelhart <kelson@kiwix.org>
Date: Sat, 4 May 2024 19:16:59 +0200
Subject: [PATCH 5/5] Updates tests

---
 test/library_server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/library_server.cpp b/test/library_server.cpp
index ea2d94b4..f5082a42 100644
--- a/test/library_server.cpp
+++ b/test/library_server.cpp
@@ -1171,7 +1171,7 @@ TEST_F(LibraryServerTest, no_name_mapper_catalog_v2_individual_entry_access)
   "        </div>\n" \
   "      </div>\n" \
   "      <form id='kiwixSearchForm' class='kiwixNav__SearchForm' action=\"/ROOT%23%3F/nojs\">\n" \
-  "        <input type=\"text\" name=\"q\" placeholder=\"Search\" id=\"searchFilter\" class='kiwixSearch filter' value=\"\">\n" \
+  "        <input type=\"text\" name=\"q\" accesskey=\"s\" placeholder=\"Search\" id=\"searchFilter\" class='kiwixSearch filter' value=\"\">\n" \
   "        <input type=\"submit\" class=\"kiwixButton kiwixButtonHover\" value=\"Search\"/>\n" \
   "      </form>\n" \
   "    </div>\n"