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

Include metadata on about screen

merge-requests/30/head
Bob Mottram 2021-05-14 12:56:23 +01:00
parent 91736b547f
commit 80203466b6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -11206,13 +11206,15 @@ class PubServer(BaseHTTPRequestHandler):
htmlAbout(self.server.cssCache, htmlAbout(self.server.cssCache,
self.server.baseDir, 'http', self.server.baseDir, 'http',
self.server.onionDomain, self.server.onionDomain,
None, self.server.translate) None, self.server.translate,
self.server.systemLanguage)
elif callingDomain.endswith('.i2p'): elif callingDomain.endswith('.i2p'):
msg = \ msg = \
htmlAbout(self.server.cssCache, htmlAbout(self.server.cssCache,
self.server.baseDir, 'http', self.server.baseDir, 'http',
self.server.i2pDomain, self.server.i2pDomain,
None, self.server.translate) None, self.server.translate,
self.server.systemLanguage)
else: else:
msg = \ msg = \
htmlAbout(self.server.cssCache, htmlAbout(self.server.cssCache,
@ -11220,7 +11222,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, self.server.httpPrefix,
self.server.domainFull, self.server.domainFull,
self.server.onionDomain, self.server.onionDomain,
self.server.translate) self.server.translate,
self.server.systemLanguage)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._login_headers('text/html', msglen, callingDomain) self._login_headers('text/html', msglen, callingDomain)

10
webapp_about.py
View File

@ -9,13 +9,14 @@ __status__ = "Production"
import os import os
from shutil import copyfile from shutil import copyfile
from utils import getConfigParam from utils import getConfigParam
from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlHeaderWithWebsiteMarkup
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
from webapp_utils import markdownToHtml from webapp_utils import markdownToHtml
def htmlAbout(cssCache: {}, baseDir: str, httpPrefix: str, def htmlAbout(cssCache: {}, baseDir: str, httpPrefix: str,
domainFull: str, onionDomain: str, translate: {}) -> str: domainFull: str, onionDomain: str, translate: {},
systemLanguage: str) -> str:
"""Show the about screen """Show the about screen
""" """
adminNickname = getConfigParam(baseDir, 'admin') adminNickname = getConfigParam(baseDir, 'admin')
@ -40,7 +41,10 @@ def htmlAbout(cssCache: {}, baseDir: str, httpPrefix: str,
instanceTitle = \ instanceTitle = \
getConfigParam(baseDir, 'instanceTitle') getConfigParam(baseDir, 'instanceTitle')
aboutForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) aboutForm = \
htmlHeaderWithWebsiteMarkup(cssFilename, instanceTitle,
httpPrefix, domainFull,
systemLanguage)
aboutForm += '<div class="container">' + aboutText + '</div>' aboutForm += '<div class="container">' + aboutText + '</div>'
if onionDomain: if onionDomain:
aboutForm += \ aboutForm += \