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

Set tab indexes for the left column 

This is so that when hitting tab a few times it goes to the main timeline posts and not the left column
merge-requests/30/head
Bob Mottram 2022-05-25 10:14:49 +01:00
parent a6bac4ffaf
commit b5a23447f8
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
webapp_column_left.py
View File

@ -162,7 +162,7 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
# show the edit icon # show the edit icon
html_str += \ html_str += \
' <a href="/users/' + nickname + '/editlinks" ' + \ ' <a href="/users/' + nickname + '/editlinks" ' + \
'accesskey="' + access_keys['menuEdit'] + '">' + \ 'accesskey="' + access_keys['menuEdit'] + '" tabindex="4000">' + \
'<img class="' + edit_image_class + \ '<img class="' + edit_image_class + \
'" loading="lazy" decoding="async" alt="' + \ '" loading="lazy" decoding="async" alt="' + \
translate['Edit Links'] + ' | " title="' + \ translate['Edit Links'] + ' | " title="' + \
@ -172,7 +172,8 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
# show the theme designer icon # show the theme designer icon
html_str += \ html_str += \
' <a href="/users/' + nickname + '/themedesigner" ' + \ ' <a href="/users/' + nickname + '/themedesigner" ' + \
'accesskey="' + access_keys['menuThemeDesigner'] + '">' + \ 'accesskey="' + access_keys['menuThemeDesigner'] + '" ' + \
'tabindex="4001">' + \
'<img class="' + edit_image_class + \ '<img class="' + edit_image_class + \
'" loading="lazy" decoding="async" alt="' + \ '" loading="lazy" decoding="async" alt="' + \
translate['Theme Designer'] + ' | " title="' + \ translate['Theme Designer'] + ' | " title="' + \
@ -190,8 +191,10 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
rss_title = translate['RSS feed for your blog'] rss_title = translate['RSS feed for your blog']
else: else:
rss_title = translate['RSS feed for this site'] rss_title = translate['RSS feed for this site']
rss_icon_tab = 'tabindex="4002"'
rss_icon_str = \ rss_icon_str = \
' <a href="' + rss_url + '"><img class="' + edit_image_class + \ ' <a href="' + rss_url + '" ' + rss_icon_tab + '>' + \
'<img class="' + edit_image_class + \
'" loading="lazy" decoding="async" alt="' + \ '" loading="lazy" decoding="async" alt="' + \
rss_title + '" title="' + rss_title + \ rss_title + '" title="' + rss_title + \
'" src="/icons/logorss.png" /></a>\n' '" src="/icons/logorss.png" /></a>\n'
@ -240,6 +243,7 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
new_tab_str = ' target="_blank" rel="nofollow noopener noreferrer"' new_tab_str = ' target="_blank" rel="nofollow noopener noreferrer"'
if links_list: if links_list:
html_str += '<nav itemscope itemtype="http://schema.org/Collection">\n' html_str += '<nav itemscope itemtype="http://schema.org/Collection">\n'
tab_ctr = 4010
for line_str in links_list: for line_str in links_list:
if ' ' not in line_str: if ' ' not in line_str:
if '#' not in line_str: if '#' not in line_str:
@ -292,12 +296,15 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
'?showwarning=' not in link_str: '?showwarning=' not in link_str:
html_str += \ html_str += \
' <p><a href="' + link_str + \ ' <p><a href="' + link_str + \
'"' + new_tab_str + '>' + \ '"' + new_tab_str + \
' tabindex="' + str(tab_ctr) + '">' + \
line_str + '</a></p>\n' line_str + '</a></p>\n'
else: else:
html_str += \ html_str += \
' <p><a href="' + link_str + \ ' <p><a href="' + link_str + \
'">' + line_str + '</a></p>\n' '" tabindex="' + str(tab_ctr) + '">' + \
line_str + '</a></p>\n'
tab_ctr += 1
links_file_contains_entries = True links_file_contains_entries = True
elif line_str.startswith('=> '): elif line_str.startswith('=> '):
# gemini style link # gemini style link
@ -308,12 +315,15 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
'?showwarning=' not in link_str: '?showwarning=' not in link_str:
html_str += \ html_str += \
' <p><a href="' + link_str + \ ' <p><a href="' + link_str + \
'"' + new_tab_str + '>' + \ '"' + new_tab_str + \
' tabindex="' + str(tab_ctr) + '">' + \
line_str.strip() + '</a></p>\n' line_str.strip() + '</a></p>\n'
else: else:
html_str += \ html_str += \
' <p><a href="' + link_str + \ ' <p><a href="' + link_str + \
'">' + line_str.strip() + '</a></p>\n' '" tabindex="' + str(tab_ctr) + '">' + \
line_str.strip() + '</a></p>\n'
tab_ctr += 1
links_file_contains_entries = True links_file_contains_entries = True
else: else:
if line_str.startswith('#') or line_str.startswith('*'): if line_str.startswith('#') or line_str.startswith('*'):
@ -334,20 +344,32 @@ def get_left_column_content(base_dir: str, nickname: str, domain_full: str,
html_str += separator_str html_str += separator_str
html_str += \ html_str += \
'<p class="login-text"><a href="/users/' + nickname + \ '<p class="login-text"><a href="/users/' + nickname + \
'/catalog.csv">' + translate['Shares Catalog'] + '</a></p>' '/catalog.csv" ' + \
'tabindex="' + str(tab_ctr) + '">' + \
translate['Shares Catalog'] + '</a></p>'
tab_ctr += 1
html_str += \ html_str += \
'<p class="login-text"><a href="/users/' + \ '<p class="login-text"><a href="/users/' + \
nickname + '/accesskeys" accesskey="' + \ nickname + '/accesskeys" accesskey="' + \
access_keys['menuKeys'] + '">' + \ access_keys['menuKeys'] + '" ' + \
'tabindex="' + str(tab_ctr) + '">' + \
translate['Key Shortcuts'] + '</a></p>' translate['Key Shortcuts'] + '</a></p>'
tab_ctr += 1
html_str += \ html_str += \
'<p class="login-text"><a href="/about">' + \ '<p class="login-text"><a href="/about" ' + \
'tabindex="' + str(tab_ctr) + '">' + \
translate['About this Instance'] + '</a></p>' translate['About this Instance'] + '</a></p>'
tab_ctr += 1
html_str += \ html_str += \
'<p class="login-text"><a href="/terms">' + \ '<p class="login-text"><a href="/terms" ' + \
'tabindex="' + str(tab_ctr) + '">' + \
translate['Terms of Service'] + '</a></p>' translate['Terms of Service'] + '</a></p>'
tab_ctr += 1
if links_file_contains_entries and not rss_icon_at_top: if links_file_contains_entries and not rss_icon_at_top:
rss_icon_str = \
rss_icon_str.replace(rss_icon_tab,
'tabindex="' + str(tab_ctr) + '"')
html_str += '<br><div class="columnIcons">' + rss_icon_str + '</div>' html_str += '<br><div class="columnIcons">' + rss_icon_str + '</div>'
return html_str return html_str