\n'
blockedHashtagForm += \
' ' + \
@@ -524,7 +524,9 @@ def getRightImageFile(baseDir: str,
def htmlHeaderWithExternalStyle(cssFilename: str, instanceTitle: str,
- lang='en') -> str:
+ metadata: str, lang='en') -> str:
+ if metadata is None:
+ metadata = ''
cssFile = '/' + cssFilename.split('/')[-1]
htmlStr = \
'\n' + \
@@ -534,6 +536,7 @@ def htmlHeaderWithExternalStyle(cssFilename: str, instanceTitle: str,
' \n' + \
' \n' + \
' \n' + \
+ metadata + \
'
' + instanceTitle + '\n' + \
' \n' + \
' \n'
@@ -546,7 +549,8 @@ def htmlHeaderWithPersonMarkup(cssFilename: str, instanceTitle: str,
"""html header which includes person markup
https://schema.org/Person
"""
- htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle, lang)
+ htmlStr = \
+ htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None, lang)
if not actorJson:
return htmlStr
@@ -663,8 +667,9 @@ def htmlHeaderWithWebsiteMarkup(cssFilename: str, instanceTitle: str,
"""html header which includes website markup
https://schema.org/WebSite
"""
- htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle,
- systemLanguage)
+ htmlStr = \
+ htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None,
+ systemLanguage)
licenseUrl = 'https://www.gnu.org/licenses/agpl-3.0.rdf'
@@ -707,8 +712,9 @@ def htmlHeaderWithBlogMarkup(cssFilename: str, instanceTitle: str,
"""html header which includes blog post markup
https://schema.org/BlogPosting
"""
- htmlStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle,
- systemLanguage)
+ htmlStr = \
+ htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None,
+ systemLanguage)
authorUrl = localActorUrl(httpPrefix, nickname, domain)
aboutUrl = httpPrefix + '://' + domain + '/about.html'
@@ -1458,7 +1464,7 @@ def htmlShowShare(baseDir: str, domain: str, nickname: str,
instanceTitle = \
getConfigParam(baseDir, 'instanceTitle')
- return htmlHeaderWithExternalStyle(cssFilename, instanceTitle) + \
+ return htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None) + \
shareStr + htmlFooter()
diff --git a/webapp_welcome.py b/webapp_welcome.py
index 24f687094..517a22761 100644
--- a/webapp_welcome.py
+++ b/webapp_welcome.py
@@ -86,7 +86,7 @@ def htmlWelcomeScreen(baseDir: str, nickname: str,
if os.path.isfile(baseDir + '/welcome.css'):
cssFilename = baseDir + '/welcome.css'
- welcomeForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
+ welcomeForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle, None)
welcomeForm += \
'