diff --git a/daemon.py b/daemon.py index 823a96a8c..284420a8d 100644 --- a/daemon.py +++ b/daemon.py @@ -8569,7 +8569,8 @@ class PubServer(BaseHTTPRequestHandler): baseDir, path, domain, port, - httpPrefix).encode('utf-8') + httpPrefix, + self.server.defaultTimeline).encode('utf-8') if msg: self._set_headers('text/html', len(msg), cookie, callingDomain) diff --git a/webinterface.py b/webinterface.py index 7e65d060f..999f60701 100644 --- a/webinterface.py +++ b/webinterface.py @@ -1295,7 +1295,8 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str, def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str, - domain: str, port: int, httpPrefix: str) -> str: + domain: str, port: int, httpPrefix: str, + defaultTimeline: str) -> str: """Shows the edit newswire screen """ if '/users/' not in path: @@ -1322,7 +1323,19 @@ def htmlEditNewswire(cssCache: {}, translate: {}, baseDir: str, path: str, editCSS = \ editCSS.replace('https://', httpPrefix + '://') + # filename of the banner shown at the top + bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain) + editNewswireForm = htmlHeader(cssFilename, editCSS) + + # top banner + editNewswireForm += \ + '\n' + editNewswireForm += '\n' + editNewswireForm += \ '
\n'