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

Remove newlines

merge-requests/30/head
Bob Mottram 2020-11-02 19:42:21 +00:00
parent 8a69942460
commit 6b44651a4a
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
webinterface.py
View File

@ -6227,25 +6227,25 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlmedia"><button class="' + \ '/tlmedia"><button class="' + \
mediaButton + '"><span>' + translate['Media'] + \ mediaButton + '"><span>' + translate['Media'] + \
'</span></button></a>\n' '</span></button></a>'
elif defaultTimeline == 'tlblogs': elif defaultTimeline == 'tlblogs':
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlblogs"><button class="' + \ '/tlblogs"><button class="' + \
blogsButton + '"><span>' + translate['Blogs'] + \ blogsButton + '"><span>' + translate['Blogs'] + \
'</span></button></a>\n' '</span></button></a>'
elif defaultTimeline == 'tlnews': elif defaultTimeline == 'tlnews':
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlnews"><button class="' + \ '/tlnews"><button class="' + \
newsButton + '"><span>' + translate['Features'] + \ newsButton + '"><span>' + translate['Features'] + \
'</span></button></a>\n' '</span></button></a>'
else: else:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/inbox"><button class="' + \ '/inbox"><button class="' + \
inboxButton + '"><span>' + \ inboxButton + '"><span>' + \
translate['Inbox'] + '</span></button></a>\n' translate['Inbox'] + '</span></button></a>'
# if this is a news instance and we are viewing the news timeline # if this is a news instance and we are viewing the news timeline
newsHeader = False newsHeader = False
@ -6257,13 +6257,13 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/dm"><button class="' + dmButton + \ '/dm"><button class="' + dmButton + \
'"><span>' + htmlHighlightLabel(translate['DM'], newDM) + \ '"><span>' + htmlHighlightLabel(translate['DM'], newDM) + \
'</span></button></a>\n' '</span></button></a>'
tlStr += \ tlStr += \
' <a href="' + usersPath + '/tlreplies"><button class="' + \ ' <a href="' + usersPath + '/tlreplies"><button class="' + \
repliesButton + '"><span>' + \ repliesButton + '"><span>' + \
htmlHighlightLabel(translate['Replies'], newReply) + \ htmlHighlightLabel(translate['Replies'], newReply) + \
'</span></button></a>\n' '</span></button></a>'
# typically the media button # typically the media button
if defaultTimeline != 'tlmedia': if defaultTimeline != 'tlmedia':
@ -6272,14 +6272,14 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlmedia"><button class="' + \ '/tlmedia"><button class="' + \
mediaButton + '"><span>' + translate['Media'] + \ mediaButton + '"><span>' + translate['Media'] + \
'</span></button></a>\n' '</span></button></a>'
else: else:
if not minimal: if not minimal:
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>'
isFeaturesTimeline = \ isFeaturesTimeline = \
defaultTimeline == 'tlnews' and boxName == 'tlnews' defaultTimeline == 'tlnews' and boxName == 'tlnews'
@ -6296,14 +6296,14 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlblogs"><button class="' + \ '/tlblogs"><button class="' + \
blogsButton + '"><span>' + titleStr + \ blogsButton + '"><span>' + titleStr + \
'</span></button></a>\n' '</span></button></a>'
else: else:
if not minimal: if not minimal:
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>'
# typically the news button # typically the news button
# but may change if this is a news oriented instance # but may change if this is a news oriented instance
@ -6312,14 +6312,14 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/tlnews"><button class="' + \ '/tlnews"><button class="' + \
newsButton + '"><span>' + translate['News'] + \ newsButton + '"><span>' + translate['News'] + \
'</span></button></a>\n' '</span></button></a>'
else: else:
if not newsHeader: 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>'
if not newsHeader: if not newsHeader:
# button for the outbox # button for the outbox
@ -6327,7 +6327,7 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/outbox"><button class="' + \ '/outbox"><button class="' + \
sentButton + '"><span>' + translate['Outbox'] + \ sentButton + '"><span>' + translate['Outbox'] + \
'</span></button></a>\n' '</span></button></a>'
# add other buttons # add other buttons
tlStr += \ tlStr += \
@ -6346,14 +6346,14 @@ def headerButtonsTimeline(defaultTimeline: str,
str(now.year) + '?month=' + str(now.month) + \ str(now.year) + '?month=' + str(now.month) + \
'?day=' + str(now.day) + '">' + \ '?day=' + str(now.day) + '">' + \
'<button class="buttonevent">' + \ '<button class="buttonevent">' + \
translate['Happening Today'] + '</button></a>\n' translate['Happening Today'] + '</button></a>'
else: else:
tlStr += \ tlStr += \
' <a href="' + usersPath + '/calendar?year=' + \ ' <a href="' + usersPath + '/calendar?year=' + \
str(now.year) + '?month=' + str(now.month) + \ str(now.year) + '?month=' + str(now.month) + \
'?day=' + str(now.day) + '">' + \ '?day=' + str(now.day) + '">' + \
'<button class="button">' + \ '<button class="button">' + \
translate['Happening Today'] + '</button></a>\n' translate['Happening Today'] + '</button></a>'
# happening this week button # happening this week button
if thisWeeksEventsCheck(baseDir, nickname, domain): if thisWeeksEventsCheck(baseDir, nickname, domain):
@ -6361,12 +6361,12 @@ def headerButtonsTimeline(defaultTimeline: str,
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/calendar"><button class="buttonevent">' + \ '/calendar"><button class="buttonevent">' + \
translate['Happening This Week'] + '</button></a>\n' translate['Happening This Week'] + '</button></a>'
else: else:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/calendar"><button class="button">' + \ '/calendar"><button class="button">' + \
translate['Happening This Week'] + '</button></a>\n' translate['Happening This Week'] + '</button></a>'
else: else:
# happening this week button # happening this week button
if thisWeeksEventsCheck(baseDir, nickname, domain): if thisWeeksEventsCheck(baseDir, nickname, domain):
@ -6374,12 +6374,12 @@ def headerButtonsTimeline(defaultTimeline: str,
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/calendar"><button class="buttonevent">' + \ '/calendar"><button class="buttonevent">' + \
translate['Happening This Week'] + '</button></a>\n' translate['Happening This Week'] + '</button></a>'
else: else:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/calendar"><button class="button">' + \ '/calendar"><button class="button">' + \
translate['Happening This Week'] + '</button></a>\n' translate['Happening This Week'] + '</button></a>'
if not newsHeader: if not newsHeader:
if not iconsAsButtons: if not iconsAsButtons:
@ -6390,13 +6390,13 @@ def headerButtonsTimeline(defaultTimeline: str,
iconsDir + '/search.png" title="' + \ iconsDir + '/search.png" title="' + \
translate['Search and follow'] + '" alt="| ' + \ translate['Search and follow'] + '" alt="| ' + \
translate['Search and follow'] + \ translate['Search and follow'] + \
'" class="timelineicon"/></a>\n' '" class="timelineicon"/></a>'
else: else:
tlStr += \ tlStr += \
' <a href="' + usersPath + \ ' <a href="' + usersPath + \
'/search"><button class="button">' + \ '/search"><button class="button">' + \
'<span>' + translate['Search'] + \ '<span>' + translate['Search'] + \
'</span></button></a>\n' '</span></button></a>'
# benchmark 5 # benchmark 5
timeDiff = int((time.time() - timelineStartTime) * 1000) timeDiff = int((time.time() - timelineStartTime) * 1000)
@ -6422,7 +6422,7 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + calendarPath + \ ' <a href="' + usersPath + calendarPath + \
'"><button class="button">' + \ '"><button class="button">' + \
'<span>' + translate['Calendar'] + \ '<span>' + translate['Calendar'] + \
'</span></button></a>\n' '</span></button></a>'
if not newsHeader: if not newsHeader:
# the show/hide button, for a simpler header appearance # the show/hide button, for a simpler header appearance
@ -6439,13 +6439,13 @@ def headerButtonsTimeline(defaultTimeline: str,
' <a href="' + usersPath + '/minimal' + \ ' <a href="' + usersPath + '/minimal' + \
'"><button class="button">' + \ '"><button class="button">' + \
'<span>' + translate['Expand'] + \ '<span>' + translate['Expand'] + \
'</span></button></a>\n' '</span></button></a>'
if newsHeader: if newsHeader:
tlStr += \ tlStr += \
' <a href="' + usersPath + '/inbox">' + \ ' <a href="' + usersPath + '/inbox">' + \
'<button class="button">' + \ '<button class="button">' + \
'<span>' + translate['User'] + '</span></button></a>\n' '<span>' + translate['User'] + '</span></button></a>'
# the newswire button to show right column links # the newswire button to show right column links
if not iconsAsButtons: if not iconsAsButtons: