diff --git a/webinterface.py b/webinterface.py index 00027601..b78de20f 100644 --- a/webinterface.py +++ b/webinterface.py @@ -6042,25 +6042,29 @@ def getTimelineButtonHeader(defaultTimeline: str, inboxButton+'">' + translate['Inbox'] + \ '\n' - # typically the blogs button - # but may change if this is a blogging oriented instance - if defaultTimeline != 'tlblogs': - if not minimal: - titleStr = translate['Blogs'] - if defaultTimeline == 'tlnews': - titleStr = translate['Article'] - tlStr += \ - ' \n' - else: - if not minimal: - tlStr += \ - ' \n' + isFeaturesTimeline = \ + defaultTimeline == 'tlnews' and boxName != 'tlnews' + + if not isFeaturesTimeline: + # typically the blogs button + # but may change if this is a blogging oriented instance + if defaultTimeline != 'tlblogs': + if not minimal and not isFeaturesTimeline: + titleStr = translate['Blogs'] + if defaultTimeline == 'tlnews': + titleStr = translate['Article'] + tlStr += \ + ' \n' + else: + if not minimal: + tlStr += \ + ' \n' # typically the news button # but may change if this is a news oriented instance @@ -6161,24 +6165,25 @@ def getTimelineButtonHeader(defaultTimeline: str, print('TIMELINE TIMING ' + boxName + ' 5 = ' + str(timeDiff)) # the calendar button - calendarAltText = translate['Calendar'] - if newCalendarEvent: - # indicate that the calendar icon is highlighted - calendarAltText = '*' + calendarAltText + '*' - if not iconsAsButtons: - tlStr += \ - ' | ' + calendarAltText + \
-            '\n' - else: - tlStr += \ - ' \n' + if not isFeaturesTimeline: + calendarAltText = translate['Calendar'] + if newCalendarEvent: + # indicate that the calendar icon is highlighted + calendarAltText = '*' + calendarAltText + '*' + if not iconsAsButtons: + tlStr += \ + ' | ' + calendarAltText + \
+                '\n' + else: + tlStr += \ + ' \n' if not newsHeader: # the show/hide button, for a simpler header appearance