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

Remove icons path argument

merge-requests/30/head
Bob Mottram 2020-12-09 13:31:54 +00:00
parent ffdc49a56c
commit 14d7985353
12 changed files with 66 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inbox.py
View File

@ -172,7 +172,7 @@ def inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
if boxname != 'tlevents' and boxname != 'outbox': if boxname != 'tlevents' and boxname != 'outbox':
boxname = 'inbox' boxname = 'inbox'
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
'icons', translate, pageNumber, translate, pageNumber,
baseDir, session, cachedWebfingers, personCache, baseDir, session, cachedWebfingers, personCache,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
avatarUrl, True, allowDeletion, avatarUrl, True, allowDeletion,

6
webapp_column_left.py
View File

@ -67,7 +67,7 @@ def getLeftColumnShares(baseDir: str,
def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
httpPrefix: str, translate: {}, httpPrefix: str, translate: {},
iconsPath: str, editor: bool, editor: bool,
showBackButton: bool, timelinePath: str, showBackButton: bool, timelinePath: str,
rssIconAtTop: bool, showHeaderImage: bool, rssIconAtTop: bool, showHeaderImage: bool,
frontPage: bool) -> str: frontPage: bool) -> str:
@ -284,12 +284,12 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
htmlStr += '<center>' + \ htmlStr += '<center>' + \
headerButtonsFrontScreen(translate, nickname, headerButtonsFrontScreen(translate, nickname,
'links', authorized, 'links', authorized,
iconsAsButtons, 'icons') + '</center>' iconsAsButtons) + '</center>'
if linksExist(baseDir): if linksExist(baseDir):
htmlStr += \ htmlStr += \
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, httpPrefix, translate,
'icons', editor, editor,
False, timelinePath, False, timelinePath,
rssIconAtTop, False, False) rssIconAtTop, False, False)
else: else:

10
webapp_column_right.py
View File

@ -43,7 +43,7 @@ def votesIndicator(totalVotes: int, positiveVoting: bool) -> str:
def getRightColumnContent(baseDir: str, nickname: str, domainFull: str, def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
httpPrefix: str, translate: {}, httpPrefix: str, translate: {},
iconsPath: str, moderator: bool, editor: bool, moderator: bool, editor: bool,
newswire: {}, positiveVoting: bool, newswire: {}, positiveVoting: bool,
showBackButton: bool, timelinePath: str, showBackButton: bool, timelinePath: str,
showPublishButton: bool, showPublishButton: bool,
@ -196,7 +196,7 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
# show the newswire lines # show the newswire lines
newswireContentStr = \ newswireContentStr = \
htmlNewswire(baseDir, newswire, nickname, moderator, translate, htmlNewswire(baseDir, newswire, nickname, moderator, translate,
positiveVoting, 'icons') positiveVoting)
htmlStr += newswireContentStr htmlStr += newswireContentStr
# show the rss icon at the bottom, typically on the right hand side # show the rss icon at the bottom, typically on the right hand side
@ -206,7 +206,7 @@ def getRightColumnContent(baseDir: str, nickname: str, domainFull: str,
def htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool, def htmlNewswire(baseDir: str, newswire: {}, nickname: str, moderator: bool,
translate: {}, positiveVoting: bool, iconsPath: str) -> str: translate: {}, positiveVoting: bool) -> str:
"""Converts a newswire dict into html """Converts a newswire dict into html
""" """
separatorStr = htmlPostSeparator(baseDir, 'right') separatorStr = htmlPostSeparator(baseDir, 'right')
@ -444,12 +444,12 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
htmlStr += '<center>' + \ htmlStr += '<center>' + \
headerButtonsFrontScreen(translate, nickname, headerButtonsFrontScreen(translate, nickname,
'newswire', authorized, 'newswire', authorized,
iconsAsButtons, 'icons') + '</center>' iconsAsButtons) + '</center>'
if newswire: if newswire:
htmlStr += \ htmlStr += \
getRightColumnContent(baseDir, nickname, domainFull, getRightColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, httpPrefix, translate,
'icons', moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, timelinePath, showPublishButton, False, timelinePath, showPublishButton,
showPublishAsIcon, rssIconAtTop, False, showPublishAsIcon, rssIconAtTop, False,

2
webapp_confirm.py
View File

@ -61,7 +61,7 @@ def htmlConfirmDelete(cssCache: {},
deletePostStr = htmlHeaderWithExternalStyle(cssFilename) deletePostStr = htmlHeaderWithExternalStyle(cssFilename)
deletePostStr += \ deletePostStr += \
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
'icons', translate, pageNumber, translate, pageNumber,
baseDir, session, wfRequest, personCache, baseDir, session, wfRequest, personCache,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
None, True, False, None, True, False,

2
webapp_create_post.py
View File

@ -60,7 +60,6 @@ def htmlFollowingDataList(baseDir: str, nickname: str,
def htmlNewPostDropDown(scopeIcon: str, scopeDescription: str, def htmlNewPostDropDown(scopeIcon: str, scopeDescription: str,
replyStr: str, replyStr: str,
translate: {}, translate: {},
iconsPath: str,
showPublicOnDropdown: bool, showPublicOnDropdown: bool,
defaultTimeline: str, defaultTimeline: str,
pathBase: str, pathBase: str,
@ -619,7 +618,6 @@ def htmlNewPost(cssCache: {}, mediaInstance: bool, translate: {},
htmlNewPostDropDown(scopeIcon, scopeDescription, htmlNewPostDropDown(scopeIcon, scopeDescription,
replyStr, replyStr,
translate, translate,
'icons',
showPublicOnDropdown, showPublicOnDropdown,
defaultTimeline, defaultTimeline,
pathBase, pathBase,

10
webapp_frontscreen.py
View File

@ -55,7 +55,7 @@ def htmlFrontScreenPosts(recentPostsCache: {}, maxRecentPosts: int,
postStr = \ postStr = \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, item, nickname, domain, port, item,
@ -101,7 +101,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
loginButton = headerButtonsFrontScreen(translate, nickname, loginButton = headerButtonsFrontScreen(translate, nickname,
'features', authorized, 'features', authorized,
iconsAsButtons, 'icons') iconsAsButtons)
# If this is the news account then show a different banner # If this is the news account then show a different banner
bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain) bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain)
@ -123,8 +123,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
profileHeaderStr += \ profileHeaderStr += \
getLeftColumnContent(baseDir, 'news', domainFull, getLeftColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
'icons', False, False, False, None, rssIconAtTop, True,
False, None, rssIconAtTop, True,
True) True)
profileHeaderStr += ' </td>\n' profileHeaderStr += ' </td>\n'
profileHeaderStr += ' <td valign="top" class="col-center">\n' profileHeaderStr += ' <td valign="top" class="col-center">\n'
@ -154,8 +153,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
profileFooterStr += \ profileFooterStr += \
getRightColumnContent(baseDir, 'news', domainFull, getRightColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
'icons', False, False, False, False, newswire, False,
newswire, False,
False, None, False, False, False, None, False, False,
False, True, authorized, True) False, True, authorized, True)
profileFooterStr += ' </td>\n' profileFooterStr += ' </td>\n'

1
webapp_headerbuttons.py
View File

@ -38,7 +38,6 @@ def headerButtonsTimeline(defaultTimeline: str,
newPostButtonStr: str, newPostButtonStr: str,
baseDir: str, baseDir: str,
nickname: str, domain: str, nickname: str, domain: str,
iconsPath: str,
timelineStartTime, timelineStartTime,
newCalendarEvent: bool, newCalendarEvent: bool,
calendarPath: str, calendarPath: str,

97
webapp_post.py
View File

@ -201,7 +201,7 @@ def getAvatarImageUrl(session,
return avatarUrl return avatarUrl
def getBrokenLinkSubstitute(iconsPath: str) -> str: def getBrokenLinkSubstitute() -> str:
"""Returns html used to show a default image if the link to """Returns html used to show a default image if the link to
an image is broken an image is broken
""" """
@ -213,8 +213,7 @@ def getAvatarImageHtml(showAvatarOptions: bool,
nickname: str, domainFull: str, nickname: str, domainFull: str,
avatarUrl: str, postActor: str, avatarUrl: str, postActor: str,
translate: {}, avatarPosition: str, translate: {}, avatarPosition: str,
pageNumber: int, messageIdStr: str, pageNumber: int, messageIdStr: str) -> str:
iconsPath: str) -> str:
"""Get html for the avatar image """Get html for the avatar image
""" """
avatarLink = '' avatarLink = ''
@ -223,7 +222,7 @@ def getAvatarImageHtml(showAvatarOptions: bool,
avatarLink += \ avatarLink += \
' <img loading="lazy" src="' + avatarUrl + '" title="' + \ ' <img loading="lazy" src="' + avatarUrl + '" title="' + \
translate['Show profile'] + '" alt=" "' + avatarPosition + \ translate['Show profile'] + '" alt=" "' + avatarPosition + \
getBrokenLinkSubstitute('icons') + '/></a>\n' getBrokenLinkSubstitute() + '/></a>\n'
if showAvatarOptions and \ if showAvatarOptions and \
domainFull + '/users/' + nickname not in postActor: domainFull + '/users/' + nickname not in postActor:
@ -236,21 +235,21 @@ def getAvatarImageHtml(showAvatarOptions: bool,
' <img loading="lazy" title="' + \ ' <img loading="lazy" title="' + \
translate['Show options for this person'] + \ translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + \ '" src="' + avatarUrl + '" ' + avatarPosition + \
getBrokenLinkSubstitute('icons') + '/></a>\n' getBrokenLinkSubstitute() + '/></a>\n'
else: else:
# don't link to the person options for the news account # don't link to the person options for the news account
avatarLink += \ avatarLink += \
' <img loading="lazy" title="' + \ ' <img loading="lazy" title="' + \
translate['Show options for this person'] + \ translate['Show options for this person'] + \
'" src="' + avatarUrl + '" ' + avatarPosition + \ '" src="' + avatarUrl + '" ' + avatarPosition + \
getBrokenLinkSubstitute('icons') + '/>\n' getBrokenLinkSubstitute() + '/>\n'
return avatarLink.strip() return avatarLink.strip()
def getReplyIconHtml(nickname: str, isPublicRepeat: bool, def getReplyIconHtml(nickname: str, isPublicRepeat: bool,
showIcons: bool, commentsEnabled: bool, showIcons: bool, commentsEnabled: bool,
postJsonObject: {}, pageNumberParam: str, postJsonObject: {}, pageNumberParam: str,
iconsPath: str, translate: {}) -> str: translate: {}) -> str:
"""Returns html for the reply icon/button """Returns html for the reply icon/button
""" """
replyStr = '' replyStr = ''
@ -308,7 +307,7 @@ def getReplyIconHtml(nickname: str, isPublicRepeat: bool,
def getEditIconHtml(baseDir: str, nickname: str, domainFull: str, def getEditIconHtml(baseDir: str, nickname: str, domainFull: str,
postJsonObject: {}, actorNickname: str, postJsonObject: {}, actorNickname: str,
translate: {}, iconsPath: str, isEvent: bool) -> str: translate: {}, isEvent: bool) -> str:
"""Returns html for the edit icon/button """Returns html for the edit icon/button
""" """
editStr = '' editStr = ''
@ -370,7 +369,7 @@ def getAnnounceIconHtml(nickname: str, domainFull: str,
translate: {}, translate: {},
pageNumberParam: str, pageNumberParam: str,
timelinePostBookmark: str, timelinePostBookmark: str,
boxName: str, iconsPath: str) -> str: boxName: str) -> str:
"""Returns html for announce icon/button """Returns html for announce icon/button
""" """
announceStr = '' announceStr = ''
@ -412,7 +411,7 @@ def getLikeIconHtml(nickname: str, domainFull: str,
postStartTime, postStartTime,
translate: {}, pageNumberParam: str, translate: {}, pageNumberParam: str,
timelinePostBookmark: str, timelinePostBookmark: str,
boxName: str, iconsPath: str) -> str: boxName: str) -> str:
"""Returns html for like icon/button """Returns html for like icon/button
""" """
likeStr = '' likeStr = ''
@ -469,8 +468,7 @@ def getBookmarkIconHtml(nickname: str, domainFull: str,
enableTimingLog: bool, enableTimingLog: bool,
postStartTime, boxName: str, postStartTime, boxName: str,
pageNumberParam: str, pageNumberParam: str,
timelinePostBookmark: str, timelinePostBookmark: str) -> str:
iconsPath: str) -> str:
"""Returns html for bookmark icon/button """Returns html for bookmark icon/button
""" """
bookmarkStr = '' bookmarkStr = ''
@ -507,7 +505,6 @@ def getMuteIconHtml(isMuted: bool,
nickname: str, domainFull: str, nickname: str, domainFull: str,
allowDeletion: bool, allowDeletion: bool,
pageNumberParam: str, pageNumberParam: str,
iconsPath: str,
boxName: str, boxName: str,
timelinePostBookmark: str, timelinePostBookmark: str,
translate: {}) -> str: translate: {}) -> str:
@ -552,7 +549,6 @@ def getDeleteIconHtml(nickname: str, domainFull: str,
messageId: str, messageId: str,
postJsonObject: {}, postJsonObject: {},
pageNumberParam: str, pageNumberParam: str,
iconsPath: str,
translate: {}) -> str: translate: {}) -> str:
"""Returns html for delete icon/button """Returns html for delete icon/button
""" """
@ -644,7 +640,7 @@ def getBlogCitationsHtml(boxName: str,
return citationsStr return citationsStr
def boostOwnTootHtml(translate: {}, iconsPath) -> str: def boostOwnTootHtml(translate: {}) -> str:
"""The html title for announcing your own post """The html title for announcing your own post
""" """
return ' <img loading="lazy" title="' + \ return ' <img loading="lazy" title="' + \
@ -654,7 +650,7 @@ def boostOwnTootHtml(translate: {}, iconsPath) -> str:
'/repeat_inactive.png" class="announceOrReply"/>\n' '/repeat_inactive.png" class="announceOrReply"/>\n'
def announceUnattributedHtml(translate: {}, iconsPath: str, def announceUnattributedHtml(translate: {},
postJsonObject: {}) -> str: postJsonObject: {}) -> str:
"""Returns the html for an announce title where there """Returns the html for an announce title where there
is no attribution on the announced post is no attribution on the announced post
@ -669,7 +665,7 @@ def announceUnattributedHtml(translate: {}, iconsPath: str,
'" class="announceOrReply">@unattributed</a>\n' '" class="announceOrReply">@unattributed</a>\n'
def announceWithoutDisplayNameHtml(translate: {}, iconsPath: str, def announceWithoutDisplayNameHtml(translate: {},
announceNickname: str, announceNickname: str,
announceDomain: str, announceDomain: str,
postJsonObject: {}) -> str: postJsonObject: {}) -> str:
@ -686,7 +682,6 @@ def announceWithoutDisplayNameHtml(translate: {}, iconsPath: str,
def announceWithDisplayNameHtml(translate: {}, def announceWithDisplayNameHtml(translate: {},
iconsPath: str,
postJsonObject: {}, postJsonObject: {},
announceDisplayName: str) -> str: announceDisplayName: str) -> str:
"""Returns html for an announce having a display name """Returns html for an announce having a display name
@ -709,7 +704,6 @@ def getPostTitleAnnounceHtml(baseDir: str,
postJsonObject: {}, postJsonObject: {},
postActor: str, postActor: str,
translate: {}, translate: {},
iconsPath: str,
enableTimingLog: bool, enableTimingLog: bool,
postStartTime, postStartTime,
boxName: str, boxName: str,
@ -732,7 +726,7 @@ def getPostTitleAnnounceHtml(baseDir: str,
attributedTo = postJsonObject['object']['attributedTo'] attributedTo = postJsonObject['object']['attributedTo']
if attributedTo.startswith(postActor): if attributedTo.startswith(postActor):
titleStr += boostOwnTootHtml(translate, 'icons') titleStr += boostOwnTootHtml(translate)
else: else:
# boosting another person's post # boosting another person's post
logPostTiming(enableTimingLog, postStartTime, '13.2') logPostTiming(enableTimingLog, postStartTime, '13.2')
@ -759,7 +753,6 @@ def getPostTitleAnnounceHtml(baseDir: str,
logPostTiming(enableTimingLog, postStartTime, '13.3.1') logPostTiming(enableTimingLog, postStartTime, '13.3.1')
titleStr += \ titleStr += \
announceWithDisplayNameHtml(translate, announceWithDisplayNameHtml(translate,
'icons',
postJsonObject, postJsonObject,
announceDisplayName) announceDisplayName)
# show avatar of person replied to # show avatar of person replied to
@ -790,27 +783,27 @@ def getPostTitleAnnounceHtml(baseDir: str,
announceAvatarUrl + '" ' + \ announceAvatarUrl + '" ' + \
'title="' + translate[idx] + \ 'title="' + translate[idx] + \
'" alt=" "' + avatarPosition + \ '" alt=" "' + avatarPosition + \
getBrokenLinkSubstitute('icons') + \ getBrokenLinkSubstitute() + \
'/></a>\n </div>\n' '/></a>\n </div>\n'
else: else:
titleStr += \ titleStr += \
announceWithoutDisplayNameHtml(translate, 'icons', announceWithoutDisplayNameHtml(translate,
announceNickname, announceNickname,
announceDomain, announceDomain,
postJsonObject) postJsonObject)
else: else:
titleStr += \ titleStr += \
announceUnattributedHtml(translate, 'icons', announceUnattributedHtml(translate,
postJsonObject) postJsonObject)
else: else:
titleStr += \ titleStr += \
announceUnattributedHtml(translate, 'icons', postJsonObject) announceUnattributedHtml(translate, postJsonObject)
return (titleStr, replyAvatarImageInPost, return (titleStr, replyAvatarImageInPost,
containerClassIcons, containerClass) containerClassIcons, containerClass)
def replyToYourselfHtml(translate: {}, iconsPath: str) -> str: def replyToYourselfHtml(translate: {}, ) -> str:
"""Returns html for a title which is a reply to yourself """Returns html for a title which is a reply to yourself
""" """
return ' <img loading="lazy" title="' + \ return ' <img loading="lazy" title="' + \
@ -820,7 +813,7 @@ def replyToYourselfHtml(translate: {}, iconsPath: str) -> str:
'/reply.png" class="announceOrReply"/>\n' '/reply.png" class="announceOrReply"/>\n'
def replyToUnknownHtml(translate: {}, iconsPath: str, def replyToUnknownHtml(translate: {},
postJsonObject: {}) -> str: postJsonObject: {}) -> str:
"""Returns the html title for a reply to an unknown handle """Returns the html title for a reply to an unknown handle
""" """
@ -833,7 +826,7 @@ def replyToUnknownHtml(translate: {}, iconsPath: str,
'" class="announceOrReply">@unknown</a>\n' '" class="announceOrReply">@unknown</a>\n'
def replyWithUnknownPathHtml(translate: {}, iconsPath: str, def replyWithUnknownPathHtml(translate: {},
postJsonObject: {}, postJsonObject: {},
postDomain: str) -> str: postDomain: str) -> str:
"""Returns html title for a reply with an unknown path """Returns html title for a reply with an unknown path
@ -850,7 +843,7 @@ def replyWithUnknownPathHtml(translate: {}, iconsPath: str,
postDomain + '</a>\n' postDomain + '</a>\n'
def getReplyHtml(translate: {}, iconsPath: str, def getReplyHtml(translate: {},
inReplyTo: str, replyDisplayName: str) -> str: inReplyTo: str, replyDisplayName: str) -> str:
"""Returns html title for a reply """Returns html title for a reply
""" """
@ -865,7 +858,7 @@ def getReplyHtml(translate: {}, iconsPath: str,
replyDisplayName + '</a>\n' replyDisplayName + '</a>\n'
def getReplyWithoutDisplayName(translate: {}, iconsPath: str, def getReplyWithoutDisplayName(translate: {},
inReplyTo: str, inReplyTo: str,
replyNickname: str, replyDomain: str) -> str: replyNickname: str, replyDomain: str) -> str:
"""Returns html for a reply without a display name, """Returns html for a reply without a display name,
@ -888,7 +881,6 @@ def getPostTitleReplyHtml(baseDir: str,
postJsonObject: {}, postJsonObject: {},
postActor: str, postActor: str,
translate: {}, translate: {},
iconsPath: str,
enableTimingLog: bool, enableTimingLog: bool,
postStartTime, postStartTime,
boxName: str, boxName: str,
@ -912,7 +904,7 @@ def getPostTitleReplyHtml(baseDir: str,
containerClassIcons = 'containericons darker' containerClassIcons = 'containericons darker'
containerClass = 'container darker' containerClass = 'container darker'
if postJsonObject['object']['inReplyTo'].startswith(postActor): if postJsonObject['object']['inReplyTo'].startswith(postActor):
titleStr += replyToYourselfHtml(translate, 'icons') titleStr += replyToYourselfHtml(translate)
return (titleStr, replyAvatarImageInPost, return (titleStr, replyAvatarImageInPost,
containerClassIcons, containerClass) containerClassIcons, containerClass)
@ -945,8 +937,7 @@ def getPostTitleReplyHtml(baseDir: str,
logPostTiming(enableTimingLog, postStartTime, '13.6') logPostTiming(enableTimingLog, postStartTime, '13.6')
titleStr += \ titleStr += \
getReplyHtml(translate, 'icons', getReplyHtml(translate, inReplyTo, replyDisplayName)
inReplyTo, replyDisplayName)
logPostTiming(enableTimingLog, postStartTime, '13.7') logPostTiming(enableTimingLog, postStartTime, '13.7')
@ -981,18 +972,18 @@ def getPostTitleReplyHtml(baseDir: str,
replyAvatarImageInPost += \ replyAvatarImageInPost += \
'" alt=" "' + \ '" alt=" "' + \
avatarPosition + \ avatarPosition + \
getBrokenLinkSubstitute('icons') + \ getBrokenLinkSubstitute() + \
'/></a>\n </div>\n' '/></a>\n </div>\n'
else: else:
inReplyTo = \ inReplyTo = \
postJsonObject['object']['inReplyTo'] postJsonObject['object']['inReplyTo']
titleStr += \ titleStr += \
getReplyWithoutDisplayName(translate, 'icons', getReplyWithoutDisplayName(translate,
inReplyTo, inReplyTo,
replyNickname, replyDomain) replyNickname, replyDomain)
else: else:
titleStr += \ titleStr += \
replyToUnknownHtml(translate, 'icons', postJsonObject) replyToUnknownHtml(translate, postJsonObject)
else: else:
postDomain = \ postDomain = \
postJsonObject['object']['inReplyTo'] postJsonObject['object']['inReplyTo']
@ -1003,7 +994,7 @@ def getPostTitleReplyHtml(baseDir: str,
postDomain = postDomain.split('/', 1)[0] postDomain = postDomain.split('/', 1)[0]
if postDomain: if postDomain:
titleStr += \ titleStr += \
replyWithUnknownPathHtml(translate, 'icons', replyWithUnknownPathHtml(translate,
postJsonObject, postDomain) postJsonObject, postDomain)
return (titleStr, replyAvatarImageInPost, return (titleStr, replyAvatarImageInPost,
@ -1018,7 +1009,6 @@ def getPostTitleHtml(baseDir: str,
postJsonObject: {}, postJsonObject: {},
postActor: str, postActor: str,
translate: {}, translate: {},
iconsPath: str,
enableTimingLog: bool, enableTimingLog: bool,
postStartTime, postStartTime,
boxName: str, boxName: str,
@ -1047,7 +1037,6 @@ def getPostTitleHtml(baseDir: str,
postJsonObject, postJsonObject,
postActor, postActor,
translate, translate,
'icons',
enableTimingLog, enableTimingLog,
postStartTime, postStartTime,
boxName, boxName,
@ -1067,7 +1056,6 @@ def getPostTitleHtml(baseDir: str,
postJsonObject, postJsonObject,
postActor, postActor,
translate, translate,
'icons',
enableTimingLog, enableTimingLog,
postStartTime, postStartTime,
boxName, boxName,
@ -1108,7 +1096,7 @@ def getFooterWithIcons(showIcons: bool,
def individualPostAsHtml(allowDownloads: bool, def individualPostAsHtml(allowDownloads: bool,
recentPostsCache: {}, maxRecentPosts: int, recentPostsCache: {}, maxRecentPosts: int,
iconsPath: str, translate: {}, translate: {},
pageNumber: int, baseDir: str, pageNumber: int, baseDir: str,
session, wfRequest: {}, personCache: {}, session, wfRequest: {}, personCache: {},
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
@ -1221,8 +1209,7 @@ def individualPostAsHtml(allowDownloads: bool,
nickname, domainFull, nickname, domainFull,
avatarUrl, postActor, avatarUrl, postActor,
translate, avatarPosition, translate, avatarPosition,
pageNumber, messageIdStr, pageNumber, messageIdStr)
'icons')
avatarImageInPost = \ avatarImageInPost = \
' <div class="timeline-avatar">' + avatarLink + '</div>\n' ' <div class="timeline-avatar">' + avatarLink + '</div>\n'
@ -1330,7 +1317,7 @@ def individualPostAsHtml(allowDownloads: bool,
replyStr = getReplyIconHtml(nickname, isPublicRepeat, replyStr = getReplyIconHtml(nickname, isPublicRepeat,
showIcons, commentsEnabled, showIcons, commentsEnabled,
postJsonObject, pageNumberParam, postJsonObject, pageNumberParam,
'icons', translate) translate)
logPostTiming(enableTimingLog, postStartTime, '10') logPostTiming(enableTimingLog, postStartTime, '10')
@ -1340,7 +1327,7 @@ def individualPostAsHtml(allowDownloads: bool,
editStr = getEditIconHtml(baseDir, nickname, domainFull, editStr = getEditIconHtml(baseDir, nickname, domainFull,
postJsonObject, actorNickname, postJsonObject, actorNickname,
translate, 'icons', isEvent) translate, isEvent)
announceStr = \ announceStr = \
getAnnounceIconHtml(nickname, domainFull, getAnnounceIconHtml(nickname, domainFull,
@ -1351,7 +1338,7 @@ def individualPostAsHtml(allowDownloads: bool,
translate, translate,
pageNumberParam, pageNumberParam,
timelinePostBookmark, timelinePostBookmark,
boxName, 'icons') boxName)
logPostTiming(enableTimingLog, postStartTime, '12') logPostTiming(enableTimingLog, postStartTime, '12')
@ -1370,7 +1357,7 @@ def individualPostAsHtml(allowDownloads: bool,
postStartTime, postStartTime,
translate, pageNumberParam, translate, pageNumberParam,
timelinePostBookmark, timelinePostBookmark,
boxName, 'icons') boxName)
logPostTiming(enableTimingLog, postStartTime, '12.5') logPostTiming(enableTimingLog, postStartTime, '12.5')
@ -1382,8 +1369,7 @@ def individualPostAsHtml(allowDownloads: bool,
enableTimingLog, enableTimingLog,
postStartTime, boxName, postStartTime, boxName,
pageNumberParam, pageNumberParam,
timelinePostBookmark, timelinePostBookmark)
'icons')
logPostTiming(enableTimingLog, postStartTime, '12.9') logPostTiming(enableTimingLog, postStartTime, '12.9')
@ -1398,7 +1384,6 @@ def individualPostAsHtml(allowDownloads: bool,
nickname, domainFull, nickname, domainFull,
allowDeletion, allowDeletion,
pageNumberParam, pageNumberParam,
'icons',
boxName, boxName,
timelinePostBookmark, timelinePostBookmark,
translate) translate)
@ -1410,7 +1395,6 @@ def individualPostAsHtml(allowDownloads: bool,
messageId, messageId,
postJsonObject, postJsonObject,
pageNumberParam, pageNumberParam,
'icons',
translate) translate)
logPostTiming(enableTimingLog, postStartTime, '13.1') logPostTiming(enableTimingLog, postStartTime, '13.1')
@ -1427,7 +1411,6 @@ def individualPostAsHtml(allowDownloads: bool,
postJsonObject, postJsonObject,
postActor, postActor,
translate, translate,
'icons',
enableTimingLog, enableTimingLog,
postStartTime, postStartTime,
boxName, boxName,
@ -1659,7 +1642,7 @@ def htmlIndividualPost(cssCache: {},
postStr += \ postStr += \
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, personCache, baseDir, session, wfRequest, personCache,
nickname, domain, port, postJsonObject, nickname, domain, port, postJsonObject,
None, True, False, None, True, False,
@ -1682,7 +1665,7 @@ def htmlIndividualPost(cssCache: {},
postStr = \ postStr = \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, nickname, domain, port,
@ -1711,7 +1694,7 @@ def htmlIndividualPost(cssCache: {},
postStr += \ postStr += \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, item, nickname, domain, port, item,
@ -1744,7 +1727,7 @@ def htmlPostReplies(cssCache: {},
repliesStr += \ repliesStr += \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, personCache, baseDir, session, wfRequest, personCache,
nickname, domain, port, item, nickname, domain, port, item,
None, True, False, None, True, False,

8
webapp_profile.py
View File

@ -266,7 +266,7 @@ def htmlProfileAfterSearch(cssCache: {},
continue continue
profileStr += \ profileStr += \
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
'icons', translate, None, baseDir, translate, None, baseDir,
session, cachedWebfingers, personCache, session, cachedWebfingers, personCache,
nickname, domain, port, nickname, domain, port,
item, avatarUrl, False, False, item, avatarUrl, False, False,
@ -282,7 +282,7 @@ def htmlProfileAfterSearch(cssCache: {},
def getProfileHeader(baseDir: str, nickname: str, domain: str, def getProfileHeader(baseDir: str, nickname: str, domain: str,
domainFull: str, translate: {}, iconsPath: str, domainFull: str, translate: {},
defaultTimeline: str, defaultTimeline: str,
displayName: str, displayName: str,
avatarDescription: str, avatarDescription: str,
@ -561,7 +561,7 @@ def htmlProfile(rssIconAtTop: bool,
avatarUrl = profileJson['icon']['url'] avatarUrl = profileJson['icon']['url']
profileHeaderStr = \ profileHeaderStr = \
getProfileHeader(baseDir, nickname, domain, getProfileHeader(baseDir, nickname, domain,
domainFull, translate, 'icons', domainFull, translate,
defaultTimeline, displayName, defaultTimeline, displayName,
avatarDescription, avatarDescription,
profileDescriptionShort, profileDescriptionShort,
@ -693,7 +693,7 @@ def htmlProfilePosts(recentPostsCache: {}, maxRecentPosts: int,
postStr = \ postStr = \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, item, nickname, domain, port, item,

4
webapp_search.py
View File

@ -587,7 +587,7 @@ def htmlHistorySearch(cssCache: {}, translate: {}, baseDir: str,
postStr = \ postStr = \
individualPostAsHtml(True, recentPostsCache, individualPostAsHtml(True, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, nickname, domain, port,
@ -752,7 +752,7 @@ def htmlHashtagSearch(cssCache: {},
postStr = \ postStr = \
individualPostAsHtml(allowDownloads, recentPostsCache, individualPostAsHtml(allowDownloads, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, None, translate, None,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, nickname, domain, port,

10
webapp_timeline.py
View File

@ -383,7 +383,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
sharesButtonStr, bookmarksButtonStr, sharesButtonStr, bookmarksButtonStr,
eventsButtonStr, moderationButtonStr, eventsButtonStr, moderationButtonStr,
newPostButtonStr, baseDir, nickname, newPostButtonStr, baseDir, nickname,
domain, 'icons', timelineStartTime, domain, timelineStartTime,
newCalendarEvent, calendarPath, newCalendarEvent, calendarPath,
calendarImage, followApprovals, calendarImage, followApprovals,
iconsAsButtons) iconsAsButtons)
@ -406,7 +406,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# left column # left column
leftColumnStr = \ leftColumnStr = \
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, 'icons', httpPrefix, translate,
editor, False, None, rssIconAtTop, editor, False, None, rssIconAtTop,
True, False) True, False)
tlStr += ' <td valign="top" class="col-left">' + \ tlStr += ' <td valign="top" class="col-left">' + \
@ -425,7 +425,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
sharesButtonStr, bookmarksButtonStr, sharesButtonStr, bookmarksButtonStr,
eventsButtonStr, moderationButtonStr, eventsButtonStr, moderationButtonStr,
newPostButtonStr, baseDir, nickname, newPostButtonStr, baseDir, nickname,
domain, 'icons', timelineStartTime, domain, timelineStartTime,
newCalendarEvent, calendarPath, newCalendarEvent, calendarPath,
calendarImage, followApprovals, calendarImage, followApprovals,
iconsAsButtons) iconsAsButtons)
@ -540,7 +540,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
currTlStr = \ currTlStr = \
individualPostAsHtml(False, recentPostsCache, individualPostAsHtml(False, recentPostsCache,
maxRecentPosts, maxRecentPosts,
'icons', translate, pageNumber, translate, pageNumber,
baseDir, session, wfRequest, baseDir, session, wfRequest,
personCache, personCache,
nickname, domain, port, nickname, domain, port,
@ -585,7 +585,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
# right column # right column
rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull, rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, 'icons', httpPrefix, translate,
moderator, editor, moderator, editor,
newswire, positiveVoting, newswire, positiveVoting,
False, None, True, False, None, True,

3
webapp_utils.py
View File

@ -68,8 +68,7 @@ def htmlHashtagBlocked(cssCache: {}, baseDir: str, translate: {}) -> str:
def headerButtonsFrontScreen(translate: {}, def headerButtonsFrontScreen(translate: {},
nickname: str, boxName: str, nickname: str, boxName: str,
authorized: bool, authorized: bool,
iconsAsButtons: bool, iconsAsButtons: bool) -> str:
iconsPath: bool) -> str:
"""Returns the header buttons for the front page of a news instance """Returns the header buttons for the front page of a news instance
""" """
headerStr = '' headerStr = ''