From 2afe588a6a630cbcfe08e539ab3db12e52af27cc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 6 Feb 2021 10:46:03 +0000 Subject: [PATCH] Move space --- webapp_profile.py | 23 +++++++++++++---------- webapp_timeline.py | 37 ++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/webapp_profile.py b/webapp_profile.py index b9ea1948b..b4859a6d9 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -714,21 +714,22 @@ def htmlProfile(rssIconAtTop: bool, userPathStr = '/users/' + nickname deft = defaultTimeline menuTimeline = \ - htmlHideFromScreenReader('🏠 ') + translate['Switch to timeline view'] + htmlHideFromScreenReader('🏠') + ' ' + \ + translate['Switch to timeline view'] menuEdit = \ - htmlHideFromScreenReader('✍ ') + translate['Edit'] + htmlHideFromScreenReader('✍') + ' ' + translate['Edit'] menuFollowing = \ - htmlHideFromScreenReader('đŸ‘Ĩ ') + translate['Following'] + htmlHideFromScreenReader('đŸ‘Ĩ') + ' ' + translate['Following'] menuFollowers = \ - htmlHideFromScreenReader('đŸ‘Ē ') + translate['Followers'] + htmlHideFromScreenReader('đŸ‘Ē') + ' ' + translate['Followers'] menuRoles = \ - htmlHideFromScreenReader('🤚 ') + translate['Roles'] + htmlHideFromScreenReader('🤚') + ' ' + translate['Roles'] menuSkills = \ - htmlHideFromScreenReader('🛠ī¸') + translate['Skills'] + htmlHideFromScreenReader('🛠') + ' ' + translate['Skills'] menuShares = \ - htmlHideFromScreenReader('🤝ī¸') + translate['Shares'] + htmlHideFromScreenReader('🤝') + ' ' + translate['Shares'] menuLogout = \ - htmlHideFromScreenReader('❎ī¸') + translate['Logout'] + htmlHideFromScreenReader('❎') + ' ' + translate['Logout'] navLinks = { menuTimeline: userPathStr + '/' + deft, menuEdit: userPathStr + '/editprofile', @@ -1365,9 +1366,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str, userPathStr = '/users/' + nickname userTimalineStr = '/users/' + nickname + '/' + defaultTimeline menuTimeline = \ - htmlHideFromScreenReader('🏠 ') + translate['Switch to timeline view'] + htmlHideFromScreenReader('🏠') + ' ' + \ + translate['Switch to timeline view'] menuProfile = \ - htmlHideFromScreenReader('👤 ') + translate['Switch to profile view'] + htmlHideFromScreenReader('👤') + ' ' + \ + translate['Switch to profile view'] navLinks = { menuProfile: userPathStr, menuTimeline: userTimalineStr diff --git a/webapp_timeline.py b/webapp_timeline.py index 70f5d3451..ad892a07d 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -380,33 +380,40 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, if newShare: sharesStr = '*' + sharesStr + '*' menuProfile = \ - htmlHideFromScreenReader('👤 ') + translate['Switch to profile view'] + htmlHideFromScreenReader('👤') + ' ' + \ + translate['Switch to profile view'] menuInbox = \ - htmlHideFromScreenReader('đŸ“Ĩ ') + translate['Inbox'] + htmlHideFromScreenReader('đŸ“Ĩ') + ' ' + translate['Inbox'] menuOutbox = \ - htmlHideFromScreenReader('📤 ') + translate['Outbox'] + htmlHideFromScreenReader('📤') + ' ' + translate['Outbox'] menuSearch = \ - htmlHideFromScreenReader('🔍 ') + translate['Search and follow'] + htmlHideFromScreenReader('🔍') + ' ' + \ + translate['Search and follow'] menuCalendar = \ - htmlHideFromScreenReader('📅 ') + calendarStr + htmlHideFromScreenReader('📅') + ' ' + calendarStr menuDM = \ - htmlHideFromScreenReader('✉ ') + dmStr + htmlHideFromScreenReader('✉') + ' ' + dmStr menuReplies = \ - htmlHideFromScreenReader('↩ī¸') + repliesStr + htmlHideFromScreenReader('↩') + ' ' + repliesStr menuBookmarks = \ - htmlHideFromScreenReader('🔖 ') + translate['Bookmarks'] + htmlHideFromScreenReader('🔖') + ' ' + \ + translate['Bookmarks'] menuShares = \ - htmlHideFromScreenReader('🤝ī¸') + sharesStr + htmlHideFromScreenReader('🤝') + ' ' + sharesStr menuEvents = \ - htmlHideFromScreenReader('đŸŽĢī¸') + translate['Events'] + htmlHideFromScreenReader('đŸŽĢ') + ' ' + translate['Events'] menuBlogs = \ - htmlHideFromScreenReader('📝ī¸') + translate['Blogs'] + htmlHideFromScreenReader('📝') + ' ' + translate['Blogs'] menuNewswire = \ - htmlHideFromScreenReader('📰ī¸') + translate['Newswire'] + htmlHideFromScreenReader('📰') + ' ' + translate['Newswire'] menuLinks = \ - htmlHideFromScreenReader('🔗ī¸') + translate['Links'] + htmlHideFromScreenReader('🔗') + ' ' + translate['Links'] menuNewPost = \ - htmlHideFromScreenReader('➕ī¸') + translate['Create a new post'] + htmlHideFromScreenReader('➕') + ' ' + \ + translate['Create a new post'] + menuModeration = \ + htmlHideFromScreenReader('⚡ī¸') + ' ' + \ + translate['Mod'] navLinks = { menuProfile: '/users/' + nickname, menuInbox: usersPath + '/inbox#timeline', @@ -424,7 +431,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, menuLinks: '#links' } if moderator: - navLinks[translate['Mod']] = usersPath + '/moderation' + navLinks[menuModeration] = usersPath + '/moderation' tlStr += htmlKeyboardNavigation(textModeBanner, navLinks, usersPath, translate, followApprovals)