Move space

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

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)