Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-09-27 11:31:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflict from receiver-mode-gui branch

Browse source
This commit is contained in:
Miguel Jacq 2018-09-04 11:48:39 +10:00
commit 11bf059015
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
8 changed files with 91 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
share/templates/closed.html
View file

@ -3,8 +3,20 @@
<head>
<title>OnionShare is closed</title>
<link href="/static/img/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/static/css/style.css" rel="stylesheet" type="text/css" />
</head>
<body>
<p>Thank you for using OnionShare</p>
<header class="clearfix">
<img class="logo" src="/static/img/logo.png" title="OnionShare">
<h1>OnionShare</h1>
</header>
<div class="closed-wrapper">
<div class="closed">
<p><img class="logo" src="/static/img/logo_large.png" title="OnionShare"></p>
<p class="closed-header">Thank you for using OnionShare</p>
<p class="closed-description">You may now close this window.</p>
</div>
</div>
</body>
</html>

16
share/templates/receive.html
View file

@ -21,11 +21,11 @@
<p><input type="file" name="file[]" multiple /></p>
<p><input type="submit" class="button" value="Send Files" /></p>
<div>
{% with messages = get_flashed_messages() %}
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<ul class=flashes>
{% for message in messages %}
<li>{{ message }}</li>
{% for category, message in messages %}
<li class="{{ category }}">{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
@ -35,9 +35,13 @@
</div>
</div>
{% if receive_allow_receiver_shutdown %}
<form method="post" action="{{ close_action }}">
<input type="submit" class="close-button" value="I'm Finished Uploading" />
</form>
{% with messages = get_flashed_messages() %}
{% if messages %}
<form method="post" action="{{ close_action }}">
<input type="submit" class="close-button" value="I'm Finished Sending" />
</form>
{% endif %}
{% endwith %}
{% endif %}
</body>
</html>