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

Tidying

main2
Bob Mottram 2019-10-18 18:07:45 +01:00
parent 175f4e929a
commit a9b281ea1c
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webinterface.py
View File

@ -1436,18 +1436,6 @@ def clickToDropDownScript() -> str:
'function dropdown() {\n' \ 'function dropdown() {\n' \
' document.getElementById("myDropdown").classList.toggle("show");\n' \ ' document.getElementById("myDropdown").classList.toggle("show");\n' \
'}\n' '}\n'
#'window.onclick = function(event) {' \
#" if (!event.target.matches('.dropbtn')) {" \
#' var dropdowns = document.getElementsByClassName("dropdown-content");' \
#' var i;' \
#' for (i = 0; i < dropdowns.length; i++) {' \
#' var openDropdown = dropdowns[i];' \
#" if (openDropdown.classList.contains('show')) {" \
#" openDropdown.classList.remove('show');" \
#' }' \
#' }' \
#' }' \
#'}'
return script return script
def cursorToEndOfMessageScript() -> str: def cursorToEndOfMessageScript() -> str:
@ -1785,10 +1773,11 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
displayName=getDisplayName(baseDir,postJsonObject['actor'],personCache) displayName=getDisplayName(baseDir,postJsonObject['actor'],personCache)
if displayName: if displayName:
displayName= \ if ':' in displayName:
addEmojiToDisplayName(baseDir,httpPrefix, \ displayName= \
nickname,domain, \ addEmojiToDisplayName(baseDir,httpPrefix, \
displayName,False) nickname,domain, \
displayName,False)
titleStr+='<a href="'+messageId+'">'+displayName+'</a>' titleStr+='<a href="'+messageId+'">'+displayName+'</a>'
else: else:
titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>' titleStr+='<a href="'+messageId+'">@'+actorNickname+'@'+actorDomain+'</a>'
@ -1964,10 +1953,11 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
if avatarUrl2: if avatarUrl2:
avatarUrl=avatarUrl2 avatarUrl=avatarUrl2
if displayName: if displayName:
displayName= \ if ':' in displayName:
addEmojiToDisplayName(baseDir,httpPrefix, \ displayName= \
nickname,domain, \ addEmojiToDisplayName(baseDir,httpPrefix, \
displayName,False) nickname,domain, \
displayName,False)
titleStr=displayName+' '+titleStr titleStr=displayName+' '+titleStr
avatarImageInPost= \ avatarImageInPost= \