From 5f6b1f6731958f3f48b9313183992eb54d370bc5 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 4 Dec 2021 17:35:06 +0000 Subject: [PATCH] Banner on theme designer screen --- daemon.py | 3 ++- webapp_themeDesigner.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/daemon.py b/daemon.py index 21e156be7..e6c3217c0 100644 --- a/daemon.py +++ b/daemon.py @@ -14381,7 +14381,8 @@ class PubServer(BaseHTTPRequestHandler): nickname, self.server.domain, self.server.translate, self.server.defaultTimeline, - self.server.themeName) + self.server.themeName, + self.server.accessKeys) msg = msg.encode('utf-8') msglen = len(msg) self._login_headers('text/html', msglen, callingDomain) diff --git a/webapp_themeDesigner.py b/webapp_themeDesigner.py index 0f4229592..4189c77e3 100644 --- a/webapp_themeDesigner.py +++ b/webapp_themeDesigner.py @@ -10,15 +10,15 @@ __module_group__ = "Web Interface" import os from utils import loadJson from utils import getConfigParam -from utils import acctDir from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlFooter +from webapp_utils import getBannerFile def htmlThemeDesigner(cssCache: {}, baseDir: str, nickname: str, domain: str, translate: {}, defaultTimeline: str, - themeName: str) -> str: + themeName: str, accessKeys: {}) -> str: """Edit theme settings """ themeFilename = baseDir + '/theme/' + themeName + '/theme.json' @@ -35,6 +35,14 @@ def htmlThemeDesigner(cssCache: {}, baseDir: str, getConfigParam(baseDir, 'instanceTitle') themeForm = \ htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None) + bannerFile, bannerFilename = \ + getBannerFile(baseDir, nickname, domain, themeName) + themeForm += \ + '' + \ + '\n' themeForm += '
\n' themeForm += \