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

RenderWrapper showloadingscreen parameter

Browse source
This commit is contained in:
shortcutme 2017-05-11 18:01:16 +02:00
parent 27a582634f
commit 5908d2ca53
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Ui/UiRequest.py
View file

@ -232,13 +232,13 @@ class UiRequest(object):
else: # Bad url else: # Bad url
return False return False
def renderWrapper(self, site, path, inner_path, title, extra_headers):
def getSiteUrl(self, address): def getSiteUrl(self, address):
if self.isProxyRequest(): if self.isProxyRequest():
return "http://zero/" + address return "http://zero/" + address
else: else:
return "/" + address return "/" + address
def renderWrapper(self, site, path, inner_path, title, extra_headers, show_loadingscreen=None):
file_inner_path = inner_path file_inner_path = inner_path
if not file_inner_path: if not file_inner_path:
file_inner_path = "index.html" # If inner path defaults to index.html file_inner_path = "index.html" # If inner path defaults to index.html
@ -300,6 +300,9 @@ class UiRequest(object):
else: else:
sandbox_permissions = "" sandbox_permissions = ""
if show_loadingscreen is None:
show_loadingscreen = not site.storage.isFile(file_inner_path)
return self.render( return self.render(
"src/Ui/template/wrapper.html", "src/Ui/template/wrapper.html",
server_url=server_url, server_url=server_url,
@ -315,7 +318,7 @@ class UiRequest(object):
wrapper_nonce=wrapper_nonce, wrapper_nonce=wrapper_nonce,
postmessage_nonce_security=postmessage_nonce_security, postmessage_nonce_security=postmessage_nonce_security,
permissions=json.dumps(site.settings["permissions"]), permissions=json.dumps(site.settings["permissions"]),
show_loadingscreen=json.dumps(not site.storage.isFile(file_inner_path)), show_loadingscreen=json.dumps(show_loadingscreen),
sandbox_permissions=sandbox_permissions, sandbox_permissions=sandbox_permissions,
rev=config.rev, rev=config.rev,
lang=config.language, lang=config.language,