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

Titles on post icons

merge-requests/6/head
Bob Mottram 2019-11-26 18:34:41 +00:00
parent 714fce25b2
commit 226ebca75b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webinterface.py
View File

@ -2076,7 +2076,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
if isAnnounced: if isAnnounced:
if postJsonObject['object'].get('attributedTo'): if postJsonObject['object'].get('attributedTo'):
if postJsonObject['object']['attributedTo'].startswith(postActor): if postJsonObject['object']['attributedTo'].startswith(postActor):
titleStr+=' <img loading="lazy" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/>' titleStr+=' <img loading="lazy" title="'+translate['announces']+'" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/>'
else: else:
announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo']) announceNickname=getNicknameFromActor(postJsonObject['object']['attributedTo'])
if announceNickname: if announceNickname:
@ -2089,7 +2089,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
addEmojiToDisplayName(baseDir,httpPrefix, \ addEmojiToDisplayName(baseDir,httpPrefix, \
nickname,domain, \ nickname,domain, \
announceDisplayName,False) announceDisplayName,False)
titleStr+=' <img loading="lazy" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">'+announceDisplayName+'</a>' titleStr+=' <img loading="lazy" title="'+translate['announces']+'" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">'+announceDisplayName+'</a>'
# show avatar of person replied to # show avatar of person replied to
announceActor=postJsonObject['object']['attributedTo'] announceActor=postJsonObject['object']['attributedTo']
announceAvatarUrl=getPersonAvatarUrl(baseDir,announceActor,personCache) announceAvatarUrl=getPersonAvatarUrl(baseDir,announceActor,personCache)
@ -2101,18 +2101,18 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
'title="'+translate['Show options for this person']+ \ 'title="'+translate['Show options for this person']+ \
'" alt=" "'+avatarPosition+'/></a></div>' '" alt=" "'+avatarPosition+'/></a></div>'
else: else:
titleStr+=' <img loading="lazy" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@'+announceNickname+'@'+announceDomain+'</a>' titleStr+=' <img loading="lazy" title="'+translate['announces']+'" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@'+announceNickname+'@'+announceDomain+'</a>'
else: else:
titleStr+=' <img loading="lazy" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@unattributed</a>' titleStr+=' <img loading="lazy" title="'+translate['announces']+'" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@unattributed</a>'
else: else:
titleStr+=' <img loading="lazy" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@unattributed</a>' titleStr+=' <img loading="lazy" title="'+translate['announces']+'" alt="'+translate['announces']+'" src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@unattributed</a>'
else: else:
if postJsonObject['object'].get('inReplyTo'): if postJsonObject['object'].get('inReplyTo'):
containerClassIcons='containericons darker' containerClassIcons='containericons darker'
containerClass='container darker' containerClass='container darker'
#avatarPosition=' class="right"' #avatarPosition=' class="right"'
if postJsonObject['object']['inReplyTo'].startswith(postActor): if postJsonObject['object']['inReplyTo'].startswith(postActor):
titleStr+=' <img loading="lazy" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/>' titleStr+=' <img loading="lazy" title="'+translate['replying to']+'" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/>'
else: else:
if '/statuses/' in postJsonObject['object']['inReplyTo']: if '/statuses/' in postJsonObject['object']['inReplyTo']:
replyActor=postJsonObject['object']['inReplyTo'].split('/statuses/')[0] replyActor=postJsonObject['object']['inReplyTo'].split('/statuses/')[0]
@ -2128,7 +2128,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
addEmojiToDisplayName(baseDir,httpPrefix, \ addEmojiToDisplayName(baseDir,httpPrefix, \
nickname,domain, \ nickname,domain, \
replyDisplayName,False) replyDisplayName,False)
titleStr+=' <img loading="lazy" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+replyDisplayName+'</a>' titleStr+=' <img loading="lazy" title="'+translate['replying to']+'" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+replyDisplayName+'</a>'
# show avatar of person replied to # show avatar of person replied to
replyAvatarUrl=getPersonAvatarUrl(baseDir,replyActor,personCache) replyAvatarUrl=getPersonAvatarUrl(baseDir,replyActor,personCache)
@ -2139,15 +2139,15 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
replyAvatarImageInPost+='title="'+translate['Show profile'] replyAvatarImageInPost+='title="'+translate['Show profile']
replyAvatarImageInPost+='" alt=" "'+avatarPosition+'/></a></div>' replyAvatarImageInPost+='" alt=" "'+avatarPosition+'/></a></div>'
else: else:
titleStr+=' <img loading="lazy" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">@'+replyNickname+'@'+replyDomain+'</a>' titleStr+=' <img loading="lazy" title="'+translate['replying to']+'" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">@'+replyNickname+'@'+replyDomain+'</a>'
else: else:
titleStr+=' <img loading="lazy" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">@unknown</a>' titleStr+=' <img loading="lazy" title="'+translate['replying to']+'" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">@unknown</a>'
else: else:
postDomain=postJsonObject['object']['inReplyTo'].replace('https://','').replace('http://','').replace('dat://','') postDomain=postJsonObject['object']['inReplyTo'].replace('https://','').replace('http://','').replace('dat://','')
if '/' in postDomain: if '/' in postDomain:
postDomain=postDomain.split('/',1)[0] postDomain=postDomain.split('/',1)[0]
if postDomain: if postDomain:
titleStr+=' <img loading="lazy" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+postDomain+'</a>' titleStr+=' <img loading="lazy" title="'+translate['replying to']+'" alt="'+translate['replying to']+'" src="/'+iconsDir+'/reply.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['inReplyTo']+'">'+postDomain+'</a>'
attachmentStr='' attachmentStr=''
if postJsonObject['object'].get('attachment'): if postJsonObject['object'].get('attachment'):
if isinstance(postJsonObject['object']['attachment'], list): if isinstance(postJsonObject['object']['attachment'], list):
@ -2298,7 +2298,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
'?actor='+postJsonObject['actor']+ \ '?actor='+postJsonObject['actor']+ \
'?bm='+timelinePostBookmark+ \ '?bm='+timelinePostBookmark+ \
'?tl='+boxName+'" title="'+announceTitle+'">' '?tl='+boxName+'" title="'+announceTitle+'">'
announceStr+='<img loading="lazy" alt="'+translate['Repeat this post']+'" src="/'+iconsDir+'/'+announceIcon+'"/></a>' announceStr+='<img loading="lazy" title="'+translate['Repeat this post']+'" alt="'+translate['Repeat this post']+'" src="/'+iconsDir+'/'+announceIcon+'"/></a>'
likeStr='' likeStr=''
if not isModerationPost: if not isModerationPost:
@ -2316,7 +2316,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
'?actor='+postJsonObject['actor']+ \ '?actor='+postJsonObject['actor']+ \
'?bm='+timelinePostBookmark+ \ '?bm='+timelinePostBookmark+ \
'?tl='+boxName+'" title="'+likeTitle+'">' '?tl='+boxName+'" title="'+likeTitle+'">'
likeStr+='<img loading="lazy" alt="'+likeTitle+'" src="/'+iconsDir+'/'+likeIcon+'"/></a>' likeStr+='<img loading="lazy" title="'+likeTitle+'" alt="'+likeTitle+'" src="/'+iconsDir+'/'+likeIcon+'"/></a>'
bookmarkStr='' bookmarkStr=''
if not isModerationPost: if not isModerationPost:
@ -2333,7 +2333,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
'?actor='+postJsonObject['actor']+ \ '?actor='+postJsonObject['actor']+ \
'?bm='+timelinePostBookmark+ \ '?bm='+timelinePostBookmark+ \
'?tl='+boxName+'" title="'+bookmarkTitle+'">' '?tl='+boxName+'" title="'+bookmarkTitle+'">'
bookmarkStr+='<img loading="lazy" alt="'+bookmarkTitle+'" src="/'+iconsDir+'/'+bookmarkIcon+'"/></a>' bookmarkStr+='<img loading="lazy" title="'+bookmarkTitle+'" alt="'+bookmarkTitle+'" src="/'+iconsDir+'/'+bookmarkIcon+'"/></a>'
deleteStr='' deleteStr=''
if allowDeletion or \ if allowDeletion or \
@ -2379,7 +2379,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
'<a href="/users/'+nickname+'?replydm='+replyToLink+ \ '<a href="/users/'+nickname+'?replydm='+replyToLink+ \
'?actor='+postJsonObject['actor']+ \ '?actor='+postJsonObject['actor']+ \
'" title="'+translate['Reply to this post']+'">' '" title="'+translate['Reply to this post']+'">'
footerStr+='<img loading="lazy" alt="'+translate['Reply to this post']+'" src="/'+iconsDir+'/reply.png"/></a>' footerStr+='<img loading="lazy" title="'+translate['Reply to this post']+'" alt="'+translate['Reply to this post']+'" src="/'+iconsDir+'/reply.png"/></a>'
footerStr+=announceStr+likeStr+bookmarkStr+deleteStr footerStr+=announceStr+likeStr+bookmarkStr+deleteStr
footerStr+='<span class="'+timeClass+'">'+publishedStr+'</span>' footerStr+='<span class="'+timeClass+'">'+publishedStr+'</span>'
footerStr+='</div>' footerStr+='</div>'