indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

News header

merge-requests/30/head
Bob Mottram 2020-10-26 22:00:54 +00:00
parent 90e5c140cf
commit 3d879081f7
1 changed files with 71 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webinterface.py
View File

@ -5996,8 +5996,15 @@ def getTimelineButtonHeader(defaultTimeline: str,
inboxButton + '"><span>' + \ inboxButton + '"><span>' + \
translate['Inbox'] + '</span></button></a>\n' translate['Inbox'] + '</span></button></a>\n'
# if this is a news instance and we are viewing the news timeline
newsHeader = False
if defaultTimeline == 'tlnews' and boxName == 'tlnews':
newsHeader = True
if not newsHeader:
tlStr += \ tlStr += \
' <a href="' + usersPath + '/dm"><button class="' + dmButton + \ ' <a href="' + usersPath + \
'/dm"><button class="' + dmButton + \
'"><span>' + htmlHighlightLabel(translate['DM'], newDM) + \ '"><span>' + htmlHighlightLabel(translate['DM'], newDM) + \
'</span></button></a>\n' '</span></button></a>\n'
@ -6009,7 +6016,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
# typically the media button # typically the media button
if defaultTimeline != 'tlmedia': if defaultTimeline != 'tlmedia':
if not minimal: if not minimal and not newsHeader:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlmedia"><button class="' + \ '/tlmedia"><button class="' + \
@ -6027,6 +6034,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
# but may change if this is a blogging oriented instance # but may change if this is a blogging oriented instance
if defaultTimeline != 'tlblogs': if defaultTimeline != 'tlblogs':
if not minimal or defaultTimeline == 'tlnews': if not minimal or defaultTimeline == 'tlnews':
if not newsHeader:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlblogs"><button class="' + \ '/tlblogs"><button class="' + \
@ -6049,12 +6057,14 @@ def getTimelineButtonHeader(defaultTimeline: str,
newsButton + '"><span>' + translate['News'] + \ newsButton + '"><span>' + translate['News'] + \
'</span></button></a>\n' '</span></button></a>\n'
else: else:
if not newsHeader:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/inbox"><button class="' + \ '/inbox"><button class="' + \
inboxButton + '"><span>' + translate['Inbox'] + \ inboxButton + '"><span>' + translate['Inbox'] + \
'</span></button></a>\n' '</span></button></a>\n'
if not newsHeader:
# button for the outbox # button for the outbox
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
@ -6114,6 +6124,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
'/calendar"><button class="button">' + \ '/calendar"><button class="button">' + \
translate['Happening This Week'] + '</button></a>\n' translate['Happening This Week'] + '</button></a>\n'
if not newsHeader:
if not iconsAsButtons: if not iconsAsButtons:
# the search button # the search button
tlStr += \ tlStr += \
@ -6154,6 +6165,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
'<span>' + translate['Calendar'] + \ '<span>' + translate['Calendar'] + \
'</span></button></a>\n' '</span></button></a>\n'
if not newsHeader:
# the show/hide button, for a simpler header appearance # the show/hide button, for a simpler header appearance
if not iconsAsButtons: if not iconsAsButtons:
tlStr += \ tlStr += \
@ -6204,6 +6216,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
'<span>' + translate['Links'] + \ '<span>' + translate['Links'] + \
'</span></button></a>\n' '</span></button></a>\n'
if not newsHeader:
tlStr += followApprovals tlStr += followApprovals
# end of the button header with inbox, outbox, etc # end of the button header with inbox, outbox, etc
tlStr += ' </div>\n' tlStr += ' </div>\n'