Rely/announce avatar links to options

main2
Bob Mottram 2019-10-04 09:42:53 +01:00
parent 4ca765a41d
commit 517e44e24a
1 changed files with 7 additions and 7 deletions

View File

@ -1710,6 +1710,10 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if showDMicon: if showDMicon:
titleStr=titleStr+' <img src="/'+iconsDir+'/dm.png" class="DMicon"/>' titleStr=titleStr+' <img src="/'+iconsDir+'/dm.png" class="DMicon"/>'
messageIdStr=''
if messageId:
messageIdStr=';'+messageId
replyAvatarImageInPost='' replyAvatarImageInPost=''
if showRepeatIcon: if showRepeatIcon:
if isAnnounced: if isAnnounced:
@ -1733,9 +1737,9 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if announceAvatarUrl: if announceAvatarUrl:
replyAvatarImageInPost= \ replyAvatarImageInPost= \
'<div class="timeline-avatar-reply">' \ '<div class="timeline-avatar-reply">' \
'<a href="'+announceActor+'">' \ '<a href="/users/'+nickname+'?options='+announceActor+';'+str(pageNumber)+';'+announceAvatarUrl+messageIdStr+'">' \
'<img src="'+announceAvatarUrl+'" ' \ '<img src="'+announceAvatarUrl+'" ' \
'title="'+translate['Show profile']+ \ 'title="'+translate['Show options for this person']+ \
'" alt="Avatar"'+avatarPosition+'/></a></div>' '" alt="Avatar"'+avatarPosition+'/></a></div>'
else: else:
titleStr+=' <img src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@'+announceNickname+'@'+announceDomain+'</a>' titleStr+=' <img src="/'+iconsDir+'/repeat_inactive.png" class="announceOrReply"/> <a href="'+postJsonObject['object']['id']+'">@'+announceNickname+'@'+announceDomain+'</a>'
@ -1770,7 +1774,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if replyAvatarUrl: if replyAvatarUrl:
replyAvatarImageInPost= \ replyAvatarImageInPost= \
'<div class="timeline-avatar-reply">' \ '<div class="timeline-avatar-reply">' \
'<a href="'+replyActor+'">' \ '<a href="/users/'+nickname+'?options='+replyActor+';'+str(pageNumber)+';'+replyAvatarUrl+messageIdStr+'">' \
'<img src="'+replyAvatarUrl+'" ' \ '<img src="'+replyAvatarUrl+'" ' \
'title="'+translate['Show profile']+ \ 'title="'+translate['Show profile']+ \
'" alt="Avatar"'+avatarPosition+'/></a></div>' '" alt="Avatar"'+avatarPosition+'/></a></div>'
@ -1877,10 +1881,6 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
' <a href="'+postJsonObject['actor']+'">' \ ' <a href="'+postJsonObject['actor']+'">' \
' <img src="'+avatarUrl+'" title="'+translate['Show profile']+'" alt="Avatar"'+avatarPosition+'/></a>' \ ' <img src="'+avatarUrl+'" title="'+translate['Show profile']+'" alt="Avatar"'+avatarPosition+'/></a>' \
' </div>' ' </div>'
messageIdStr=''
if messageId:
messageIdStr=';'+messageId
if showAvatarDropdown and fullDomain+'/users/'+nickname not in postJsonObject['actor']: if showAvatarDropdown and fullDomain+'/users/'+nickname not in postJsonObject['actor']:
avatarImageInPost= \ avatarImageInPost= \