Key shortcuts on search screen

daemon.py

@@ -11758,6 +11758,15 @@ class PubServer(BaseHTTPRequestHandler):
                '/search?' in self.path:
                 if '?' in self.path:
                     self.path = self.path.split('?')[0]
+
+                nickname = self.path.split('/users/')[1]
+                if '/' in nickname:
+                    nickname = nickname.split('/')[0]
+
+                accessKeys = self.server.accessKeys
+                if self.server.keyShortcuts.get(nickname):
+                    accessKeys = self.server.keyShortcuts[nickname]
+
                 # show the search screen
                 msg = htmlSearch(self.server.cssCache,
                                  self.server.translate,
@@ -11765,7 +11774,8 @@ class PubServer(BaseHTTPRequestHandler):
                                  self.server.domain,
                                  self.server.defaultTimeline,
                                  self.server.themeName,
-                                 self.server.textModeBanner).encode('utf-8')
+                                 self.server.textModeBanner,
+                                 accessKeys).encode('utf-8')
                 msglen = len(msg)
                 self._set_headers('text/html', msglen, cookie, callingDomain)
                 self._write(msg)
@@ -14647,6 +14657,7 @@ def runDaemon(brochMode: bool,
 
     # key shortcuts SHIFT + ALT + [key]
     httpd.accessKeys = {
+        'submitButton': 'y',
         'menuTimeline': 't',
         'menuEdit': 'e',
         'menuProfile': 'p',

translations/ar.json

@@ -426,5 +426,6 @@
     "menuRoles": "أدوار",
     "menuSkills": "مهارات",
     "menuLogout": "تسجيل خروج",
-    "menuKeys": "الاختصارات الرئيسية"
+    "menuKeys": "الاختصارات الرئيسية",
+    "submitButton": "زر الإرسال"
 }

translations/ca.json

@@ -426,5 +426,6 @@
     "menuRoles": "Rols",
     "menuSkills": "Habilitats",
     "menuLogout": "Tancar sessió",
-    "menuKeys": "Dreceres clau"
+    "menuKeys": "Dreceres clau",
+    "submitButton": "Envia el botó"
 }

translations/cy.json

@@ -426,5 +426,6 @@
     "menuRoles": "Rolau",
     "menuSkills": "Medrau",
     "menuLogout": "Allgofnodi",
-    "menuKeys": "Llwybrau byr allweddol"
+    "menuKeys": "Llwybrau byr allweddol",
+    "submitButton": "Cyflwyno botwm"
 }

translations/de.json

@@ -426,5 +426,6 @@
     "menuRoles": "Rollen",
     "menuSkills": "Kompetenzen",
     "menuLogout": "Ausloggen",
-    "menuKeys": "Schlüsselverknüpfungen"
+    "menuKeys": "Schlüsselverknüpfungen",
+    "submitButton": "Button einreichen"
 }

translations/en.json

@@ -426,5 +426,6 @@
     "menuRoles": "Roles",
     "menuSkills": "Skills",
     "menuLogout": "Logout",
-    "menuKeys": "Key Shortcuts"
+    "menuKeys": "Key Shortcuts",
+    "submitButton": "Submit button"
 }

translations/es.json

@@ -426,5 +426,6 @@
     "menuRoles": "Roles",
     "menuSkills": "Habilidades",
     "menuLogout": "Cerrar sesión",
-    "menuKeys": "Atajos clave"
+    "menuKeys": "Atajos clave",
+    "submitButton": "Botón de enviar"
 }

translations/fr.json

@@ -426,5 +426,6 @@
     "menuRoles": "Les rôles",
     "menuSkills": "Compétences",
     "menuLogout": "Se déconnecter",
-    "menuKeys": "Raccourcis clés"
+    "menuKeys": "Raccourcis clés",
+    "submitButton": "Bouton de soumission"
 }

translations/ga.json

@@ -426,5 +426,6 @@
     "menuRoles": "Róil",
     "menuSkills": "Scileanna",
     "menuLogout": "Logáil Amach",
-    "menuKeys": "Príomh-aicearraí"
+    "menuKeys": "Príomh-aicearraí",
+    "submitButton": "Cuir an cnaipe isteach"
 }

translations/hi.json

@@ -426,5 +426,6 @@
     "menuRoles": "भूमिकाएँ",
     "menuSkills": "कौशल",
     "menuLogout": "लॉग आउट",
-    "menuKeys": "कुंजी शॉर्टकट"
+    "menuKeys": "कुंजी शॉर्टकट",
+    "submitButton": "जमा करने वाला बटन"
 }

translations/it.json

@@ -426,5 +426,6 @@
     "menuRoles": "Ruoli",
     "menuSkills": "Competenze",
     "menuLogout": "Disconnettersi",
-    "menuKeys": "Scorciatoie chiave"
+    "menuKeys": "Scorciatoie chiave",
+    "submitButton": "Invia il pulsante"
 }

translations/ja.json

@@ -426,5 +426,6 @@
     "menuRoles": "役割",
     "menuSkills": "スキル",
     "menuLogout": "ログアウト",
-    "menuKeys": "キーショートカット"
+    "menuKeys": "キーショートカット",
+    "submitButton": "送信ボタン"
 }

translations/ku.json

@@ -426,5 +426,6 @@
     "menuRoles": "Roles",
     "menuSkills": "Şarezayên",
     "menuLogout": "Derkeve",
-    "menuKeys": "Kurteyên Key"
+    "menuKeys": "Kurteyên Key",
+    "submitButton": "Bişkojka bişînin"
 }

translations/oc.json

@@ -422,5 +422,6 @@
     "menuRoles": "Roles",
     "menuSkills": "Skills",
     "menuLogout": "Logout",
-    "menuKeys": "Key Shortcuts"
+    "menuKeys": "Key Shortcuts",
+    "submitButton": "Submit button"
 }

translations/pt.json

@@ -426,5 +426,6 @@
     "menuRoles": "Papéis",
     "menuSkills": "Habilidades",
     "menuLogout": "Sair",
-    "menuKeys": "Atalhos-chave"
+    "menuKeys": "Atalhos-chave",
+    "submitButton": "Botão de envio"
 }

translations/ru.json

@@ -426,5 +426,6 @@
     "menuRoles": "Роли",
     "menuSkills": "Навыки и умения",
     "menuLogout": "Выйти",
-    "menuKeys": "Клавичные ярлыки"
+    "menuKeys": "Клавичные ярлыки",
+    "submitButton": "Отправить кнопку"
 }

translations/zh.json

@@ -426,5 +426,6 @@
     "menuRoles": "角色",
     "menuSkills": "技能",
     "menuLogout": "登出",
-    "menuKeys": "关键捷径"
+    "menuKeys": "关键捷径",
+    "submitButton": "提交按钮"
 }

webapp_accesskeys.py

@@ -63,12 +63,15 @@ def htmlAccessKeys(cssCache: {}, baseDir: str,
     accessKeysForm += '  <form method="POST" action="' + \
         '/users/' + nickname + '/changeAccessKeys">\n'
 
+    timelineKey = accessKeys['menuTimeline']
+    submitKey = accessKeys['submitButton']
     accessKeysForm += \
         '    <center>\n' + \
         '    <button type="submit" class="button" ' + \
-        'name="submitAccessKeysCancel">' + \
+        'name="submitAccessKeysCancel" accesskey="' + timelineKey + '">' + \
         translate['Go Back'] + '</button>\n' + \
-        '    <button type="submit" class="button" name="submitAccessKeys">' + \
+        '    <button type="submit" class="button" ' + \
+        'name="submitAccessKeys" accesskey="' + submitKey + '">' + \
         translate['Submit'] + '</button>\n    </center>\n'
 
     accessKeysForm += '    <table class="accesskeys">\n'

webapp_search.py

@@ -319,7 +319,7 @@ def htmlSearchEmojiTextEntry(cssCache: {}, translate: {},
 def htmlSearch(cssCache: {}, translate: {},
                baseDir: str, path: str, domain: str,
                defaultTimeline: str, theme: str,
-               textModeBanner: str) -> str:
+               textModeBanner: str, accessKeys: {}) -> str:
     """Search called from the timeline icon
     """
     actor = path.replace('/search', '')
@@ -347,12 +347,14 @@ def htmlSearch(cssCache: {}, translate: {},
         textModeBannerStr = ''
 
     if os.path.isfile(searchBannerFilename):
+        timelineKey = accessKeys['menuTimeline']
         usersPath = '/users/' + searchNickname
         followStr += \
             '<header>\n' + textModeBannerStr + \
             '<a href="' + usersPath + '/' + defaultTimeline + '" title="' + \
             translate['Switch to timeline view'] + '" alt="' + \
-            translate['Switch to timeline view'] + '">\n'
+            translate['Switch to timeline view'] + '" ' + \
+            'accesskey="' + timelineKey + '">\n'
         followStr += '<img loading="lazy" class="timeline-banner" src="' + \
             usersPath + '/' + searchBannerFile + '" alt="" /></a>\n' + \
             '</header>\n'
@@ -370,8 +372,10 @@ def htmlSearch(cssCache: {}, translate: {},
     followStr += \
         '    <input type="hidden" name="actor" value="' + actor + '">\n'
     followStr += '    <input type="text" name="searchtext" autofocus><br>\n'
+    submitKey = accessKeys['submitButton']
     followStr += '    <button type="submit" class="button" ' + \
-        'name="submitSearch">' + translate['Submit'] + '</button>\n'
+        'name="submitSearch" accesskey="' + submitKey + '">' + \
+        translate['Submit'] + '</button>\n'
     followStr += '  </form>\n'
     followStr += '  <p class="hashtagswarm">' + \
         htmlHashTagSwarm(baseDir, actor, translate) + '</p>\n'