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

Rss icon position applies to left column

merge-requests/30/head
Bob Mottram 2020-10-26 20:53:12 +00:00
parent 296c36610e
commit 39874ad5ab
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webinterface.py
View File

@ -3480,7 +3480,7 @@ def htmlProfile(defaultTimeline: str,
getLeftColumnContent(baseDir, 'news', domainFull, getLeftColumnContent(baseDir, 'news', domainFull,
httpPrefix, translate, httpPrefix, translate,
iconsDir, False, iconsDir, False,
False, None) False, None, False)
profileHeaderStr += ' </td>\n' profileHeaderStr += ' </td>\n'
profileHeaderStr += ' <td valign="top" class="col-center">\n' profileHeaderStr += ' <td valign="top" class="col-center">\n'
else: else:
@ -5493,7 +5493,8 @@ def htmlHighlightLabel(label: str, highlight: bool) -> str:
def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
httpPrefix: str, translate: {}, httpPrefix: str, translate: {},
iconsDir: str, editor: bool, iconsDir: str, editor: bool,
showBackButton: bool, timelinePath: str) -> str: showBackButton: bool, timelinePath: str,
rssIconAtTop: bool) -> str:
"""Returns html content for the left column """Returns html content for the left column
""" """
htmlStr = '' htmlStr = ''
@ -5555,13 +5556,15 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
else: else:
# rss feed for all accounts on the instance # rss feed for all accounts on the instance
rssUrl = httpPrefix + '://' + domainFull + '/blog/rss.xml' rssUrl = httpPrefix + '://' + domainFull + '/blog/rss.xml'
htmlStr += \ rssIconStr = \
' <a href="' + rssUrl + '">' + \ ' <a href="' + rssUrl + '">' + \
'<img class="' + editImageClass + \ '<img class="' + editImageClass + \
'" loading="lazy" alt="' + \ '" loading="lazy" alt="' + \
translate['RSS feed for this site'] + \ translate['RSS feed for this site'] + \
'" title="' + translate['RSS feed for this site'] + \ '" title="' + translate['RSS feed for this site'] + \
'" src="/' + iconsDir + '/logorss.png" /></a>\n' '" src="/' + iconsDir + '/logorss.png" /></a>\n'
if rssIconAtTop:
htmlStr += rssIconStr
if editImageClass == 'leftColEdit': if editImageClass == 'leftColEdit':
htmlStr += ' </center>\n' htmlStr += ' </center>\n'
@ -5612,6 +5615,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str,
htmlStr += \ htmlStr += \
' <p>' + lineStr + '</p>\n' ' <p>' + lineStr + '</p>\n'
if not rssIconAtTop:
htmlStr += '<br>' + rssIconStr
return htmlStr return htmlStr
@ -5843,7 +5848,7 @@ def htmlLinksMobile(baseDir: str, nickname: str, domainFull: str,
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, httpPrefix, translate,
iconsDir, editor, iconsDir, editor,
True, timelinePath) True, timelinePath, True)
htmlStr += '</div>\n' + htmlFooter() htmlStr += '</div>\n' + htmlFooter()
return htmlStr return htmlStr
@ -6549,7 +6554,7 @@ def htmlTimeline(defaultTimeline: str,
leftColumnStr = \ leftColumnStr = \
getLeftColumnContent(baseDir, nickname, domainFull, getLeftColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate, iconsDir, httpPrefix, translate, iconsDir,
editor, False, None) editor, False, None, rssIconAtTop)
tlStr += ' <td valign="top" class="col-left">' + \ tlStr += ' <td valign="top" class="col-left">' + \
leftColumnStr + ' </td>\n' leftColumnStr + ' </td>\n'
# center column containing posts # center column containing posts