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

Right column on shares timeline

main
Bob Mottram 2021-07-28 12:26:03 +01:00
parent 74a0959876
commit 2eec26aeaa
2 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shares.py
View File

@ -706,12 +706,13 @@ def outboxShareUpload(baseDir: str, httpPrefix: str,
if debug:
print('DEBUG: duration missing from Offer')
return
itemQty = float(messageJson['object']['itemQty'])
addShare(baseDir,
httpPrefix, nickname, domain, port,
messageJson['object']['displayName'],
messageJson['object']['summary'],
messageJson['object']['imageFilename'],
float(messageJson['object']['itemQty']),
itemQty,
messageJson['object']['itemType'],
messageJson['object']['itemCategory'],
messageJson['object']['location'],

88
webapp_timeline.py
View File

@ -333,6 +333,46 @@ def _htmlTimelineKeyboard(moderator: bool, textModeBanner: str, usersPath: str,
None, usersPath, translate, followApprovals)
def _htmlTimelineEnd(baseDir: str, nickname: str, domainFull: str,
httpPrefix: str, translate: {},
moderator: bool, editor: bool,
newswire: {}, positiveVoting: bool,
showPublishAsIcon: bool,
rssIconAtTop: bool, publishButtonAtTop: bool,
authorized: bool, theme: str,
defaultTimeline: str, accessKeys: {},
boxName: str,
enableTimingLog: bool, timelineStartTime) -> str:
"""Ending of the timeline, containing the right column
"""
# end of timeline-posts
tlStr = ' </div>\n'
# end of column-center
tlStr += ' </td>\n'
# right column
rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate,
moderator, editor,
newswire, positiveVoting,
False, None, True,
showPublishAsIcon,
rssIconAtTop, publishButtonAtTop,
authorized, True, theme,
defaultTimeline, accessKeys)
tlStr += ' <td valign="top" class="col-right" ' + \
'id="newswire" tabindex="-1">' + \
rightColumnStr + ' </td>\n'
tlStr += ' </tr>\n'
_logTimelineTiming(enableTimingLog, timelineStartTime, boxName, '9')
tlStr += ' </tbody>\n'
tlStr += '</table>\n'
return tlStr
def htmlTimeline(cssCache: {}, defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int,
translate: {}, pageNumber: int,
@ -659,8 +699,16 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
baseDir, actor, nickname, domain, port,
maxSharesPerAccount, httpPrefix,
sharedItemsFederatedDomains) +
' </div>\n' + ' </td>\n' +
' </tr>\n' + ' </tbody>\n' + ' </table>\n' +
_htmlTimelineEnd(baseDir, nickname, domainFull,
httpPrefix, translate,
moderator, editor,
newswire, positiveVoting,
showPublishAsIcon,
rssIconAtTop, publishButtonAtTop,
authorized, theme,
defaultTimeline, accessKeys,
boxName,
enableTimingLog, timelineStartTime) +
htmlFooter())
_logTimelineTiming(enableTimingLog, timelineStartTime, boxName, '7')
@ -786,31 +834,17 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
elif itemCtr == 0:
tlStr += _getHelpForTimeline(baseDir, boxName)
# end of timeline-posts
tlStr += ' </div>\n'
# end of column-center
tlStr += ' </td>\n'
# right column
rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull,
httpPrefix, translate,
moderator, editor,
newswire, positiveVoting,
False, None, True,
showPublishAsIcon,
rssIconAtTop, publishButtonAtTop,
authorized, True, theme,
defaultTimeline, accessKeys)
tlStr += ' <td valign="top" class="col-right" ' + \
'id="newswire" tabindex="-1">' + \
rightColumnStr + ' </td>\n'
tlStr += ' </tr>\n'
_logTimelineTiming(enableTimingLog, timelineStartTime, boxName, '9')
tlStr += ' </tbody>\n'
tlStr += '</table>\n'
tlStr += \
_htmlTimelineEnd(baseDir, nickname, domainFull,
httpPrefix, translate,
moderator, editor,
newswire, positiveVoting,
showPublishAsIcon,
rssIconAtTop, publishButtonAtTop,
authorized, theme,
defaultTimeline, accessKeys,
boxName,
enableTimingLog, timelineStartTime)
tlStr += htmlFooter()
return tlStr