From 36bac670a0d0c6af4170800c91599fb6593c93a6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 28 Nov 2022 12:05:13 +0000 Subject: [PATCH] Moved menu option --- webapp_profile.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/webapp_profile.py b/webapp_profile.py index da0d316d1..63cbb43c8 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -639,6 +639,10 @@ def html_profile(signing_priv_key_pem: str, timezone: str, bold_reading: bool) -> str: """Show the profile page as html """ + show_moved_accounts = False + if authorized: + show_moved_accounts = True + nickname = profile_json['preferredUsername'] if not nickname: return "" @@ -984,14 +988,26 @@ def html_profile(signing_priv_key_pem: str, html_hide_from_screen_reader('✍') + ' ' + translate['Edit'] menu_followers = \ html_hide_from_screen_reader('👪') + ' ' + followers_str + if show_moved_accounts: + menu_moved = \ + html_hide_from_screen_reader('⌂') + ' ' + translate['Moved'] menu_logout = \ html_hide_from_screen_reader('❎') + ' ' + translate['Logout'] - nav_links = { - menu_timeline: user_path_str + '/' + deft, - menu_edit: user_path_str + '/editprofile', - menu_followers: user_path_str + '/followers#timeline', - menu_logout: '/logout' - } + if not show_moved_accounts: + nav_links = { + menu_timeline: user_path_str + '/' + deft, + menu_edit: user_path_str + '/editprofile', + menu_followers: user_path_str + '/followers#timeline', + menu_logout: '/logout' + } + else: + nav_links = { + menu_timeline: user_path_str + '/' + deft, + menu_edit: user_path_str + '/editprofile', + menu_followers: user_path_str + '/followers#timeline', + menu_moved: user_path_str + '/moved#timeline', + menu_logout: '/logout' + } if not is_group: menu_following = \ html_hide_from_screen_reader('👥') + ' ' + translate['Following'] @@ -1036,7 +1052,7 @@ def html_profile(signing_priv_key_pem: str, '' if not is_group: - if authorized: + if show_moved_accounts: profile_str += \ ' ' + \ @@ -1119,7 +1135,7 @@ def html_profile(signing_priv_key_pem: str, max_items_per_page, dormant_months, debug, signing_priv_key_pem) - if authorized and selected == 'moved': + if show_moved_accounts and selected == 'moved': profile_str += \ _html_profile_following(translate, base_dir, http_prefix, authorized, nickname,