oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support themeclass variable in html files

Browse source
This commit is contained in:
shortcutme 2018-10-20 02:35:48 +02:00
parent 8e6494c451
commit 451976c3c8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Ui/UiRequest.py
View file

@ -417,8 +417,10 @@ class UiRequest(object):
if site.content_manager.contents.get("content.json"): # Got content.json if site.content_manager.contents.get("content.json"): # Got content.json
content = site.content_manager.contents["content.json"] content = site.content_manager.contents["content.json"]
if content.get("background-color"): if content.get("background-color"):
body_style += "background-color: %s;" % \ user = self.getCurrentUser()
cgi.escape(site.content_manager.contents["content.json"]["background-color"], True) theme = user.settings.get("theme", "light")
background_color = content.get("background-color-%s" % theme, content["background-color"])
body_style += "background-color: %s;" % cgi.escape(background_color, True)
if content.get("viewport"): if content.get("viewport"):
meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True) meta_tags += '<meta name="viewport" id="viewport" content="%s">' % cgi.escape(content["viewport"], True)
if content.get("favicon"): if content.get("favicon"):
@ -434,6 +436,9 @@ class UiRequest(object):
if show_loadingscreen is None: if show_loadingscreen is None:
show_loadingscreen = not site.storage.isFile(file_inner_path) show_loadingscreen = not site.storage.isFile(file_inner_path)
user = self.getCurrentUser()
themeclass = "theme-%-6s" % re.sub("[^a-z]", "", user.settings.get("theme", "light"))
return self.render( return self.render(
"src/Ui/template/wrapper.html", "src/Ui/template/wrapper.html",
server_url=server_url, server_url=server_url,
@ -454,7 +459,8 @@ class UiRequest(object):
sandbox_permissions=sandbox_permissions, sandbox_permissions=sandbox_permissions,
rev=config.rev, rev=config.rev,
lang=config.language, lang=config.language,
homepage=homepage homepage=homepage,
themeclass=themeclass
) )
# Create a new wrapper nonce that allows to get one html file without the wrapper # Create a new wrapper nonce that allows to get one html file without the wrapper
@ -605,6 +611,12 @@ class UiRequest(object):
range = self.env.get("HTTP_RANGE") range = self.env.get("HTTP_RANGE")
range_start = None range_start = None
is_html_file = file_path.endswith(".html")
if is_html_file:
user = self.getCurrentUser()
themeclass = "theme-%-6s" % re.sub("[^a-z]", "", user.settings.get("theme", "light"))
if send_header: if send_header:
extra_headers = {} extra_headers = {}
extra_headers["Accept-Ranges"] = "bytes" extra_headers["Accept-Ranges"] = "bytes"
@ -632,6 +644,8 @@ class UiRequest(object):
while 1: while 1:
try: try:
block = file_obj.read(block_size) block = file_obj.read(block_size)
if is_html_file:
block = block.replace("{themeclass}", themeclass.encode("utf8"))
if block: if block:
yield block yield block
else: else: