Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-11 15:29:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Show the custom title in all modes

Browse Source
This commit is contained in:
Micah Lee 2021-04-12 18:15:51 -04:00
parent b5c68fa5ca
commit 1543bb38d2
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
7 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/onionshare_cli/resources/templates/listing.html
View File

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>OnionShare</title> <title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" /> <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
@ -14,7 +14,7 @@
<header class="d-flex"> <header class="d-flex">
<div class="logo-container"> <div class="logo-container">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare"> <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1> <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</div> </div>
</header> </header>
@ -57,4 +57,4 @@
</div> </div>
</body> </body>
</html> </html>

75
cli/onionshare_cli/resources/templates/receive.html
View File

@ -1,46 +1,49 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<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">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head>
<body>
<header class="clearfix"> <head>
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare"> <title>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</title>
<h1>OnionShare</h1> <meta charset="utf-8" />
</header> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head>
<div class="upload-wrapper"> <body>
<p><img class="logo" src="{{ static_url_path }}/img/logo_large.png" title="OnionShare"></p>
<p class="upload-header">Send Files</p> <header class="clearfix">
<p class="upload-description">Select the files you want to send, then click "Send Files"...</p> <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</h1>
</header>
<div id="uploads"></div> <div class="upload-wrapper">
<p><img class="logo" src="{{ static_url_path }}/img/logo_large.png" title="OnionShare"></p>
<div> <p class="upload-header">Send Files</p>
<ul id="flashes" class="flashes"> <p class="upload-description">Select the files you want to send, then click "Send Files"...</p>
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% for category, message in messages %}
<li class="{{ category }}">{{ message }}</li>
{% endfor %}
{% endif %}
{% endwith %}
</ul>
</div>
<form id="send" method="post" enctype="multipart/form-data" action="/upload"> <div id="uploads"></div>
<p><input type="file" id="file-select" name="file[]" multiple /></p>
<p><button type="submit" id="send-button" class="button">Send Files</button></p>
</form>
<div>
<ul id="flashes" class="flashes">
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% for category, message in messages %}
<li class="{{ category }}">{{ message }}</li>
{% endfor %}
{% endif %}
{% endwith %}
</ul>
</div> </div>
<script src="{{ static_url_path }}/js/jquery-3.5.1.min.js"></script>
<script async src="{{ static_url_path }}/js/receive.js" id="receive-script"></script> <form id="send" method="post" enctype="multipart/form-data" action="/upload">
</body> <p><input type="file" id="file-select" name="file[]" multiple /></p>
</html> <p><button type="submit" id="send-button" class="button">Send Files</button></p>
</form>
</div>
<script src="{{ static_url_path }}/js/jquery-3.5.1.min.js"></script>
<script async src="{{ static_url_path }}/js/receive.js" id="receive-script"></script>
</body>
</html>

17
cli/onionshare_cli/resources/templates/send.html
View File

@ -2,9 +2,9 @@
<html> <html>
<head> <head>
<title>OnionShare</title> <title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon"> <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all"> <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
<meta name="onionshare-filename" content="{{ filename }}"> <meta name="onionshare-filename" content="{{ filename }}">
@ -16,7 +16,7 @@
<header class="d-flex"> <header class="d-flex">
<div class="logo-container"> <div class="logo-container">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare"> <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1> <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</div> </div>
<div class="information d-flex"> <div class="information d-flex">
<div>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</div> <div>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</div>
@ -25,10 +25,11 @@
</header> </header>
{% if breadcrumbs %} {% if breadcrumbs %}
<ul class="breadcrumbs"> <ul class="breadcrumbs">
{% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li> {% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span
</ul> class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li>
{% endif %} </ul>
{% endif %}
<div class="file-list" id="file-list"> <div class="file-list" id="file-list">
<div class="d-flex"> <div class="d-flex">
@ -66,4 +67,4 @@
<script async src="{{ static_url_path }}/js/send.js" charset="utf-8"></script> <script async src="{{ static_url_path }}/js/send.js" charset="utf-8"></script>
</body> </body>
</html> </html>

6
cli/onionshare_cli/resources/templates/thankyou.html
View File

@ -4,7 +4,7 @@
<head> <head>
<title>OnionShare is closed</title> <title>OnionShare is closed</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon"> <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
<link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all"> <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
</head> </head>
@ -12,7 +12,7 @@
<body> <body>
<header class="clearfix"> <header class="clearfix">
<img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare"> <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
<h1>OnionShare</h1> <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
</header> </header>
<div class="info-wrapper"> <div class="info-wrapper">
@ -24,4 +24,4 @@
</div> </div>
</body> </body>
</html> </html>

6
cli/onionshare_cli/web/receive_mode.py
View File

@ -64,7 +64,9 @@ class ReceiveModeWeb:
self.web.add_request(self.web.REQUEST_LOAD, request.path) self.web.add_request(self.web.REQUEST_LOAD, request.path)
r = make_response( r = make_response(
render_template( render_template(
"receive.html", static_url_path=self.web.static_url_path "receive.html",
static_url_path=self.web.static_url_path,
title=self.web.settings.get("general", "title"),
) )
) )
return self.web.add_security_headers(r) return self.web.add_security_headers(r)
@ -168,6 +170,7 @@ class ReceiveModeWeb:
"new_body": render_template( "new_body": render_template(
"thankyou.html", "thankyou.html",
static_url_path=self.web.static_url_path, static_url_path=self.web.static_url_path,
title=self.web.settings.get("general", "title"),
) )
} }
) )
@ -176,6 +179,7 @@ class ReceiveModeWeb:
r = make_response( r = make_response(
render_template("thankyou.html"), render_template("thankyou.html"),
static_url_path=self.web.static_url_path, static_url_path=self.web.static_url_path,
title=self.web.settings.get("general", "title"),
) )
return self.web.add_security_headers(r) return self.web.add_security_headers(r)

1
cli/onionshare_cli/web/share_mode.py
View File

@ -230,6 +230,7 @@ class ShareModeWeb(SendBaseModeWeb):
is_zipped=self.is_zipped, is_zipped=self.is_zipped,
static_url_path=self.web.static_url_path, static_url_path=self.web.static_url_path,
download_individual_files=self.download_individual_files, download_individual_files=self.download_individual_files,
title=self.web.settings.get("general", "title"),
) )
) )

1
cli/onionshare_cli/web/website_mode.py
View File

@ -60,6 +60,7 @@ class WebsiteModeWeb(SendBaseModeWeb):
breadcrumbs=breadcrumbs, breadcrumbs=breadcrumbs,
breadcrumbs_leaf=breadcrumbs_leaf, breadcrumbs_leaf=breadcrumbs_leaf,
static_url_path=self.web.static_url_path, static_url_path=self.web.static_url_path,
title=self.web.settings.get("general", "title"),
) )
) )