Move space

merge-requests/30/head
Bob Mottram 2021-02-06 10:46:03 +00:00
parent ca77dd959a
commit 2afe588a6a
2 changed files with 35 additions and 25 deletions

View File

@ -714,21 +714,22 @@ def htmlProfile(rssIconAtTop: bool,
userPathStr = '/users/' + nickname userPathStr = '/users/' + nickname
deft = defaultTimeline deft = defaultTimeline
menuTimeline = \ menuTimeline = \
htmlHideFromScreenReader('🏠 ') + translate['Switch to timeline view'] htmlHideFromScreenReader('🏠') + ' ' + \
translate['Switch to timeline view']
menuEdit = \ menuEdit = \
htmlHideFromScreenReader(' ') + translate['Edit'] htmlHideFromScreenReader('') + ' ' + translate['Edit']
menuFollowing = \ menuFollowing = \
htmlHideFromScreenReader('👥 ') + translate['Following'] htmlHideFromScreenReader('👥') + ' ' + translate['Following']
menuFollowers = \ menuFollowers = \
htmlHideFromScreenReader('👪 ') + translate['Followers'] htmlHideFromScreenReader('👪') + ' ' + translate['Followers']
menuRoles = \ menuRoles = \
htmlHideFromScreenReader('🤚 ') + translate['Roles'] htmlHideFromScreenReader('🤚') + ' ' + translate['Roles']
menuSkills = \ menuSkills = \
htmlHideFromScreenReader('🛠') + translate['Skills'] htmlHideFromScreenReader('🛠') + ' ' + translate['Skills']
menuShares = \ menuShares = \
htmlHideFromScreenReader('🤝') + translate['Shares'] htmlHideFromScreenReader('🤝') + ' ' + translate['Shares']
menuLogout = \ menuLogout = \
htmlHideFromScreenReader('') + translate['Logout'] htmlHideFromScreenReader('') + ' ' + translate['Logout']
navLinks = { navLinks = {
menuTimeline: userPathStr + '/' + deft, menuTimeline: userPathStr + '/' + deft,
menuEdit: userPathStr + '/editprofile', menuEdit: userPathStr + '/editprofile',
@ -1365,9 +1366,11 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
userPathStr = '/users/' + nickname userPathStr = '/users/' + nickname
userTimalineStr = '/users/' + nickname + '/' + defaultTimeline userTimalineStr = '/users/' + nickname + '/' + defaultTimeline
menuTimeline = \ menuTimeline = \
htmlHideFromScreenReader('🏠 ') + translate['Switch to timeline view'] htmlHideFromScreenReader('🏠') + ' ' + \
translate['Switch to timeline view']
menuProfile = \ menuProfile = \
htmlHideFromScreenReader('👤 ') + translate['Switch to profile view'] htmlHideFromScreenReader('👤') + ' ' + \
translate['Switch to profile view']
navLinks = { navLinks = {
menuProfile: userPathStr, menuProfile: userPathStr,
menuTimeline: userTimalineStr menuTimeline: userTimalineStr

View File

@ -380,33 +380,40 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
if newShare: if newShare:
sharesStr = '*' + sharesStr + '*' sharesStr = '*' + sharesStr + '*'
menuProfile = \ menuProfile = \
htmlHideFromScreenReader('👤 ') + translate['Switch to profile view'] htmlHideFromScreenReader('👤') + ' ' + \
translate['Switch to profile view']
menuInbox = \ menuInbox = \
htmlHideFromScreenReader('📥 ') + translate['Inbox'] htmlHideFromScreenReader('📥') + ' ' + translate['Inbox']
menuOutbox = \ menuOutbox = \
htmlHideFromScreenReader('📤 ') + translate['Outbox'] htmlHideFromScreenReader('📤') + ' ' + translate['Outbox']
menuSearch = \ menuSearch = \
htmlHideFromScreenReader('🔍 ') + translate['Search and follow'] htmlHideFromScreenReader('🔍') + ' ' + \
translate['Search and follow']
menuCalendar = \ menuCalendar = \
htmlHideFromScreenReader('📅 ') + calendarStr htmlHideFromScreenReader('📅') + ' ' + calendarStr
menuDM = \ menuDM = \
htmlHideFromScreenReader(' ') + dmStr htmlHideFromScreenReader('') + ' ' + dmStr
menuReplies = \ menuReplies = \
htmlHideFromScreenReader('') + repliesStr htmlHideFromScreenReader('') + ' ' + repliesStr
menuBookmarks = \ menuBookmarks = \
htmlHideFromScreenReader('🔖 ') + translate['Bookmarks'] htmlHideFromScreenReader('🔖') + ' ' + \
translate['Bookmarks']
menuShares = \ menuShares = \
htmlHideFromScreenReader('🤝') + sharesStr htmlHideFromScreenReader('🤝') + ' ' + sharesStr
menuEvents = \ menuEvents = \
htmlHideFromScreenReader('🎫') + translate['Events'] htmlHideFromScreenReader('🎫') + ' ' + translate['Events']
menuBlogs = \ menuBlogs = \
htmlHideFromScreenReader('📝') + translate['Blogs'] htmlHideFromScreenReader('📝') + ' ' + translate['Blogs']
menuNewswire = \ menuNewswire = \
htmlHideFromScreenReader('📰') + translate['Newswire'] htmlHideFromScreenReader('📰') + ' ' + translate['Newswire']
menuLinks = \ menuLinks = \
htmlHideFromScreenReader('🔗') + translate['Links'] htmlHideFromScreenReader('🔗') + ' ' + translate['Links']
menuNewPost = \ menuNewPost = \
htmlHideFromScreenReader('') + translate['Create a new post'] htmlHideFromScreenReader('') + ' ' + \
translate['Create a new post']
menuModeration = \
htmlHideFromScreenReader('⚡️') + ' ' + \
translate['Mod']
navLinks = { navLinks = {
menuProfile: '/users/' + nickname, menuProfile: '/users/' + nickname,
menuInbox: usersPath + '/inbox#timeline', menuInbox: usersPath + '/inbox#timeline',
@ -424,7 +431,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
menuLinks: '#links' menuLinks: '#links'
} }
if moderator: if moderator:
navLinks[translate['Mod']] = usersPath + '/moderation' navLinks[menuModeration] = usersPath + '/moderation'
tlStr += htmlKeyboardNavigation(textModeBanner, navLinks, tlStr += htmlKeyboardNavigation(textModeBanner, navLinks,
usersPath, translate, followApprovals) usersPath, translate, followApprovals)