summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2020-12-13 11:43:46 -0800
committerMicah Lee <micah@micahflee.com>2020-12-13 11:43:46 -0800
commita5c7f091fc0e59b8b6ea003762dfc1763bd056fd (patch)
tree315048225f249c596ec40be5f83e7cddec4f3b06
parent7ff539e3e28b887e8195921e76b7bd120b06dad0 (diff)
parentfffdbd4f12622c99851d90f3834d290487c83234 (diff)
downloadonionshare-a5c7f091fc0e59b8b6ea003762dfc1763bd056fd.tar.gz
onionshare-a5c7f091fc0e59b8b6ea003762dfc1763bd056fd.zip
Merge branch 'develop' of github.com:micahflee/onionshare into develop
-rw-r--r--cli/onionshare_cli/resources/templates/denied.html5
-rw-r--r--cli/onionshare_cli/web/share_mode.py11
2 files changed, 4 insertions, 12 deletions
diff --git a/cli/onionshare_cli/resources/templates/denied.html b/cli/onionshare_cli/resources/templates/denied.html
index 49147ef2..e8c49f98 100644
--- a/cli/onionshare_cli/resources/templates/denied.html
+++ b/cli/onionshare_cli/resources/templates/denied.html
@@ -4,12 +4,11 @@
<head>
<title>OnionShare</title>
<meta charset="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
+ <meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<p>OnionShare download in progress</p>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py
index 39c82d31..87f35eaa 100644
--- a/cli/onionshare_cli/web/share_mode.py
+++ b/cli/onionshare_cli/web/share_mode.py
@@ -61,10 +61,7 @@ class ShareModeWeb(SendBaseModeWeb):
and self.download_in_progress
)
if deny_download:
- r = make_response(
- render_template("denied.html"),
- static_url_path=self.web.static_url_path,
- )
+ r = make_response(render_template("denied.html"))
return self.web.add_security_headers(r)
# If download is allowed to continue, serve download page
@@ -87,11 +84,7 @@ class ShareModeWeb(SendBaseModeWeb):
and self.download_in_progress
)
if deny_download:
- r = make_response(
- render_template(
- "denied.html", static_url_path=self.web.static_url_path
- )
- )
+ r = make_response(render_template("denied.html"))
return self.web.add_security_headers(r)
# Prepare some variables to use inside generate() function below