indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Key shortcuts on search screen

merge-requests/30/head
Bob Mottram 2021-04-23 10:15:53 +01:00
parent 3691e1d50a
commit 5d267d32d0
19 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -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',

3
translations/ar.json
View File

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

3
translations/ca.json
View File

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

3
translations/cy.json
View File

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

3
translations/de.json
View File

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

3
translations/en.json
View File

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

3
translations/es.json
View File

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

3
translations/fr.json
View File

@ -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"
}

3
translations/ga.json
View File

@ -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"
}

3
translations/hi.json
View File

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

3
translations/it.json
View File

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

3
translations/ja.json
View File

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

3
translations/ku.json
View File

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

3
translations/oc.json
View File

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

3
translations/pt.json
View File

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

3
translations/ru.json
View File

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

3
translations/zh.json
View File

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

7
webapp_accesskeys.py
View File

@ -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'

10
webapp_search.py
View File

@ -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'