diff --git a/webinterface.py b/webinterface.py
index 0b3c5501d..afe1a976a 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -3298,55 +3298,6 @@ def htmlSharesTimeline(translate: {}, pageNumber: int, itemsPerPage: int,
return timelineStr
-def headerButtonsFrontScreen(translate: {},
- nickname: str, boxName: str,
- authorized: bool) -> str:
- """Returns the header buttons for the front page of a news instance
- """
- headerStr = ' \n'
- return headerStr
-
-
def htmlProfile(cssCache: {}, iconsAsButtons: bool,
defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int,
@@ -6060,35 +6011,84 @@ def getBannerFile(baseDir: str, nickname: str, domain: str) -> (str, str):
return bannerFile, bannerFilename
-def getTimelineButtonHeader(defaultTimeline: str,
- boxName: str,
- pageNumber: int,
- translate: {},
- usersPath: str,
- mediaButton: str,
- blogsButton: str,
- newsButton: str,
- inboxButton: str,
- dmButton: str,
- newDM: str,
- repliesButton: str,
- newReply: str,
- minimal: bool,
- sentButton: str,
- sharesButtonStr: str,
- bookmarksButtonStr: str,
- eventsButtonStr: str,
- moderationButtonStr: str,
- newPostButtonStr: str,
- baseDir: str,
- nickname: str, domain: str,
- iconsDir: str,
- timelineStartTime,
- newCalendarEvent: bool,
- calendarPath: str,
- calendarImage: str,
- followApprovals: str,
- iconsAsButtons: bool) -> str:
+def headerButtonsFrontScreen(translate: {},
+ nickname: str, boxName: str,
+ authorized: bool) -> str:
+ """Returns the header buttons for the front page of a news instance
+ """
+ headerStr = ' \n'
+ return headerStr
+
+
+def headerButtonsTimeline(defaultTimeline: str,
+ boxName: str,
+ pageNumber: int,
+ translate: {},
+ usersPath: str,
+ mediaButton: str,
+ blogsButton: str,
+ newsButton: str,
+ inboxButton: str,
+ dmButton: str,
+ newDM: str,
+ repliesButton: str,
+ newReply: str,
+ minimal: bool,
+ sentButton: str,
+ sharesButtonStr: str,
+ bookmarksButtonStr: str,
+ eventsButtonStr: str,
+ moderationButtonStr: str,
+ newPostButtonStr: str,
+ baseDir: str,
+ nickname: str, domain: str,
+ iconsDir: str,
+ timelineStartTime,
+ newCalendarEvent: bool,
+ calendarPath: str,
+ calendarImage: str,
+ followApprovals: str,
+ iconsAsButtons: bool) -> str:
"""Returns the header at the top of the timeline, containing
buttons for inbox, outbox, search, calendar, etc
"""
@@ -6695,18 +6695,18 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
if fullWidthTimelineButtonHeader:
tlStr += \
- getTimelineButtonHeader(defaultTimeline, boxName, pageNumber,
- translate, usersPath, mediaButton,
- blogsButton, newsButton, inboxButton,
- dmButton, newDM, repliesButton,
- newReply, minimal, sentButton,
- sharesButtonStr, bookmarksButtonStr,
- eventsButtonStr, moderationButtonStr,
- newPostButtonStr, baseDir, nickname,
- domain, iconsDir, timelineStartTime,
- newCalendarEvent, calendarPath,
- calendarImage, followApprovals,
- iconsAsButtons)
+ headerButtonsTimeline(defaultTimeline, boxName, pageNumber,
+ translate, usersPath, mediaButton,
+ blogsButton, newsButton, inboxButton,
+ dmButton, newDM, repliesButton,
+ newReply, minimal, sentButton,
+ sharesButtonStr, bookmarksButtonStr,
+ eventsButtonStr, moderationButtonStr,
+ newPostButtonStr, baseDir, nickname,
+ domain, iconsDir, timelineStartTime,
+ newCalendarEvent, calendarPath,
+ calendarImage, followApprovals,
+ iconsAsButtons)
# start the timeline
tlStr += '\n'
@@ -6736,18 +6736,18 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
if not fullWidthTimelineButtonHeader:
tlStr += \
- getTimelineButtonHeader(defaultTimeline, boxName, pageNumber,
- translate, usersPath, mediaButton,
- blogsButton, newsButton, inboxButton,
- dmButton, newDM, repliesButton,
- newReply, minimal, sentButton,
- sharesButtonStr, bookmarksButtonStr,
- eventsButtonStr, moderationButtonStr,
- newPostButtonStr, baseDir, nickname,
- domain, iconsDir, timelineStartTime,
- newCalendarEvent, calendarPath,
- calendarImage, followApprovals,
- iconsAsButtons)
+ headerButtonsTimeline(defaultTimeline, boxName, pageNumber,
+ translate, usersPath, mediaButton,
+ blogsButton, newsButton, inboxButton,
+ dmButton, newDM, repliesButton,
+ newReply, minimal, sentButton,
+ sharesButtonStr, bookmarksButtonStr,
+ eventsButtonStr, moderationButtonStr,
+ newPostButtonStr, baseDir, nickname,
+ domain, iconsDir, timelineStartTime,
+ newCalendarEvent, calendarPath,
+ calendarImage, followApprovals,
+ iconsAsButtons)
# second row of buttons for moderator actions
if moderator and boxName == 'moderation':