Key shortcut to key shortcuts

daemon.py

@@ -11781,6 +11781,9 @@ class PubServer(BaseHTTPRequestHandler):
                     self._404()
                     self.server.GETbusy = False
                     return
+                accessKeys = self.server.accessKeys
+                if self.server.keyShortcuts.get(nickname):
+                    accessKeys = self.server.keyShortcuts[nickname]
                 timelinePath = \
                     '/users/' + nickname + '/' + self.server.defaultTimeline
                 iconsAsButtons = self.server.iconsAsButtons
@@ -11795,7 +11798,8 @@ class PubServer(BaseHTTPRequestHandler):
                                       self.server.rssIconAtTop,
                                       iconsAsButtons,
                                       defaultTimeline,
-                                      self.server.themeName).encode('utf-8')
+                                      self.server.themeName,
+                                      accessKeys).encode('utf-8')
                 msglen = len(msg)
                 self._set_headers('text/html', msglen, cookie, callingDomain)
                 self._write(msg)

webapp_column_left.py

@@ -68,7 +68,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
                          editor: bool,
                          showBackButton: bool, timelinePath: str,
                          rssIconAtTop: bool, showHeaderImage: bool,
-                         frontPage: bool, theme: str) -> str:
+                         frontPage: bool, theme: str,
+                         accessKeys: {}) -> str:
     """Returns html content for the left column
     """
     htmlStr = ''
@@ -256,7 +257,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
         htmlStr += separatorStr
     htmlStr += \
         '<p class="login-text"><a href="/users/' + \
-        nickname + '/accesskeys">' + \
+        nickname + '/accesskeys" accesskeys="' + \
+        accessKeys['menuKeys'] + '">' + \
         translate['Key Shortcuts'] + '</a></p>'
     htmlStr += \
         '<p class="login-text"><a href="/about">' + \
@@ -278,7 +280,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
                     rssIconAtTop: bool,
                     iconsAsButtons: bool,
                     defaultTimeline: str,
-                    theme: str) -> str:
+                    theme: str, accessKeys: {}) -> str:
     """Show the left column links within mobile view
     """
     htmlStr = ''
@@ -321,7 +323,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
                                  editor,
                                  False, timelinePath,
                                  rssIconAtTop, False, False,
-                                 theme)
+                                 theme, accessKeys)
     else:
         if editor:
             htmlStr += '<br><br><br>\n'

webapp_frontscreen.py

@@ -96,6 +96,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
                     newswire: {}, theme: str,
                     peertubeInstances: [],
                     allowLocalNetworkAccess: bool,
+                    accessKeys: {},
                     extraJson=None,
                     pageNumber=None, maxItemsPerPage=None) -> str:
     """Show the news instance front screen
@@ -138,7 +139,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
         getLeftColumnContent(baseDir, 'news', domainFull,
                              httpPrefix, translate,
                              False, False, None, rssIconAtTop, True,
-                             True, theme)
+                             True, theme, accessKeys)
     profileHeaderStr += '      </td>\n'
     profileHeaderStr += '      <td valign="top" class="col-center">\n'
 

webapp_profile.py

@@ -516,7 +516,7 @@ def htmlProfile(rssIconAtTop: bool,
                                YTReplacementDomain,
                                showPublishedDateOnly,
                                newswire, theme, extraJson,
-                               allowLocalNetworkAccess,
+                               allowLocalNetworkAccess, accessKeys,
                                pageNumber, maxItemsPerPage)
 
     domain, port = getDomainFromActor(profileJson['id'])

webapp_timeline.py

@@ -535,7 +535,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
         getLeftColumnContent(baseDir, nickname, domainFull,
                              httpPrefix, translate,
                              editor, False, None, rssIconAtTop,
-                             True, False, theme)
+                             True, False, theme, accessKeys)
     tlStr += '  <td valign="top" class="col-left" ' + \
         'id="links" tabindex="-1">' + \
         leftColumnStr + '  </td>\n'