diff --git a/webapp_profile.py b/webapp_profile.py index 008f1d553..e0bf4a443 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -634,45 +634,45 @@ def htmlProfile(rssIconAtTop: bool, translate['Get the source code'] + '" title="' + \ translate['Get the source code'] + '" src="/icons/agpl.png" />' - if selected == 'posts': - profileStr += \ - htmlProfilePosts(recentPostsCache, maxRecentPosts, - translate, - baseDir, httpPrefix, authorized, - nickname, domain, port, - session, wfRequest, personCache, - projectVersion, - YTReplacementDomain, - showPublishedDateOnly) + licenseStr - if selected == 'following': - profileStr += \ - htmlProfileFollowing(translate, baseDir, httpPrefix, - authorized, nickname, - domain, port, session, - wfRequest, personCache, extraJson, - projectVersion, ["unfollow"], selected, - usersPath, pageNumber, maxItemsPerPage) - if selected == 'followers': - profileStr += \ - htmlProfileFollowing(translate, baseDir, httpPrefix, - authorized, nickname, - domain, port, session, - wfRequest, personCache, extraJson, - projectVersion, ["block"], - selected, usersPath, pageNumber, - maxItemsPerPage) - if selected == 'roles': - profileStr += \ - htmlProfileRoles(translate, nickname, domainFull, - extraJson) - if selected == 'skills': - profileStr += \ - htmlProfileSkills(translate, nickname, domainFull, extraJson) - if selected == 'shares': - profileStr += \ - htmlProfileShares(actor, translate, - nickname, domainFull, - extraJson) + licenseStr + if selected == 'posts': + profileStr += \ + htmlProfilePosts(recentPostsCache, maxRecentPosts, + translate, + baseDir, httpPrefix, authorized, + nickname, domain, port, + session, wfRequest, personCache, + projectVersion, + YTReplacementDomain, + showPublishedDateOnly) + licenseStr + elif selected == 'following': + profileStr += \ + htmlProfileFollowing(translate, baseDir, httpPrefix, + authorized, nickname, + domain, port, session, + wfRequest, personCache, extraJson, + projectVersion, ["unfollow"], selected, + usersPath, pageNumber, maxItemsPerPage) + elif selected == 'followers': + profileStr += \ + htmlProfileFollowing(translate, baseDir, httpPrefix, + authorized, nickname, + domain, port, session, + wfRequest, personCache, extraJson, + projectVersion, ["block"], + selected, usersPath, pageNumber, + maxItemsPerPage) + elif selected == 'roles': + profileStr += \ + htmlProfileRoles(translate, nickname, domainFull, + extraJson) + elif selected == 'skills': + profileStr += \ + htmlProfileSkills(translate, nickname, domainFull, extraJson) + elif selected == 'shares': + profileStr += \ + htmlProfileShares(actor, translate, + nickname, domainFull, + extraJson) + licenseStr # Footer which is only used for system accounts profileFooterStr = '' diff --git a/webapp_timeline.py b/webapp_timeline.py index 3e7a4e39f..805b6e855 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -518,7 +518,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str, # use the blog timeline of the news actor timelineNickname = 'news' timelineBoxName = 'tlblog' - + # if this is the media timeline then add an extra gallery container if boxName == 'tlmedia': if pageNumber > 1: