diff --git a/webapp_timeline.py b/webapp_timeline.py index 471c1ede6..d6fd2afde 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -93,6 +93,102 @@ def _getHelpForTimeline(baseDir: str, boxName: str) -> str: return '' +def _htmlTimelineNewPost(manuallyApproveFollowers: bool, + boxName: str, iconsAsButtons: bool, + usersPath: str, translate: {}) -> str: + """Returns html for the new post button + """ + newPostButtonStr = '' + if boxName == 'dm': + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + translate['Create a new DM'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + elif (boxName == 'tlblogs' or + boxName == 'tlnews' or + boxName == 'tlfeatures'): + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + \ + translate['Create a new post'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + elif boxName == 'tlevents': + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + \ + translate['Create a new event'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + elif boxName == 'tlshares': + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + \ + translate['Create a new shared item'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + else: + if not manuallyApproveFollowers: + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + \ + translate['Create a new post'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + else: + if not iconsAsButtons: + newPostButtonStr += \ + '| ' + translate['Create a new post'] + \ + '\n' + else: + newPostButtonStr += \ + '' + \ + '' + return newPostButtonStr + + def htmlTimeline(cssCache: {}, defaultTimeline: str, recentPostsCache: {}, maxRecentPosts: int, translate: {}, pageNumber: int, @@ -331,93 +427,9 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, newPostButtonStr += '
' # what screen to go to when a new post is created - if boxName == 'dm': - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + translate['Create a new DM'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' - elif (boxName == 'tlblogs' or - boxName == 'tlnews' or - boxName == 'tlfeatures'): - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + \ - translate['Create a new post'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' - elif boxName == 'tlevents': - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + \ - translate['Create a new event'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' - elif boxName == 'tlshares': - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + \ - translate['Create a new shared item'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' - else: - if not manuallyApproveFollowers: - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + \ - translate['Create a new post'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' - else: - if not iconsAsButtons: - newPostButtonStr += \ - '| ' + translate['Create a new post'] + \ - '\n' - else: - newPostButtonStr += \ - '' + \ - '' + newPostButtonStr += \ + _htmlTimelineNewPost(manuallyApproveFollowers, boxName, + iconsAsButtons, usersPath, translate) # keyboard navigation calendarStr = translate['Calendar']