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

Alternate bookmarks timeline name

merge-requests/30/head
Bob Mottram 2020-05-21 21:15:24 +01:00
parent dca3da71b5
commit c6d4825d8d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webinterface.py
View File

@ -3181,7 +3181,7 @@ def preparePostFromHtmlCache(postHtml: str, boxName: str,
"""Sets the page number on a cached html post """Sets the page number on a cached html post
""" """
# if on the bookmarks timeline then remain there # if on the bookmarks timeline then remain there
if boxName == 'tlbookmarks': if boxName == 'tlbookmarks' or boxName == 'bookmarks':
postHtml = postHtml.replace('?tl=inbox', '?tl=tlbookmarks') postHtml = postHtml.replace('?tl=inbox', '?tl=tlbookmarks')
withPageNumber = postHtml.replace(';-999;', ';' + str(pageNumber) + ';') withPageNumber = postHtml.replace(';-999;', ';' + str(pageNumber) + ';')
withPageNumber = withPageNumber.replace('?page=-999', withPageNumber = withPageNumber.replace('?page=-999',
@ -3515,7 +3515,7 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
# don't create new html within the bookmarks timeline # don't create new html within the bookmarks timeline
# it should already have been created for the inbox # it should already have been created for the inbox
if boxName == 'tlbookmarks': if boxName == 'tlbookmarks' or boxName == 'bookmarks':
return '' return ''
timelinePostBookmark = postJsonObject['id'].replace('/activity', '') timelinePostBookmark = postJsonObject['id'].replace('/activity', '')
@ -4104,7 +4104,8 @@ def individualPostAsHtml(recentPostsCache: {}, maxRecentPosts: int,
postHtml = galleryStr postHtml = galleryStr
if not showPublicOnly and storeToCache and \ if not showPublicOnly and storeToCache and \
boxName != 'tlmedia' and boxName != 'tlbookmarks': boxName != 'tlmedia' and boxName != 'tlbookmarks' and \
boxName != 'bookmarks':
saveIndividualPostAsHtmlToCache(baseDir, nickname, domain, saveIndividualPostAsHtmlToCache(baseDir, nickname, domain,
postJsonObject, postHtml) postJsonObject, postHtml)
updateRecentPostsCache(recentPostsCache, maxRecentPosts, updateRecentPostsCache(recentPostsCache, maxRecentPosts,
@ -4258,7 +4259,7 @@ def htmlTimeline(defaultTimeline: str,
sharesButton = 'buttonselected' sharesButton = 'buttonselected'
if newShare: if newShare:
sharesButton = 'buttonselectedhighlighted' sharesButton = 'buttonselectedhighlighted'
elif boxName == 'tlbookmarks': elif boxName == 'tlbookmarks' or boxName == 'bookmarks':
bookmarksButton = 'buttonselected' bookmarksButton = 'buttonselected'
fullDomain = domain fullDomain = domain